summaryrefslogtreecommitdiff
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
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>
2016-08-17Fix a comparison in win-setup.ps1Gerald Combs1-2/+2
"if ($SomeVariable > 0)" is valid PowerShell syntax, but it writes the value of $SomeVariable to a file named "0". Use the "-gt" operator instead. Change-Id: I17e0f7033008ead3b24fed8c0c91869747ff81f1 Reviewed-on: https://code.wireshark.org/review/17093 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-17Add licensecheck.pl to the tarballJoão Valverde1-0/+1
checklicenses.py now needs it. Change-Id: I1a8c6e21fb35386dcaa44c72f9c196445a378a04 Reviewed-on: https://code.wireshark.org/review/17088 Reviewed-by: João Valverde <j@v6e.pt>
2016-08-15pre-commit: Fix version check to work with git-worktreeJoão Valverde1-1/+1
Change-Id: Ie895ca194738a022cc211ae50afbff0a561156a3 Reviewed-on: https://code.wireshark.org/review/17047 Reviewed-by: João Valverde <j@v6e.pt>
2016-08-15checklicenses: Fix a FIXMEJoão Valverde1-12/+37
We do not whitelist GPLv2 only code because of the incompatibility with GPLv3. Move the path exception to its proper place. These files are dual-licensed in the sense of "choose one or the other", not "both licenses are in use". If the exception becomes unnecessary later it can be removed, but let's get rid of the FIXME until then. Change-Id: Ia040284b72c2ff6588b0544896cc37ae19a61613 Reviewed-on: https://code.wireshark.org/review/16957 Reviewed-by: João Valverde <j@v6e.pt>
2016-08-09Windows: upgrade Lua library to 5.2.4Pascal Quantin1-4/+4
Change-Id: Ib0a4afc9b6143cf5ff78f72f0808f9f804549dd9 Reviewed-on: https://code.wireshark.org/review/16979 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-09checklicenses: Remove whitelisted licenses not being usedJoão Valverde2-61/+8
Removed a few licenses we shouldn't use (Apache v2, BSD 4-clause) and removed many others not currently being used. (Add on a need-to basis). Added GPLv3+ with Bison exception to licensecheck.pl. Also removed some crud to work around bugs for older licensecheck.pl versions. The original list came from the chromium project, which has a BSD-like license, and many more licenses in use, not all of them vetted for GPLv2+ compatibility. Change-Id: I67f334f21cd94904cf8a0e5d9beb659c82437df4 Reviewed-on: https://code.wireshark.org/review/16966 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-08-08debian-setup: add customized profiles.Dario Lombardo1-15/+33
libcap-dev has also been added to optional list. Change-Id: I52e034603922b694391a30c20316e1a2011fc3b6 Reviewed-on: https://code.wireshark.org/review/16872 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-08-06checklicenses.py: Remove some boilerplate from upstreamJoão Valverde1-6/+0
Change-Id: If8a1537fe5ad0c5decaf2facf6fd0c43b32ffe70 Reviewed-on: https://code.wireshark.org/review/16930 Reviewed-by: João Valverde <j@v6e.pt>
2016-08-06Add licensecheck.pl to our /tools directory and use itJoão Valverde2-20/+876
Source: https://anonscm.debian.org/cgit/collab-maint/devscripts.git/plain/scripts/licensecheck.pl?h=v2.16.2 Removed regex to check files without an extension. Change-Id: Icf98d0da2d201731da7134799ead0d2dc5c3fc39 Reviewed-on: https://code.wireshark.org/review/16913 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-06tools/pidl: support HRESULT as return code in wireshark autogenerated ↵Günther Deschner1-1/+8
dissectors. Guenther Change-Id: I68b7c579c5a519e429d2f4c2b3f63247e02f24e3 Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-on: https://code.wireshark.org/review/16718 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-06tools/pidl: Keep case from fieldnames.Günther Deschner1-1/+1
Change-Id: I5626cfa0487cc88eb65cc349c05ae1762bc953f4 Signed-off-by: Guenther Deschner <gd@samba.org> Reviewed-on: https://code.wireshark.org/review/16720 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-05Update FSF address.Guy Harris1-1/+1
Change-Id: I2a36a833f00f4acda253e5741c96c519588aa046 Reviewed-on: https://code.wireshark.org/review/16919 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-05Fix FSF address.Guy Harris1-1/+1
Change-Id: Icf473af9487e60003813435f18551225224c6d58 Reviewed-on: https://code.wireshark.org/review/16915 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-05checklicenses.py: Whitelist some plaintext files without license requirementsJoão Valverde1-0/+15
Change-Id: I029ef1d52ac6edd44c0bac41adb86361ddd94272 Reviewed-on: https://code.wireshark.org/review/16898 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-04asn2wrs: put back parsetab.py file in ASN.1 source folderPascal Quantin1-1/+1
Otherwise it breaks multi threaded compilation. Follow-up of gd04be01 Bug: 12621 Change-Id: I2f6b7d6ca85a1cf5a6713c2b36c823a520d3bf3d Reviewed-on: https://code.wireshark.org/review/16886 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-08-04Ply parser updated to 3.8 from http://www.dabeaz.com/ply/Balint Reczey3-1347/+1522
The Ubuntu packaged Ply 3.7 with Ubuntu 16.04's Python makes ASN.1 based dissector generation fail. Ply's API changed after 3.5 and the small change to asn2wrs.py adapts to that. The commit breaking the API in Ply's repository is the following: commit af651673ba6117a0a5405055a92170fffd028106 Author: David Beazley <dave@dabeaz.com> Date: Tue Apr 21 16:31:32 2015 -0500 Added optional support for defaulted states Change-Id: I1db33fdcccf7c39ecdb0e435a5ea9183362471ad Bug: 12621 Reviewed-on: https://code.wireshark.org/review/16864 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt>
2016-08-03Update USBPcap installer packaged in our Windows installerPascal Quantin1-4/+4
This new version contains kernel drivers with an EV certificate that is cross-signed by Microsoft as it will become mandatory. See https://blogs.msdn.microsoft.com/windows_hardware_certification/2016/07/26/driver-signing-changes-in-windows-10-version-1607/ for details. Change-Id: I76bb1005ea540f39dca8874abb88d71a3ad53625 Reviewed-on: https://code.wireshark.org/review/16862 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-07-27Copy over change from Samba repository:Guy Harris1-0/+8
commit ed11ce8f12d567a3e0edc1d24aab1784a171ac33 Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Date: Wed May 4 16:51:37 2016 +1200 Python pidl: avoid segfault with "del obj->attr" Deleting an attribute in Python (using the "del" statement) is (at some stages along a winding path, for C objects) converted into setting the attribute to NULL. Not None, actual NULL. The way we handled this NULL was to dereference it. This changes the behaviour to raising an AttributeError, which is more or less what Python does in similar situations with builtin objects. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Shouldn't affect us, but it makes diffing cleaner. Change-Id: I8e681dc79c8f4e62b74e2aa5ac2b4924134735c4 Reviewed-on: https://code.wireshark.org/review/16741 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Copy over change from Samba repository:Guy Harris1-42/+61
commit f6c79072ca50e05a68b73a80a0ebd635a9bac068 Author: Andrew Bartlett <abartlet@samba.org> Date: Thu Apr 21 21:44:56 2016 +1200 pidl: Correct string handling to use talloc and be in common The previous string handling assumed the python variables referenced by PyString_AS_STRING had infinite life. When they were re-used the C structure started to point at unexpected things. We now check correctly for Unicode in every case, and we always duplicate the string with talloc_strdup() Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Shouldn't affect us, but it makes diffing cleaner. Change-Id: Ib54b62f5630df46cff6fb0582acd109b263142d2 Reviewed-on: https://code.wireshark.org/review/16740 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Copy over change from Samba repository:Guy Harris1-2/+13
commit 90bf114f6370ee837d97e36eb25f38f8234dcd39 Author: Andrew Bartlett <abartlet@samba.org> Date: Thu Feb 25 13:57:37 2016 +1300 pidl: Use a tmp_ctx helper variable This is so we free the ndr_push_struct_blob() return value after we make it into a string Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Shouldn't affect us, but it makes diffing cleaner. Change-Id: I52ee911f89813e6f5a90445be4eb52494e3f69d3 Reviewed-on: https://code.wireshark.org/review/16739 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Copy change from Samba repository:Guy Harris1-1/+1
commit dffa2dbfabca14f07af12663fc93c8dc3bc837cf Author: Andrew Bartlett <abartlet@samba.org> Date: Thu Feb 25 13:57:00 2016 +1300 pidl: Use the $mem_ctx helper variable This is already set to pytalloc_get_mem_ctx(py_obj) Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Shouldn't affect us, but it makes diffing cleaner. Change-Id: I60fddc0a1055095ecad51180c9e1fc2223d2c017 Reviewed-on: https://code.wireshark.org/review/16738 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Copy over change from Samba repository:Guy Harris1-5/+7
commit 9e07f3a13b41be1f019887581b2a2bd049039a3d Author: Andrew Bartlett <abartlet@samba.org> Date: Tue Feb 16 14:06:28 2016 +1300 pidl: Fix our python reference handling The new talloc.BaseObject allow us to hold a talloc context per python object (there may be many referring to the same C object) and the talloc context that the actual object pointer is under. Another advantage is that talloc.BaseObject(), has less of an ABI surface. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Shouldn't affect us, but it makes diffing cleaner. Change-Id: If4a7d9d3f5eb0acf9f94b10af870a0e01fa52b5c Reviewed-on: https://code.wireshark.org/review/16737 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Pick up changes from the Samba repository:Guy Harris1-15/+42
commit 59d530c0b692dae41ea271bfdb473f212615041b Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Date: Tue Mar 1 14:18:52 2016 +1300 ndr: Use ndr_steal to avoid long lists When pulling complex structures like nt-acls, a long list of tokens may be produced. By removing tokens along the way with ndr_token_steal, future calls to retrieve from the token list are not as expensive. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> commit 9af628a488d2b628e6c33917be7030602eeb5fde Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Date: Fri Feb 26 17:01:37 2016 +1300 ndr: avoid unnecessary searches of token list When pulling complex structures like nt-acls, a long list of tokens may be produced. This change means the token list won't be walked in the buffers case if the switch value is not needed. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Change-Id: I0e0ce345e5184e0cd180b0079dd693a7ed3f31ef Reviewed-on: https://code.wireshark.org/review/16736 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-27Fix from the Samba repository:Guy Harris2-4/+3
Author: Aurelien Aptel <aaptel@suse.com> Date: Wed May 18 14:23:56 2016 +0200 pidl/ws: fix failing tests This commit fixes 2 test failures in Pidl test suite. - commit 02cd7808 changed the error the test was expecting => update expected output in the test - commit c76b65e changed whitespaces in the output => revert to the old output in the generator Signed-off-by: Aurelien Aptel <aaptel@suse.com> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: David Disseldorp <ddiss@samba.org> Change-Id: I142d4ae405edfff760c00b95e0475502a1eac2f0 Reviewed-on: https://code.wireshark.org/review/16734 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-04 04:01:18 +0000