aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil
AgeCommit message (Collapse)AuthorFilesLines
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>
2014-05-27Fix indent (use tabs)Alexis La Goutte1-57/+57
Change-Id: Iecb242bddb06779ba8b5ce8913fa9c4f64d7f79a Reviewed-on: https://code.wireshark.org/review/1812 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-23Fix some whitespace issues.Guy Harris1-3/+3
Change-Id: I363361e898c4b37fcde29847a1473530e5052733 Reviewed-on: https://code.wireshark.org/review/1771 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-23More handling of missing time stamps.Guy Harris2-2/+13
Make nstime_cmp() handle "unset" time stamps (they're equal to other "unset" time stamps, and less than all other time stamps), use it in reordercap, and "unset" the time stamp if it's absent. Also, nstime_cmp() does not modify its argument, so make it const. Change-Id: I016dab5fefaf4696e78cbd8c6dd3395808e54369 Reviewed-on: https://code.wireshark.org/review/1769 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-13isprint() -> g_ascii_isprint()AndersBroman1-1/+1
Change-Id: Ia586ef8ce500d5fc7578c52014206fa7a7eaea41 Reviewed-on: https://code.wireshark.org/review/1624 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-13In ascii_xx_inplace use g_ascii_isupper/g_ascii_islower directly, itAndersBroman1-2/+4
*should* be slightly more efficient. Change-Id: I3081e2e25f241cdb07fa46011f50709fd560fb1c Reviewed-on: https://code.wireshark.org/review/1626 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Support out-of-source checkapiStig Bjørlykke1-2/+4
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) from Makefile.am to allow out-of-source 'make checkapi'. Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 Reviewed-on: https://code.wireshark.org/review/1294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Move mktime_utc() from tvbuff.c to wsutil/time_util.cJakub Zawadzki4-0/+98
Also do little cleanup in mktime_utc (one big #ifndef) Change-Id: I8f721ba76cad856cfef0a2d78e7f98686f8e4e3f Reviewed-on: https://code.wireshark.org/review/1327 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-17Fixed typo HAVE_LIBGRYPT -> HAVE_LIBGCRYPTStig Bjørlykke1-1/+1
Change-Id: I85772e1f4d4882810bf82a9903e30156eb374df9 Reviewed-on: https://code.wireshark.org/review/1191 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-04-14Add tvb_get and proto_tree_add for string-encoded timestampsHadriel Kaplan1-1/+1
This commit adds tvb_get_string_time and proto_tree_add_time_item routines for getting nstime fields from the tvb when they are encoded in ASCII string form. The proto_tree_add_time_item routine is also usable for normal big/little-endian encoded time_t, and has the advantage of retrieving the value even if there's no proto tree. It also exposes the routines to Lua, both so that a Lua script can take advantage of this, but also so I can write a testsuite to test the functions. Change-Id: I955da10f68f2680e3da3a5be5ad8fdce7ed6808c Reviewed-on: https://code.wireshark.org/review/1084 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-13Replace QTableWidgets with QLabels + HTML tables.Gerald Combs1-0/+1
This lets the user select and copy the folder and plugin data as text. Add clickable local filesystem URLs while we're at it. (I suspect that you shouldn't use QTableWidgets unless you're creating a spreadsheet.) Change-Id: I45650bd4f4b6215824a4ed70ec80698d0805baba Reviewed-on: https://code.wireshark.org/review/1064 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-03(Pedantic): set editor modelines tab-width & etc to 8; Also: fix some ↵Bill Meier1-3/+3
indentation in packet-sip.c Change-Id: I623fc5e4c1247dbe5e15f0f33270f4f0994268ab Reviewed-on: https://code.wireshark.org/review/943 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte2-2/+0
(Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ ) Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9 Reviewed-on: https://code.wireshark.org/review/886 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte4-7/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte9-18/+0
(Using sed : sed -i '/^ \$Id\$/,+1 d') (No star only 2 spaces before) Change-Id: Id7b254031769a9dca2941304e4d3a0f4bdbc3f54 Reviewed-on: https://code.wireshark.org/review/883 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\* \$Id\$/,+1 d') (no space before star) Change-Id: I318968db2b8512ba1303b5fc5c624c66441658f0 Reviewed-on: https://code.wireshark.org/review/879 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte3-6/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') (Double space between star and $Id$) Change-Id: If9b8f345e3b6493de0b573600e60005c8b0b33c3 Reviewed-on: https://code.wireshark.org/review/877 Reviewed-by: Evan Huus <eapache@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 01:42:44 +0000