aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil
AgeCommit message (Collapse)AuthorFilesLines
2014-06-24Fix OS X CMake build.Guy Harris1-0/+8
I have ***NO*** idea why this makes a difference, but, without this change, APPLE_CORE_FOUNDATION_LIBRARY is apparently *not* set correctly for wsutil/CMakeLists.txt, and, with this change, it is. I guess there's something magic involved here with "global" CMake variables or something crazy such as that. Change-Id: I7a0046b9c249568cd666720838104f48e854e203 Reviewed-on: https://code.wireshark.org/review/2612 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22Don't declare CFString_to_C_string() if we don't have OS X frameworks.Guy Harris1-0/+4
You shouldn't be including cfutils.h if you don't have CF, but this may be tripping up the ABI checker. Change-Id: Ib736a33013c6ab0f416ebbedaa4ebf112bade6f7 Reviewed-on: https://code.wireshark.org/review/2530 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22Add a routine to return a version string including VCS information.Guy Harris4-3/+93
Add a routine get_ws_vcs_version_info() that, for builds from a tree checked out from Wireshark's version control system, returns a string that includes both the Wireshark version number and an indication of what particular VCS version was checked out, and just returns Wireshark's version number for other builds. Use that routine rather than manually gluing VERSION and the Git version number together. ("vcs", not "git", just in case we do something bizarre or mercurial some day. :-)) Change-Id: Ie5c6dc83b9d3f56655eaef30fec3ec9916b6320d Reviewed-on: https://code.wireshark.org/review/2529 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move get_os_major_version() to wsutil and rename it to ↵Guy Harris2-0/+31
get_windows_major_version(). It's Windows-specific, so name it appropriately. Change-Id: Ic518cbfabebf95757f6b308a4d547a6cabed6a5e Reviewed-on: https://code.wireshark.org/review/2528 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move the routine to get memory information to wsutil.Guy Harris4-0/+87
Change-Id: I94717cec5a464166585b258a83f8ccdaccf8d5ff Reviewed-on: https://code.wireshark.org/review/2525 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Get rid of trailing blank lines.Guy Harris1-1/+0
Change-Id: Ie28a9904fd8befe98677c9f9f169beffe4df1d5d Reviewed-on: https://code.wireshark.org/review/2524 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move the routine to get a CPU information string to wsutil.Guy Harris4-0/+110
Change-Id: Ibf6e57d7382cbbd831a0367fd48d684118712408 Reviewed-on: https://code.wireshark.org/review/2523 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Clean up inclusion of cfutils.h.Guy Harris2-2/+2
Change-Id: I7da381f12db6721448e15d30d441a943127cbca1 Reviewed-on: https://code.wireshark.org/review/2522 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Get rid of trailing blank lines.Guy Harris1-2/+0
Change-Id: Ib806d07aea8e4d903f084171ce2021c6f3c3fc07 Reviewed-on: https://code.wireshark.org/review/2520 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Add a get_compiler_info() routine in libwsutil to get compiler information.Guy Harris4-0/+152
Change-Id: I8ccb6187f2ee0255460f448aee170768b6fa3f5d Reviewed-on: https://code.wireshark.org/review/2519 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Need <string.h> for string routines.Guy Harris1-1/+3
Change-Id: I828bb29953727eb43e169fa9b06837c9657ca051 Reviewed-on: https://code.wireshark.org/review/2517 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21We need the Unicode utilities, at least on Windows.Guy Harris1-4/+2
Multiple UTFs FTW! Change-Id: Ib50dda4577f0038b11179be92dc6fb321b033618 Reviewed-on: https://code.wireshark.org/review/2516 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21We need <windows.h> on Windows.Guy Harris1-0/+4
Change-Id: I54c9991b3322d14966913367f951900cc7e54c4e Reviewed-on: https://code.wireshark.org/review/2513 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move get_os_version_info() to libwsutil.Guy Harris7-0/+620
This mean we also have to move CFString_to_C_string() there for OS X. Change-Id: Ic91ad872e9d5290cf34f842503ededd5452e4337 Reviewed-on: https://code.wireshark.org/review/2511 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21Move get_copyright_info() to wsutil.Guy Harris4-0/+82
Change-Id: I75c1c747cd2b4a9845c659636582d54b2caecf1a Reviewed-on: https://code.wireshark.org/review/2510 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20Add .rc files to the sources to have them included in the buildJoerg Mayer1-0/+1
Change-Id: I84dda519e617b24d92fcf374670a4a6ee6f488ee Reviewed-on: https://code.wireshark.org/review/2506 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-19Add casting and license info to fix buildbotsEvan Huus2-4/+10
Change-Id: Iea53b17480d758c16822d80778fa4f186a188a91 Reviewed-on: https://code.wireshark.org/review/2470 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19Dissectors for totemnet and totemsrp protocols implemented in corosync ↵Michael Mann4-0/+958
cluster engine. Bug 3232. From Masatake YAMATO changes in patch3 (Masatake YAMATO): * Fix a typo(s/Sequnce/Sequence/) * Use variable len instead of a number literal * Put _U_ marker to length parameter of dissect_corosync_totemsrp_ip_address * Use tvb_report_length instread of tvb_length changes in patch5 (Masatake YAMATO): * packet-corosync-totemsrp.c: Adapt to new dissector_try_heuristic interface + pass hdtbl_entry argument to dissector_try_heuristic. * packet-corosync-totemnet.c: Initialize corosync_totemnet_port to 5405 changes in patch6 (Masatake YAMATO): * packet-corosync-totemsrp.c: Use tvb_reported_length instead of tvb_length. * packet-corosync-totemsrp.c: Remove unnecessary trailing space in string literals. * packet-corosync-totemnet.c: Remove SVN Id tag in a comment. changes in patch8 (Masatake YAMATO): * packet-corosync-totemnet.c: Remove SVN Id tag in comment(again). * packet-corosync-totemsrp.c: Use val_to_str_const instead of val_to_str. changes in patch9 (Masatake YAMATO): * wsutil/sober128.[ch]: New files derived from packet-corosync-totemnet.c. Decryption code is moved here. * packet-corosync-totemnet.c: Remove all decryption code from this file. Change-Id: Id832d9c5ce1be1668c857c9bbf39e8a84c31880c Reviewed-on: https://code.wireshark.org/review/725 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18Don't compile anything with -msse4.2 unless the compiler supports it.Guy Harris1-1/+1
This includes ws_mempbrk_sse42.c; if the compiler doesn't support -msse4.2, HAS_SSE4_2 isn't defined, so all the stuff in ws_mempbrk_sse42.c that uses SSE 4.2 will be #ifdeffed out. Not all compilers with which we're built will support -msse4.2; in particular, the ones that aren't compiling for x86 won't.... Change-Id: I69566ca06f602104b40c78b3b06fcb7dfeb054b2 Reviewed-on: https://code.wireshark.org/review/2373 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-17Rewrite check for ws_mempbrk_sse42.c compilationJakub Zawadzki1-3/+3
- check only for -msse4.2 - check if there's nmmintrin.h header - don't check if current CPU support -msse4.2 (fix cross compilation) Change-Id: Iba8d291fdf5602937ab540a69b7608a81427ad25 Reviewed-on: https://code.wireshark.org/review/2189 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16More Python-bindings removal.Jeff Morriss2-119/+0
Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce Reviewed-on: https://code.wireshark.org/review/2283 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-16Explicitly declare/cast 'unsigned <variable>' as 'unsigned int <variable>'AndersBroman1-1/+1
Applying part of Bug 7825 Change-Id: I460b5c61b04d793ccc27c25debbd5e8f08bc6974 Reviewed-on: https://code.wireshark.org/review/2280 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-14Backport autofoo simd optimizationJoerg Mayer1-1/+15
Change-Id: I5d58154bf8266eabedf550b54f18845612f514c6 Reviewed-on: https://code.wireshark.org/review/2206 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14Small whitespace fixesJoerg Mayer1-2/+2
Change-Id: I44c6c193ec2a7d88cda56ba34c2f17c03f7e121d Reviewed-on: https://code.wireshark.org/review/2205 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-10Change HAVE_SSE42 to HAVE_SSE4_2 add $(SIMD_FLAGS)AndersBroman4-7/+7
Add autotools macros to distribution Call AX_EXT to define HAVE_SSE4_2 Change-Id: I9ff085d923dfafb32510cdd14290e74a2aaea302 Reviewed-on: https://code.wireshark.org/review/2110 Tested-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10Fix Buildbot Mac OS: /wsutil/ws_cpuid.h:56: warning: unused parameter 'CPUInfo'Alexis La Goutte1-1/+1
Change-Id: Ic0b0d5392ff049cc51f05b79fc5feae190064ce8 Reviewed-on: https://code.wireshark.org/review/2097 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-10Mark an unused parameter as such.AndersBroman1-1/+1
Change-Id: Ia319d7b8523ab9b9e9d8ec8533ebdcf4a506a69e Reviewed-on: https://code.wireshark.org/review/2096 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10WS mempbrk SEE4.2: Fix indent (use 2spaces) and add Modelines infoAlexis La Goutte1-36/+48
Change-Id: I50c71401f46846a459b18347ef0b9793a2a05ea7 Reviewed-on: https://code.wireshark.org/review/2084 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-10CPUID improvementsJakub Zawadzki2-14/+27
- Make ws_cpuid() return boolean when CPUID is support or no, this way it's easier for caller to determinate if it works (and can use cpuinfo[X] or no). - Add function ws_cpuid_sse42(), use it in ws_mempbrk() [cached] & version information. Change-Id: I4e77699f9f3d11bb9b2e8ea599e48d3c5ad84ed7 Reviewed-on: https://code.wireshark.org/review/2088 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09Fix CMake build.Tomasz Moń1-0/+2
Change-Id: I749c6f1e978e385a9f1340f315c670404a2470ad Reviewed-on: https://code.wireshark.org/review/2087 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-09We must include config.h to have HAVE_SSE42AndersBroman1-1/+2
Change-Id: I2b882b05b2864edbfef0ea03bc086efeaac84ad2 Reviewed-on: https://code.wireshark.org/review/2086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09Hopfully thiw will make the Solaris build going.AndersBroman1-1/+3
Change-Id: I44b93494f6d3cb0504517ab4581afeef180f1513 Reviewed-on: https://code.wireshark.org/review/2079 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09Try to fix OSX buildAndersBroman2-1/+3
Change-Id: Iab664f349e7604b99368f4a986dfe98db48aea84 Reviewed-on: https://code.wireshark.org/review/2078 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09Fix a copy paste error.AndersBroman1-1/+1
Change-Id: I9a153b3e89886c7de943226dd5313c90e8be1b7b Reviewed-on: https://code.wireshark.org/review/2075 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09Try to fix the builds.AndersBroman4-10/+46
Change-Id: I3ccb5c1b40504cd9314da5a09b225e3e2bf991b8 Reviewed-on: https://code.wireshark.org/review/2073 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-09Make buildbot Happy about shadow index variable...Alexis La Goutte1-9/+9
Change-Id: I4c93af520883235828a4bb1881c74035eace995d Reviewed-on: https://code.wireshark.org/review/2070 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-09Add sse4.2 optimized function ws_mempbrk_sse42()Jakub Zawadzki5-1/+276
In text protocols, like SIP, lot of time is spend guint8_pbrk(), assume that text is not binary (no NULs), and use SSE4.2 pcmpistri instruction. Also move & rename guint8_pbrk() from tvbuff.c as _ws_mempbrk. HAVE_SSE42 must be defined to use _ws_mempbrk_sse42() only activaded for Windows currently. Change-Id: Ic853d84805bdb6492c4f45d2bcc79a973fd9804e Reviewed-on: https://code.wireshark.org/review/1730 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-01Make this comple whether assertions are enabled or not.Guy Harris1-7/+3
Make the check for a valid index range a macro, so the compiler doesn't whine if it's not used, but it's available if it *is* used. Change-Id: I3cee0460eacef23187c141458dc5ac7a7acbf7c8 Reviewed-on: https://code.wireshark.org/review/1914 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-01Fix /home/jmayer/work/wireshark/git/wsutil/nghttp2/nghttp2_hd.c:996:12: ↵Joerg Mayer1-0/+2
error: ‘check_index_range’ defined but not used [-Werror=unused-function] static int check_index_range(nghttp2_hd_context *context, size_t idx) ^ cc1: all warnings being treated as errors Change-Id: Ie8e3fe12d339a689e0222eda501b253a7d6d923c Reviewed-on: https://code.wireshark.org/review/1912 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-31nghttp2: do not copy nghttp2* objects in wsutil folderPascal Quantin1-7/+7
Change-Id: I114d3a795a93c7612453fcd08f6e30e520dde900 Reviewed-on: https://code.wireshark.org/review/1902 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-31nghttp2: more warning fixesPascal Quantin2-7/+7
Change-Id: Ib94a02f5977bd7d456895bbe453c35d77f559bd1 Reviewed-on: https://code.wireshark.org/review/1901 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-31nghttp2: upgrade library to g4f7223e and add casts to please buildbotsPascal Quantin7-105/+122
Change-Id: Ic412d4bfc56695cbcab709d42a6f31aa9e50c64e Reviewed-on: https://code.wireshark.org/review/1900 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-31NGHTTP2: Add missing nghttp2_int.h (need by make dist...)Alexis La Goutte1-1/+2
Change-Id: I7906f28b42960ea69b7f23e888bc0e184f67021a Reviewed-on: https://code.wireshark.org/review/1899 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-31NGHTTP2: fix -Wshadow about index with some old GCC release or Mac OS X buildbotAlexis La Goutte1-41/+41
(No problem with gcc-4.7 or gcc-4.8) Change-Id: Iae1f801abeb80429c08e93668133a9c5ac7977ef Reviewed-on: https://code.wireshark.org/review/1898 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-31NGHTTP2: fix typo (nghttp2_ent.h => nghttp2_net.h)Alexis La Goutte1-1/+1
Change-Id: I52d3c40794841614d55e88c9fe9cf2de43a0fa46 Reviewed-on: https://code.wireshark.org/review/1897 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-31Add nghttp2 lib (HPACK)Alexis La Goutte20-3/+12682
Change-Id: I2a361951924045035a2a5d38f943e6b97c170f36 Reviewed-on: https://code.wireshark.org/review/1623 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-31Move cpuid to seperate header file.Jakub Zawadzki2-1/+68
It'll be later used also for detecting sse4.2 Change-Id: I1930abb29026b455d453a79b5f301cdf37585160 Reviewed-on: https://code.wireshark.org/review/1803 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-30Honor configured CMAKE_INSTALL_LIBDIR when installing librariesBalint Reczey1-3/+3
Change-Id: I860c9408ed01e9567992b0dcf5c6c6421344c13e Reviewed-on: https://code.wireshark.org/review/1862 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-30Set PLUGIN_INSTALL_DIR properly for wireshark.pcBalint Reczey1-2/+2
Change-Id: I64c04095ce780ce2cc44a54a68695506d27e5747 Reviewed-on: https://code.wireshark.org/review/1861 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-28Add ModelinesAlexis La Goutte3-0/+39
Change-Id: I3b41a15f53afc718ccf5892174345220a09c6714 Reviewed-on: https://code.wireshark.org/review/1847 Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 14:27:45 +0000