aboutsummaryrefslogtreecommitdiffstats
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
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>
2016-10-02make-manuf: Add more sanity checks.Gerald Combs1-13/+28
Increase the number of minimum entries required in each IAB / OUI file to 1000. Add a minimum total entry count. Add total counts to the output. Trim whitespace so that we pass the pre-commit hook. Re-run make-manuf to fix the mass removal in g3ab0137. Change-Id: I6f924969c1b494f2e0b62570a459e99ba5c1b02f Reviewed-on: https://code.wireshark.org/review/18030 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-30cmake: make WERROR_COMMON_FLAGS a normal stringPeter Wu1-7/+18
Instead of checking for the boolean "FALSE", just set an empty string. This avoids the need to check for WERROR_COMMON_FLAGS before using it. The transformation is the same for all files, remove "if (WERROR_COMMON_FLAGS)" and "endif()", reindent and add quotes (since we have a string here and not a list). Modelines have been added where missing. Change-Id: I0ab05ae507c51fa77336d49a99a226399cc81b92 Reviewed-on: https://code.wireshark.org/review/17997 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com>
2016-09-29Update c-ares to 1.12.0Pascal Quantin1-5/+5
Change-Id: Icd70f5e4e5e1a41a6a188500874a893433ecb8ed Reviewed-on: https://code.wireshark.org/review/17985 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-26Add an initial "shellcheck" target.Gerald Combs3-0/+3
Look for shellcheck in Autotools and CMake, and if found add a target that checks some of our shell scripts. Add a "source=" directive to targets that include test-common.sh so that shellcheck will correctly process the scripts. Note that this requires shellcheck 0.4.0 or later. To do: Fix the issues that shellcheck found and check more scripts. Change-Id: I441f9f59d8a3f8eec6718119c2370f2560b98f3c Reviewed-on: https://code.wireshark.org/review/17943 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-09-24Check for ASAN when fuzzing.Gerald Combs4-4/+13
Try to determine if we passed -fsanitize=address to gcc or clang and adjust the ASAN variable fuzz-test.sh, randpkt-test.sh and test-captures.sh accordingly. Change-Id: I88a34828fb5875e1a74a3b180ffb3da37daac0bd Reviewed-on: https://code.wireshark.org/review/17848 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-21Add a -a flag to use if TShark was built with ASan.Guy Harris1-4/+17
We mustn't set the virtual address space limit if that's the case, as ASan consumes a ton of address space. Clean up a comment while we're at it. Change-Id: I7e88135f16b21cb091a73a35de70bee757fb3876 Reviewed-on: https://code.wireshark.org/review/17847 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-21Set the VA limit with ulimit -S, and clean up comments.Guy Harris2-9/+20
Other limits are set with -S, do that with the virtual address space limit as well. Change-Id: Ie427341a4c7be56d3e8d96be6c1713c56e9bad87 Reviewed-on: https://code.wireshark.org/review/17846 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-19Support bitfields for FT_CHAR.Guy Harris1-1/+2
Change-Id: I3ad1ad27107c9e2c0d9da6d05f0a06609369271f Reviewed-on: https://code.wireshark.org/review/17789 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-11Add a -a flag to specify running under ASan, and don't set ulimit -v if so.Guy Harris1-2/+20
You can't run ASan-built programs with a ulimit, as ASan allocates a huge amount of shadow memory. Change-Id: Ic4d3c2fae77719f65d4594774bc8aa92d2a3a035 Ping-Bug: 12797 Reviewed-on: https://code.wireshark.org/review/17645 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06checkAPI: move atoi from deprecated to soft-deprecated list.Dario Lombardo1-2/+7
atoi must lie in soft-deprecated list until close to complete removal. Change-Id: Ia26ada56114559637fdc598913ee93523ed9434d Reviewed-on: https://code.wireshark.org/review/17529 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-09-06We now support C++/C99-style comments.Guy Harris1-1/+1
Change-Id: I175a6b0060235c2dfc7a5b3dc4ab62843d242e94 Reviewed-on: https://code.wireshark.org/review/17514 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06Allow a lot more C99 featuresPeter Wu1-11/+0
Flexible array members are supported by gcc, clang and even MSVC2013. Note, so far it was only used in the Windows-specific airpcap.h. Trailing commas in enum declaration are already in use since for these dissectors (commit ID is the first occurrence): epan/dissectors/packet-gluster.h v2.1.0rc0-1070-g3b706ba epan/dissectors/packet-ipv6.c v2.1.2rc0-81-ge07b4aa epan/dissectors/packet-netlink.h v2.3.0rc0-389-gc0ab12b epan/dissectors/packet-netlink-netfilter.c v2.3.0rc0-239-g1767e08 epan/dissectors/packet-netlink-route.c v2.3.0rc0-233-g2a80b40 epan/dissectors/packet-quic.c v2.3.0rc0-457-gfa320f8 Inline functions using the "inline" keyword are supported via all glib versions we support (if it is missing, glib will define a suitable inline macro). Other c99 functions listed in the README.developer document were found to be compatible with GCC 4.4.7, Clang 3.4.2 and MSVC 2013. Change-Id: If5bab03bfd8577b15a24bedf08c03bdfbf34317a Reviewed-on: https://code.wireshark.org/review/17421 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-05checkAPI: add deprecated atoi.Dario Lombardo1-0/+1
Instead use ws_strtoi/u functions. atoi() doesn't make any kind of check so it should be avoided. ws_strtoi/u should be used instead of strtol & co., but they're still acceptable for some cases that deviate from the basic usage. Change-Id: I145ff4d8f893852e024c4ea8fc6a836b15bd2b0d Reviewed-on: https://code.wireshark.org/review/17502 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-31Win: switch back to Lua library compiled with MinGWPascal Quantin1-12/+4
It does not suffer anymore from bug 9957 Change-Id: I871f01db67101b09a21545ecec5473941997a5cb Reviewed-on: https://code.wireshark.org/review/17416 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-08-30Don't use a no-longer-extant variable.Guy Harris1-1/+1
Change-Id: I41c1a37248335d983da58b0b657a28ec521be290 Reviewed-on: https://code.wireshark.org/review/17378 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-24Fuzz test: Make Valgrind error detection more verbose.Gerald Combs1-0/+3
When we set VG_ERR_CNT=1 print the reason. Change-Id: Icb8f2a1e7074044521873b116fc891cc4be4b204 Reviewed-on: https://code.wireshark.org/review/17287 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-23CMake: Allow setting per target compiler warningsJoão Valverde1-0/+1
Setting our compiler warning flags in CMAKE_C_FLAGS does not allow using different flags per target. Allow for that possibility by setting the internal WS_WARNINGS_{C,CXX}_FLAGS and using the COMPILE_OPTIONS property to set them. This change is just setting mechanism and there should be no difference in generated warnings. The check_X_compiler_flag cmake test is changed to test each flag individually. We need a list, not a space separated string, and the aggregate test is not significant. Change-Id: I59fc5cd7e130c7a5e001c598e3df3e13f83a6a25 Reviewed-on: https://code.wireshark.org/review/17150 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-08-23Documentation with unset license is under project's license (GPL-2+)Balint Reczey1-35/+5
doc/idl2deb.pod is licensed explicitly under GPL-2+ it is just not recognized by the check. Change-Id: Iabc7ee6bd6fe9080d6cdd28a29bb4c5f97b0ece9 Reviewed-on: https://code.wireshark.org/review/17268 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2016-08-22Merge the CaveBear list into manuf.tmpl.Gerald Combs1-39/+11
If the following lines at the top of "Ethernet.txt" are anything to go by ---- $Revision: 2.83 $ $Date: 1999/03/09 11:36:19 $ $Author: map $ $Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $ ---- we've been fetching the same list over and over for quite some time. Go ahead and merge the CaveBear list with manuf.tmpl and stop fetching it remotely. Fixup the way we split the lines we get from the IEEE while we're here, otherwise we log carriage returns in the middle of lines. The following CaveBear lines were skipped during the merge: Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c 00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes" 00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix" 00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD" 00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB" 00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C" 00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom" 00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR" 00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT" 00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T" 00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)" 00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell" 00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP" 00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI" 00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS" 00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent" 00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray" 00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT" 00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC" 00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD" 00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems" 00:00:DD - Skipping CaveBear "Gould" in favor of "Gould" 00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph" 00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi" 00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge" 00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq" 00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell" 00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM" 00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com" 00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc" 00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc." 00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC" 00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS" 00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS" 00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit" 00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco" 00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend" 02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco" 02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC" 08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com" 08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC" 08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN" 08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP" 08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General" 08:00:38 - Skipping CaveBear "Bull" in favor of "Bull" 08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola" 08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI" 08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix" 09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T" 10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP" 10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC" 3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com" 44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft" Reviewed-on: https://code.wireshark.org/review/17212 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-19Add tools for setup macos dev environnement using brewAlexis La Goutte1-0/+51
Will be reused for Travis osx Change-Id: Ida905768efc4e48be9936b3113704dcb651d4ca0 Reviewed-on: https://code.wireshark.org/review/16495 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: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-18pre-commit: Ignore missing pre-commit-ignore.pyJoão Valverde2-10/+5
Print error message to stderr and return non-zero exit status from child process. Change-Id: Icd433d79c5a7bf8b6ddd8e94e26695b353e34d1f Reviewed-on: https://code.wireshark.org/review/17116 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
2016-08-17Add a script to validate the Diameter dictionary XML.Jeff Morriss2-0/+78
I wrote this during Sharkfest to get the Diameter dictionary into (mostly) valid XML. There's some room for improvement in the script but it works. Change-Id: Ic8548c4f321831397951bf1d76779c263a832682 Reviewed-on: https://code.wireshark.org/review/17124 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-08-17pre-commit: Make version check work with git-worktreeJoão Valverde1-3/+5
By disabling it outside the main working tree this time. Change-Id: I2075b07370e3cc1395c6de9695e40b0a952e3eab Reviewed-on: https://code.wireshark.org/review/17122 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>