aboutsummaryrefslogtreecommitdiffstats
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
2017-02-15Windows: update GnuTLS to 3.4.11 and Libgcrypt to 1.7.6Pascal Quantin1-18/+22
Also switch some third party libraries to stripped version to reduce size Change-Id: If0fd06a85fb17fb3e35543bcc714c8a8a1ce20c6 Reviewed-on: https://code.wireshark.org/review/20117 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-02-13Make Libgcrypt a mandatory dependencyPeter Wu1-1/+1
Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to error out if it is not available. Update release notes, developer documentation and README with the new status. Clarify relation with GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script. Motivation for this change is that many dissectors depend on Libgcrypt and having it optional increases the maintenance burden (there have been several compile issues in the past due to the optional status). Furthermore, wsutil has crypto code that can be replaced by Libgcrypt. Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20030 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-13tools: add suppressions to valgrind.Dario Lombardo1-0/+23
Remove leaks from libgcrypt. Change-Id: I920e504cfcb45c41510f3edc65d2dbeefda5c5a1 Reviewed-on: https://code.wireshark.org/review/20093 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-12[skinny]: Add struct/union guards to multi-part message handlersDiederik de Groot1-24/+83
Improve multi-part message handling - Calculate (sub) structure/union length - Add a guard when iterating over multi-part message - For fixed length messages, advance the cursor when iteration falls short of max length Change-Id: Id2af3aa1a878328f105e173cabe2b68dd0343507 Reviewed-on: https://code.wireshark.org/review/20057 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-12[skinny] Fix ConnectionStatRes and DialedNumber Messages protocol version >20Diederik de Groot2-138/+155
- ConnectionStatisticsResponse Comes in three different forms - DialedNumber Message has variable length Minor: - Pass ipv4or6 connection address back to calling function (using this later on in seperate commit) - Correct spelling mistakes - Remove duplicates from DeviceType[] Change-Id: Ib1619b163c12b6a4c6c86972186d828be3fd94e2 Reviewed-on: https://code.wireshark.org/review/20056 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-06checkfiltername: Add llc.bluetooth_pid to the whitelistMichal Labedzki1-1/+1
"llc.bluetooth_pid" is now placed in bluetooth-file, it seems to be fine, but there is a need to avoid terrible/horrible scream from this script. Change-Id: I0bf3f5b5f6459ab1f13a8c2c6ad12859af608e85 Reviewed-on: https://code.wireshark.org/review/19969 Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-02-02ncp: convert GHashTable to wmem_map_t.Dario Lombardo1-3/+4
Change-Id: I0de1c332a6052c20f6afbe1e51dfb14e18485891 Reviewed-on: https://code.wireshark.org/review/19899 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: Dario Lombardo <lomato@gmail.com>
2017-02-02tools: add a Gtk/GNOME suppression file.Dario Lombardo2-0/+295
As described here https://wiki.gnome.org/Valgrind valgrind can be tuned for Gtk/GNOME (glib) software by this official (or so) suppression file. Add it to the standard valgrind script to reduce the output for those functions out of Wireshark scope. Change-Id: I5dbc91ce82a890c9c02b624289ced96909be5f84 Reviewed-on: https://code.wireshark.org/review/19910 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-01-29Register reassembly tablesMichael Mann1-0/+4
Register all reassembly tables with a central unit, allowing the central unit to have the callback that initializes and destroys the reassembly tables, rather than have dissectors do it individually. Change-Id: Ic92619c06fb5ba6f1c3012f613cae14982e101d4 Reviewed-on: https://code.wireshark.org/review/19834 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-23Fuzz: Fix the capinfos check (again).Gerald Combs1-1/+1
Capinfos might return 1 *or* 2 for an invalid capture. Change-Id: I1ff2ed2a5b252a77a894ad3fe10c983e9a2a1bc0 Reviewed-on: https://code.wireshark.org/review/19752 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-23tools: allow multiple suppression file for valgrind.Dario Lombardo1-1/+1
Change-Id: I7074705230deb3d24df8f2ea694a3a485c848efd Reviewed-on: https://code.wireshark.org/review/19711 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-01-18Update fuzz-test to match capinfos behavior.Gerald Combs1-1/+1
As of gebd3dc6, capinfos returns 2 for invalid capture files. Change-Id: I00c1ab44c9929a9e922ac2a1ee8904632c1e460f Reviewed-on: https://code.wireshark.org/review/19667 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-13tools: add options documentation to valgrind-wireshark.shDario Lombardo1-1/+19
Change-Id: Id0bb85b9499f1e6f327b711d38deefe295e92c1a Reviewed-on: https://code.wireshark.org/review/19624 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-10Rename tvb_new_subset() to tvb_new_subset_length_caplen().Guy Harris1-1/+1
This emphasizes that there is no such thing as *the* routine to construct a subset tvbuff; you need to choose one of tvb_new_subset_remaining() (if you want a new tvbuff that contains everything past a certain point in an existing tvbuff), tvb_new_subset_length() (if you want a subset that contains everything past a certain point, for some number of bytes, in an existing tvbuff), and tvb_new_subset_length_caplen() (for all other cases). Many of the calls to tvb_new_subset_length_caplen() should really be calling one of the other routines; that's the next step. (This also makes it easier to find the calls that need fixing.) Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b Reviewed-on: https://code.wireshark.org/review/19597 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Escape opening curly braces in gen-bugnote.Gerald Combs1-5/+6
Curly braces are used for attribute replacement in AsciiDoc. Change-Id: I1461ee26543dd20a9f799084a01710faef78f2d0 Reviewed-on: https://code.wireshark.org/review/19517 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-30lemon: Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-1/+1
lemon.c:877:10: warning: Access to field 'lhs' results in a dereference of a null pointer (loaded from field 'startRule') lemon.c:1141:22: warning: Access to field 'lhs' results in a dereference of a null pointer (loaded from field 'startRule') it is false positve lem.nrule==0 implies lem.rule==NULL Change-Id: Id63086990762fbf5195bce34a28f25aeb7a246f7 Reviewed-on: https://code.wireshark.org/review/19445 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-24Lemon: resync with upstreamAlexis La Goutte2-209/+495
lemon: Tue Aug 16 16:46:40 2016 lempar: Tue Dec 6 17:59:05 2016 +0000 a copy of all Wireshark changes are available https://github.com/alagoutte/sqlite/tree/wireshark Change-Id: I144d0f983e4ac960b5a7a2fd8cd379f6282579f8 Reviewed-on: https://code.wireshark.org/review/15987 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: Michael Mann <mmann78@netscape.net>
2016-12-19tools: add rpm-setup.sh.Dario Lombardo3-0/+147
This script mimics tools/debian-setup.sh for RPM based systems. It installs all the required and optional packages to compile Wireshark. Tested on Centos 7, Fedora 25, openSUSE Leap 42.1. Change-Id: Ifc55f45608e5f5a74188d4fb5612bedb6437fcb1 Reviewed-on: https://code.wireshark.org/review/19088 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-12-15Update tools/commit-msg.Gerald Combs1-5/+15
Update tools/commit-msg to version 2.12.7 by running curl -Lo tools/commit-msg https://code.wireshark.org/review/tools/hooks/commit-msg Change-Id: Ie70a8e869968b5237c9e21c0624f1f8af696d83b Reviewed-on: https://code.wireshark.org/review/19290 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-13win-setup.ps1: add missing zlib-1.2.8-ws folderPascal Quantin1-0/+1
Change-Id: Ie32a231146365c11fe80e9e4f414ef7c464a8249 Reviewed-on: https://code.wireshark.org/review/19247 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-12-13Update to WinSparkle 0.5.3.Gerald Combs1-4/+5
Update our WinSparkle package to 0.5.3. This fixes a file deletion bug. Note that WinSparkle now supports application shutdown callbacks, which should let us fix bugs 9687 and 12989. Bug: 13217 Change-Id: I4b5f325c6dc251ce167f7bd344bbf3ca5ad3fe14 Reviewed-on: https://code.wireshark.org/review/19230 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-10Boost the max CPU time.Guy Harris1-1/+1
See if that lets the big file from bug 13226 pass the test under Valgrind. Change-Id: I76eb0c18809289e3b14ff8071402c31f70d93d42 Ping-Bug: 13226 Reviewed-on: https://code.wireshark.org/review/19189 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-06codecs: Add support for G.722 and G.726Peter Wu2-3/+6
Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-03install_rpms_for_devel: add optional packages.Dario Lombardo1-2/+20
Install all optional dependencies as reported by cmake. Tested on Centos7, openSUSE Leap 41.1, Fedora 24. Fedora 24 is shipped with lua5.3, that is not compatible with the current master, then it is not enabled. Change-Id: Ie4de7ff2849d66371e94d5d7960aab8146337dea Reviewed-on: https://code.wireshark.org/review/18968 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-11-28Update message on outdated precommit hookMatthieu Coudron1-1/+1
Change-Id: I3afb93cced09df7844c0810438ee6d760f8237a5 Reviewed-on: https://code.wireshark.org/review/18960 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-23debian-setup: check for both libgnutls-dev and libgnutls28-dev.Dario Lombardo1-1/+6
Change-Id: Ibe63e1d9b7527295223fc817889a60db79869e27 Reviewed-on: https://code.wireshark.org/review/18935 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-11-23debian-setup: remove lsb_relese check.Dario Lombardo1-6/+0
It is not used anymore and breaks docker builds. Change-Id: Ic4a2e6abf2da8059f28fcee19e611a8a83165895 Reviewed-on: https://code.wireshark.org/review/18934 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-16debian-setup: remove libssh-dev from basic list.Dario Lombardo1-1/+1
Change-Id: I34c0c24bc9240e27cbdf71f6ef1ae0adbb27cd7f Reviewed-on: https://code.wireshark.org/review/18830 Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-11-16Double the fuzz testing memory limit.Gerald Combs1-1/+1
Increase MAX_VMEM to 1000000 in order to accomodate a large capture file in the menagerie and allow some breathing room for future large captures. Change-Id: I61d1a56d30d49af5c25785f8d43f104b6a300da5 Ping-Bug: 13049 Reviewed-on: https://code.wireshark.org/review/18838 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-09debian-setup: allow libssh-dev to be installed for trustyPeter Wu1-12/+24
Ubuntu 14.04 Trusty has libssh-dev 0.6.1 (using OpenSSL) which should be usable. The debian/control file is not updated due to OpenSSL licensing concerns, if you need to build on trusty, you need dpkg-buildpackage -d (--no-check-builddeps). Remove distro-detection in favor of feature detection. Note that the minimum Ubuntu versions could be lower, but unsupported versions are not listed on packages.ubuntu.com so I did not bother. Change-Id: Ia04d960f3d4957918c925bf9cd351537e233fd3e Reviewed-on: https://code.wireshark.org/review/18725 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-11-06Get rid of Boolean "flags" that don't have any bit set.Guy Harris1-12/+17
And tweak the Pidl generator for Wireshark not to generate "flags" like that. (The generator also does field name and true/false strings' case differently, so I didn't use it to regenerate the dissectors; that needs to be looked at.) Change-Id: Ie1657a782ebdb107e58792cedd29bbaa79b17bd4 Reviewed-on: https://code.wireshark.org/review/18695 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-11-04debian-setup: remove libssh-gcrypt-dev from trusty.Dario Lombardo1-2/+2
Change-Id: I62080885a0f9a99ee02ecae8e67caefcefdea0e4 Reviewed-on: https://code.wireshark.org/review/18660 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-11-02Packaging: Add dependencies for lz4 and snappy packagesBenoît Canet3-3/+15
Do it for Debian-like, RPM-based, and MacOS (via Homebrew) systems. Signed-off-by: Benoît Canet <benoit@scylladb.com> Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Change-Id: I52802301815243021c039da6a27af6c534792439 Reviewed-on: https://code.wireshark.org/review/18272 Reviewed-by: Benoît Canet <benoit@scylladb.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-11-02pre-commit: fix indentAlexis La Goutte1-1/+1
Change-Id: I50291be3fd275cde8af42c45c17e52345d1c6215 Reviewed-on: https://code.wireshark.org/review/18619 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-02Validate the Diameter XML files in the pre-commit script.Jeff Morriss2-7/+17
Validation requires xmllint but will pass (with a complaint) if the committer does not have xmllint installed. Change-Id: I336a1c8ad8e1f98805a284d8c4736810b1a9c54e Reviewed-on: https://code.wireshark.org/review/18609 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-27checkAPI: move atoi from soft-deprecated to prohibited.Dario Lombardo1-7/+2
The atoi function has been completely removed from the tree. It's still present in the GTK code, but, since GTK compilation has been removed in the default, checkAPI target doesn't complain, as well as the buildbot. Change-Id: I436d6f333b99b9188734155c1f92273420354947 Reviewed-on: https://code.wireshark.org/review/18432 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-10-26Driver.pm (pidl): fix spelling typo found by lintianAlexis La Goutte1-1/+1
Change-Id: Idb288beb54c91e100c164e0026b39bfe27daec39 Reviewed-on: https://code.wireshark.org/review/18485 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-26Update libssh to 0.7.3Pascal Quantin1-5/+5
Change-Id: Ib5f93d0e3be2866e665713af3a1fa95a4f3253b7 Reviewed-on: https://code.wireshark.org/review/18481 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-26ncp2222.py: fix spelling typo found by lintianAlexis La Goutte1-2/+2
Change-Id: If077e05568efc4dc8981da9558047fe147b5d139 Reviewed-on: https://code.wireshark.org/review/18486 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-22Add SBC decoding support to WindowsPascal Quantin1-2/+5
Change-Id: Ibef872dff26c22e2834e958c496c33a5695bb131 Reviewed-on: https://code.wireshark.org/review/18394 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-20debian: Ship ciscodump and sshdumpBalint Reczey1-1/+1
Both binaries use libssh. Libssh can be linked to OpenSSL or to Libgcrypt. Since the ciscodump and sshdump executables are covered by GPL-2+ the Debian package build depends on the libssh flavor built with libgcrypt. Change-Id: If2dd85beb08e4b04f0c3aac46966fce67828b473 Reviewed-on: https://code.wireshark.org/review/18263 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-19Do not update register.c's timestamp if it is unchanged, otherwise it gets ↵Joerg Mayer1-1/+0
recompiled every time one of its dependencies is touched. Change-Id: I8c0c4caea8355748e5abf9b9fe3804834353075f Reviewed-on: https://code.wireshark.org/review/18304 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-18CQL: add LZ4/Snappy decompression support on WindowsPascal Quantin1-4/+10
Change-Id: I34374cf29357e2ed5062da1a5245b9adbabf732d Reviewed-on: https://code.wireshark.org/review/18249 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-17$Id$ is useless with git - treat it exaclty like thisJoerg Mayer1-1/+1
Change-Id: I607ce7ded40864c1b4dcc0a2d577a65923af4225 Reviewed-on: https://code.wireshark.org/review/18248 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-17Add a comment how to run git review after using --no-verfiy.Joerg Mayer1-0/+3
Change-Id: I07cde41ef6f8074efbb77eacde91b46b62c2f59e Reviewed-on: https://code.wireshark.org/review/18230 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-13Remove nghttp2 code and use system' nghttp2Balint Reczey4-2/+6
Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-10fuzz-test: Fix an exit status check.Gerald Combs1-3/+3
Make sure we check the exit status of the Valgrind process, not the most recently executed command. Change-Id: I3b6bd427383e4271b9ed38a10da6db506a511dc1 Reviewed-on: https://code.wireshark.org/review/18138 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-08Combine Decode As and port preferences for tcp.port dissector table.Michael Mann1-0/+1
This patch introduces new APIs to allow dissectors to have a preference for a (TCP) port, but the underlying data is actually part of Decode As functionality. For now the APIs are intentionally separate from the regular APIs that register a dissector within a dissector table. It may be possible to eventually combine the two so that all dissectors that register with a dissector table have an opportunity to "automatically" have a preference to adjust the "table value" through the preferences dialog. The tcp.port dissector table was used as the guinea pig. This will eventually be expanded to other dissector tables as well (most notably UDP ports). Some dissectors that "shared" a TCP/UDP port preference were also converted. It also removed the need for some preference callback functions (mostly when the callback function was the proto_reg_handoff function) so there is cleanup around that. Dissectors that has a port preference whose default was 0 were switched to using the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference Also added comments for TCP ports used that aren't IANA registered. Change-Id: I99604f95d426ad345f4b494598d94178b886eb67 Reviewed-on: https://code.wireshark.org/review/17724 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07Disable ASAN when building lemon.Gerald Combs2-4/+5
If ASAN is enabled, use "-fno-sanitize=all" when building lemon. This keeps us from having to set ASAN_OPTIONS=detect_leaks=0 in the environment in order to build Wireshark. Change-Id: I36f6d1a4f913ecabaf188f4c2b59216c8430d81a Reviewed-on: https://code.wireshark.org/review/18098 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-05randpkt-test: Fix our optstringGerald Combs1-1/+1
"-a" doesn't have an argument. Change-Id: Ia178985925da6e8bf9e1f0e9626521fb93656632 Reviewed-on: https://code.wireshark.org/review/18086 Reviewed-by: Gerald Combs <gerald@wireshark.org>