aboutsummaryrefslogtreecommitdiffstats
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
2015-06-29tools/asn2wrs.py: fix isdn-sup generation with Py3Peter Wu1-16/+10
Python 3 has removed the cmp function for sort functions, relying on a key function instead. Tested with Python 2.7.10 and 3.4.3. Change-Id: Id571b836304528ecc3b23a0f8a2843c4538c3e1b Reviewed-on: https://code.wireshark.org/review/9212 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-29tools/asn2wrs.py: handle windows-1252 encodingPeter Wu1-3/+12
The RRC ASN.1 definitions resulted in a decode error in Python because the file is encoded as windows-1252 instead of UTF-8. This patch makes the tool more forgiving in handling windows-1252 encodings. Tested with Python 2.6.9, 2.7.10, 3.4.3. Change-Id: I9c9269e1065c98b8bcfb57ab4bfd21d5e183a656 Reviewed-on: https://code.wireshark.org/review/9133 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-27checkAPIs.pl: check how ui class files are includedMartin Kaiser1-10/+31
flag up a warning if a ui class file is included from the current directory by using #include "" Visual Studio needs #include <> to make sure that we always pick up these files from the build directory if we're building with CMake combine this check with the other check for gcrypt.h so that included files are checked in one common subroutine Change-Id: If8420ff5886f8eb2a71aa8fbfe6bc5d2bda607ce Reviewed-on: https://code.wireshark.org/review/9189 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-26Update valgrind script for the UIEvan Huus1-2/+2
Plain 'wireshark' is now the Qt version, and 'wireshark-gtk' is the GTK version. Change-Id: I893d6ae9a205998e191cbf6160cf27fcfd09bb4d Reviewed-on: https://code.wireshark.org/review/9181 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-26tools: permit setting BIN_DIR in the environmentEvan Huus5-17/+21
For out-of-tree builds you have to pass the location of your build to our tools like the fuzz script, valgrind script etc. Modify them so that the value can be set in the environment rather than requiring a shell script flag. Set the environment variable in the vagrant provision step, so that the scripts Just Work (TM) in the VM. Change-Id: If8ce6b278176085ba6dd994137b82fc989b80124 Reviewed-on: https://code.wireshark.org/review/9168 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-25Replace Folder.CopyHere with 7-Zip.Gerald Combs1-11/+59
Server Core editions of Windows don't have shell.application. As a result CopyHere and its unzip capabilities aren't guaranteed to be available. Plus, CopyHere is just plain slow. Remove the CopyHere code. Search for 7z and 7za in various places and download the standalone 7za if needed. Bug: 11151 Change-Id: Ie719effbdcee3141764183bf3535ec9bd1c3e97a Reviewed-on: https://code.wireshark.org/review/8226 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-25Stop using atof/strtod (fixes column sorting of float types)Peter Wu1-0/+1
atof is locale-dependent. In locales such as Swedish, German and Dutch, the dot is a thousand separator, resulting in wrong conversions for floats. While at it, make the mate dissector also be independent of locale. Blacklist atof in checkAPIs. Lemon is still using strtod, but that is not our problem for now. Bug: 11297 Bug: 8964 Change-Id: I6fe3e45eb1d6d95d41aa4f3af1f81a6204a60c63 Reviewed-on: https://code.wireshark.org/review/9116 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-24Remove the last deprecated tvb_length callsEvan Huus1-1/+0
And remove the shims themselves! Change-Id: I511c06eb21eaf68d1dc36bbb9558408807472f9c Reviewed-on: https://code.wireshark.org/review/9088 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-22checkAPIs.pl: proto_tree_add_bytes_item takes an encoding parameterPascal Quantin1-1/+1
Change-Id: Iebe0e2483d9fd1661bf87ea5efaeb4ae14f6e105 Reviewed-on: https://code.wireshark.org/review/9027 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-06Use %zu, not %zd, to print a size_t value (%zd would be for ssize_t).Guy Harris1-1/+1
Change-Id: I3aee7028cc43ca487492b0c5c6872be5c52d1a80 Reviewed-on: https://code.wireshark.org/review/8799 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-31Fix zlib cmakeGraham Bloice1-4/+4
Add support for the locally modified version of zlib to suppress a CMake warning and disable building of the zlib examples. Change-Id: I9ae08b49d149951e8626d506f69f1757a1ec7e23 Reviewed-on: https://code.wireshark.org/review/8706 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-05-26Remove proto_tree_add_text from some dissectors.Michael Mann1-0/+1
Change-Id: Id7ef95a56d9d8cc01f9a1a4556ad056b8bb7f8bc Reviewed-on: https://code.wireshark.org/review/8654 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-07Need to generate hf_ variable for aliases in structs.Michael Mann1-1/+2
Change-Id: I6bd995d42cf54aaf2ad90d0322056c7ff0830ea9 Ping-Bug: 11156 Reviewed-on: https://code.wireshark.org/review/8324 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-07Remove proto_tree_add_text from idl2wrs generation.Michael Mann1-13/+27
Change-Id: Iab9df3e68d2a3878c3081c6352c45f7c329b983e Reviewed-on: https://code.wireshark.org/review/8323 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-06Fix the need to manually adjust packet-gias.c (take 2)Michael Mann1-10/+61
Need to have packet-gias.c in the DIRTY_CORBA_IDL_DISSECTOR_SRC grouping to work around the warnings still generated. Change-Id: I08ea1f7d90577cc112b85e7fc00171827f58d6d2 Reviewed-on: https://code.wireshark.org/review/8266 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-02Try to keep capinfos+ASan from failing.Gerald Combs1-0/+3
Set ASAN_OPTIONS=detect_leaks=0, otherwise all captures show up as invalid in capinfos. Change-Id: I4c2c1e52e9cd8b253cd4c01d0f8770294b66102e Reviewed-on: https://code.wireshark.org/review/7757 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-05-01Revert "Fix the need to manually adjust packet-gias.c"Alexis La Goutte1-60/+9
This reverts commit 3ca9318d8215738b8d4edcde0598226cfc6cf031. Mac OS X buildbot are not happy packet-gias.c:356: warning: 'hf_UCO_InvalidInputParameter_details' defined but not used packet-gias.c:359: warning: 'hf_UCO_ProcessingFault_details' defined but not used packet-gias.c:360: warning: 'hf_UCO_SystemFault_details' defined but not used packet-gias.c:5275: warning: 'decode_UCO_Ratio_st' defined but not used packet-gias.c:5303: warning: 'decode_UCO_DirectAccessLocation_st' defined but not used packet-gias.c:5588: warning: 'decode_UCO_Coordinate3d_st' defined but not used packet-gias.c:5612: warning: 'decode_UCO_Circle_st' defined but not used packet-gias.c:5625: warning: 'decode_UCO_Ellipse_st' defined but not used packet-gias.c:5656: warning: 'decode_UCO_SimpleGSImage_st' defined but not used packet-gias.c:5671: warning: 'decode_UCO_SimpleCImage_st' defined but not used packet-gias.c:5694: warning: 'decode_UCO_CompressedImage_st' defined but not used packet-gias.c:5836: warning: 'decode_GIAS_ImageSpec_st' defined but not used Change-Id: Iee076c00eb4e48571a99f6b854b7e3e52983c2f8 Reviewed-on: https://code.wireshark.org/review/8265 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-01Fix the need to manually adjust packet-gias.cMichael Mann1-9/+60
Change-Id: I11beada78d2f2b4359d3638cdbcb6f43623fd10c Reviewed-on: https://code.wireshark.org/review/8262 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-01Add tshark -z "ncp,srt"Michael Mann1-132/+0
Change-Id: Iab2559c2bac5550987c108c6e917506fcec525e9 Reviewed-on: https://code.wireshark.org/review/8221 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-01Fix some cases where we're shifting a signed 1 left.Guy Harris1-1/+1
Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) This fixes the *other* generator for the X11 header files; we manually fix the file in question, because life's too short to spend very much of it trying to debug Perl issues that cause a Can't use string ("1") as a HASH ref while "strict refs" in use at ../../tools/process-x11-xcb.pl line 675. at ../../tools/process-x11-xcb.pl line 1859 at ../../tools/process-x11-xcb.pl line 1859 failure. Change-Id: I3dd46025b2ae461e63034b36ab11cdbc9380b696 Reviewed-on: https://code.wireshark.org/review/8263 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-01Fix some cases where we're shifting a signed 1 left.Guy Harris1-1/+1
Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) This fixes the generator for the X11 header files; we manually fix the header file in question, because life's too short to spend very much of it trying to debug Perl issues that cause a Can't use string ("1") as a HASH ref while "strict refs" in use at ../../tools/process-x11-xcb.pl line 675. at ../../tools/process-x11-xcb.pl line 1859 at ../../tools/process-x11-xcb.pl line 1859 failure. Change-Id: Ia903e9dacad49021bc0dfe129b9393ad426de9eb Reviewed-on: https://code.wireshark.org/review/8261 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-27win-setup.ps1 Make setup script aware of proxiesChristoph Schlosser1-0/+5
This will allow the powershell setup script to utilize the system proxy configuration, allowing for a download behind a company firewall Change-Id: Id0bfaf4ded219374be6e60a08d620a519f5e4820 Reviewed-on: https://code.wireshark.org/review/8182 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Christoph Schlosser <christoph.schlosser@br-automation.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-23Move some checks so they're executed after the comments are removed.Jeff Morriss1-17/+18
We shouldn't complain if someone says "don't use __func__, it's not portable" in a comment. Change-Id: Ib712a00a68c14048eb5d97413a5d5bc0e0812e24 Reviewed-on: https://code.wireshark.org/review/8179 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-23idl2wrs: don't use -1 for the protocol-item length.Jeff Morriss1-1/+1
It doesn't work any more for empty (length==0) PDUs. Similar to bug 10646/Ifb96768969a43c59367b73e7bb940ceeb02cf6b0 (for RPC). Untested as I'm not set up to build IDL dissectors now. Bug: 11134 Change-Id: I77aacc2590acbacbe02edb1768e754f92f87bc23 Reviewed-on: https://code.wireshark.org/review/8163 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-22Add VALS_EXT_PTR to decorate pointers to value_string_ext's in hfinfo.Jeff Morriss1-1/+1
This allows checkAPIs to continue checking the 'convert' field for correctness when dissectors use value_string_ext_new() to build their value_string_ext's (without resorting to tricks like getting the address of the dereferenced pointer). This will be used to resolve the checkAPIs failure in patch set 3 of Ia5c96b1f6f1fe3a9521b3d70142889e3881fae5e . Change-Id: I700d86b9076f077706d34000f5a6aa5c96351f69 Reviewed-on: https://code.wireshark.org/review/8162 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-14Start moving win-setup to PowerShell.Gerald Combs1-0/+279
Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-09Pass HTTP URLs to wget.Gerald Combs1-4/+4
Not all wgets are equal. Revert part of 7787c1b so that wget fetches over HTTP instead of HTTPS. Change-Id: Iced263380429795975cf239cba7dac54bd729d38 Reviewed-on: https://code.wireshark.org/review/8005 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-08extcap: Add support for Android - androiddumpMichal Labedzki1-1/+1
androiddump is extcap program that can be used with Android devices (need Android SDK in system PATH). Supported is Logcat/Logger logs and Bluetooth interfaces for all Android to this day (Lollipop). Please note that it will work also for FirefoxOS. Interfaces: 1. Logcat Main (binary or text) 2. Logcat System (binary or text) 3. Logcat Events (binary or text) 4. Logcat Radio (binary or text) 5. Logcat Crash (text; Lollipop) 6. Bluetooth Hcidump (<Kitkat) 7. Bluetooth Bluedroid External Parser (Kitkat) 8. Bluetooth BtsnoopNet (Lollipop) Change-Id: I26e4cd1a37a6af805f8b932399b4aa44ee7b5a80 Reviewed-on: https://code.wireshark.org/review/7475 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-05Don't commit translation updates for now.Gerald Combs1-1/+1
Doing so conflicts with the weekly update script. Change-Id: I3ffbe9cbae9b8efdc8369de2054d9f8b8a8d5c5e Reviewed-on: https://code.wireshark.org/review/7921 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-04Add update-tx tools (Resync translation between repo and Transifex)Alexis La Goutte1-0/+33
Change-Id: Ica2902fbc8a089b3b877b00c1fd72397f2c08146 Reviewed-on: https://code.wireshark.org/review/7314 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-02Fixup our anonsvn URLs.Gerald Combs1-4/+4
Change-Id: Id18d392bf7ff948fc78b684d8222c5c3725d302a Reviewed-on: https://code.wireshark.org/review/7886 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-31LTE RRC: upgrade dissector to v12.5.0Pascal Quantin1-1/+1
Change-Id: I9e3dfb17b4b7f96be999ccea88fec754a936d312 Reviewed-on: https://code.wireshark.org/review/7869 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-26html2text.py: Python 2.5 compatibility, improve Unicode supportPeter Wu1-13/+16
Add support for Python 2.5 (remove unicode_literals import which does not seem to be necessary), check before using break_on_hyphens (without this option in Python 2.5, the output is uglier though) and avoid the 'with' keyword. While at it, fix reading Unicode text from file in Python 2 (tested with: echo € | tools/html2text.py) and support reading from stdin using the '-' filename. Tested against Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3 with the commands from the previous html2text.py commit message, and additionally with the Unicode character € as input (instead of the faq.py output). Change-Id: I3de3f7a4e7cf7d702463c3a59758803843338a54 Reviewed-on: https://code.wireshark.org/review/7823 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25dfilter-test.py: add OOT support and Python 3 compatPeter Wu2-10/+12
Support WS_BIN_PATH and SOURCE_DIR (modelled after test/config.sh) to support out-of-tree builds (including cmake). Add Python 3 support and mention this in the documentation. Tested with Python 2.7.9, 3.2.6, 3.4.3: WS_BIN_PATH=/tmp/wsbuild/run SOURCE_DIR=/tmp/wireshark \ tools/dfilter-test.py testBytesIPv6 (2.7.9 and 3.4.3 were also tested fully, but some cases seem to fail even before this patch. 2.5.6 and 2.6.6 do not work because the unittest module is outdated.) Change-Id: I13074579f6f74206edb5cd7be8e7a8406de49c56 Reviewed-on: https://code.wireshark.org/review/7793 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25indexcap.py: fix tmpdir handling, python 3 compatPeter Wu2-48/+53
Add Python 3 compatibility to indexcap.py and only create a tmpdir for actions that need it. Only remove tmpdir for the compare action and try to remove the temp dir even if an exception occurs. In list_protos_in_cap.sh, rename BIN_DIR to WS_BIN_PATH (matching test/config.sh) and allow it to be overridden from the environment. Tested with Python 2.6.6, 2.7.9, 3.2.6, 3.4.3 as follows (with tshark built using cmake and '-b /tmp/wsbuild/run'): tools/indexcap.py out pop-ssl.pcapng; tools/indexcap.py out pop-ssl.pcapng --list-all-proto; tools/indexcap.py out pop-ssl.pcapng --list-all-files; tools/indexcap.py out pop-ssl.pcapng --list-all-proto-files=ssl; rm out; Python 2.5.6 does not work (there is no multiprocessing module). The dict output in Python 3.4.3 is different (has the hash function changed?) Change-Id: I592d8c4458a20d5088d815c6dd1cf90c9d3df9d3 Reviewed-on: https://code.wireshark.org/review/7792 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25Always use html2text.py for FAQ, improve outputPeter Wu2-496/+159
A recent commit broke compilation with Python 3. The original author of html2text.py is deceased and the fork has increased the number of files for this "simple" helper. The html2text.py script in this patch was rewritten and its output matches with lynx (except for a few newlines around lists). This means that indentation has been added for headings, paragraphs and lists. Also, since it was written from scratch, a new license could be chosen that matches Wireshark. Since now the in-tree html2text.py script provides nicer output, remove detection of the alternative programs (elinks, links). lynx/w3m is somehow still necessary for asciidoc though. (I also looked into reusing html2text.py for the release notes to replace asciidoc, but the --format=html output produces different output (HTML adds a ToC and section numbers). For now still require lynx for release notes) Tested with Python 2.6.6, 2.7.9, 3.2.6 and 3.4.3 under LC_ALL=C and LC_ALL=en_US.UTF-8 on Linux. Tested reading from stdin and file, writing to file, pipe and tty. Tested with cmake (Ninja) and autotools on Arch Linux x86_64. Test: # For each $PATH per python version, execute (with varying LC_ALL) help/faq.py -b | tools/html2text.py /dev/stdin | md5sum help/faq.py -b | tools/html2text.py | md5sum help/faq.py -b | tools/html2text.py help/faq.py -b | tools/html2text.py >/dev/null Change-Id: I6409450a3e6c8b010ca082251f9db7358b0cc2fd Reviewed-on: https://code.wireshark.org/review/7779 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25Replace HF_EMPTY and ETT_EMPTY with -1Michael Mann1-3/+2
Change-Id: If3e89f8e46edd4eef82037b6b348fd70a9a3033d Reviewed-on: https://code.wireshark.org/review/7811 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-24ftsanity.py: make it work with modern tsharkPeter Wu1-22/+18
Broken since 4ac2441d7c7371249a3422fc2e67b8ad98aa6631 ("Coalesce "-G fields2" and "-G fields3" into "-G fields"). This patch fixes Python3 compatibility, fixes handling of the changed output and option and prints the faulting line on assertion error. It also updates two dissectors which had tabs in their description, breaking the output. Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3. Change-Id: Ifcd0d0eb092b357eca357cd53f2e1348ebf8885c Reviewed-on: https://code.wireshark.org/review/7791 Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-24checklicenses.py: add python3 compatibilityPeter Wu1-21/+24
Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3. Change-Id: I5893bb32d339118ec968edc7de0e185e39ab4f81 Reviewed-on: https://code.wireshark.org/review/7789 Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-22delete_includes.py: Python 3 compatibilityPeter Wu1-44/+40
While improving python 3 compatibility, fix whitespaces and remove the useless try/except block as these modules are part of core. Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3 (with "make" replaced by "true" and by comparing stdout). Change-Id: I9c585da89aef76f01672c8f7320ac4a13c6cc7d7 Reviewed-on: https://code.wireshark.org/review/7790 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-03-19Implement proto_tree_add_item_ret_int() and proto_tree_add_item_ret_uint() whichAndersBroman1-1/+1
works as proto_tree_add_item(), but also returns the value of (u)ints of 8,16,24 and 32 bits length in a 32 bit variable. It's based on Hadriels previous work. Change-Id: If3b4b8588b63251f1ee9b954a202acde7c02ce86 Reviewed-on: https://code.wireshark.org/review/7230 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-12checklicenses.py: check the first 150 lines of a filePascal Quantin1-1/+1
It should solve the recent failure seen since gdf164df Change-Id: If86bff18fcd9157941ea843ad5029c9d0b2f0b32 Reviewed-on: https://code.wireshark.org/review/7659 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-03-10Change a lot of http:// URLs to https://.Gerald Combs2-5/+6
Most of our sites are now HTTPS-only. Update URLs accordingly. Update other URLs while we're at it. Remove or comment out dead links. Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33 Reviewed-on: https://code.wireshark.org/review/7621 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-05Qt: Add extra related packet indicator types.Gerald Combs1-2/+2
Add the ability to set frame number types: none, request, or response. Use the types to draw different related packet indicators in the packet list. Track the conversation in PacketListRecord. Use it to draw dashed lines for unrelated frames. Set frame number types for DNS and ICMP. Instead of drawing a transparent QImage, alpha blend our foreground color and draw directly in our painter. Blend more toward the foreground color. Add FRAMENUM_TYPE to checkAPIs. Change-Id: I2495945bb436413e05d6ec697184a0b4fd5ad214 Reviewed-on: https://code.wireshark.org/review/7436 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-04Fuzz test : Add -a(SAN) option to disable ulimit when fuzzingAlexis La Goutte1-3/+13
from https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer#ulimit_-v The ulimit -v command makes little sense with ASan-ified binaries because ASan consumes 20 terabytes of virtual memory (plus a bit). Change-Id: I8c8c77dd51d5440fb2f9bd95f90873e59a64d409 Reviewed-on: https://code.wireshark.org/review/7204 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-03-03Eliminate e_uuid_t in favor of e_guid_t.Guy Harris1-1/+1
That eliminates a redundant and confusing data type, and avoids issues with one piece of code using e_uuid_t but wanting to use routines expecting an e_guid_t. Change-Id: I95e172d46d342ab40f6254300ecbd2a0530cde60 Reviewed-on: https://code.wireshark.org/review/7506 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-25delete_includes.py: add target for ui/qtMartin Mathieson1-2/+8
Change-Id: I9dc51fbef50941f04ccf5b0b5a8cd71f3693ade4 Reviewed-on: https://code.wireshark.org/review/7389 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-02-21checkAPIs: match packet-*.[ch], independent of localePeter Wu1-1/+1
In perl, the \w character group seems to match '-' depending on the locale. On Linux (with the C or en_US.UTF-8 locale), packet-ssl-utils.c does not match. This patch makes the regex match anything except for the path separator. Change-Id: I27543072295af5f2bd5ea8ab36e5d913bebf7d85 Reviewed-on: https://code.wireshark.org/review/7266 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-18Add a CF_FUNC macro for casting BASE_CUSTOM functions.Gerald Combs2-5/+5
Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid the following warning: warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic] We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be more consistent with the other macros in proto.h. Update each instance of BASE_CUSTOM to use CF_FUNC. Adjust a dummy variable name generated by asn2wrs.py that was triggering an invalid error in checkhf.pl. Fix an encoding arguement in packet-elasticsearch.c found by fix-encoding-args.pl. Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22 Reviewed-on: https://code.wireshark.org/review/7150 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-15Add ws_mempbrk_sse42_compile to Valgrind suppression listPascal Quantin1-0/+10
When running Valgrind 3.10.0 on an Ubuntu 10.10 x64 guest with Virtualbox 4.3.22, ws_cpuid_sse42() call triggers a false positive when checking ECX bit 20 Guy kindly verified the assembler code and confirmed that everything seems fine Let's remove the error to avoid noise when running Valgrind on a capture Change-Id: I357633950249a0c781482865c3221a1babdc74e2 Reviewed-on: https://code.wireshark.org/review/7124 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 07:47:29 +0000