Commit Graph

1909 Commits

Author SHA1 Message Date
Joerg Mayer cd426f3fe2 Add a comment how to run git review after using --no-verfiy.
Change-Id: I07cde41ef6f8074efbb77eacde91b46b62c2f59e
Reviewed-on: https://code.wireshark.org/review/18230
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-17 05:41:46 +00:00
Balint Reczey b1cc056b12 Remove nghttp2 code and use system' nghttp2
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-13 19:26:10 +00:00
Gerald Combs 9c20527967 fuzz-test: Fix an exit status check.
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-10 17:38:51 +00:00
Michael Mann 268841f3e0 Combine Decode As and port preferences for tcp.port dissector table.
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-08 02:44:53 +00:00
Gerald Combs 22d8142ce7 Disable ASAN when building lemon.
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-07 17:54:35 +00:00
Gerald Combs 2b5020aca5 randpkt-test: Fix our optstring
"-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-05 18:35:44 +00:00
Gerald Combs 7a6610fc99 make-manuf: Add more sanity checks.
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-10-02 19:05:46 +00:00
Peter Wu 534787e402 cmake: make WERROR_COMMON_FLAGS a normal string
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-30 20:08:02 +00:00
Pascal Quantin d8a2d39d42 Update c-ares to 1.12.0
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-29 20:35:10 +00:00
Gerald Combs b725d6c9ac Add an initial "shellcheck" target.
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-26 23:17:02 +00:00
Gerald Combs 17546ad883 Check for ASAN when fuzzing.
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-24 21:04:31 +00:00
Guy Harris 876bca186b Add a -a flag to use if TShark was built with ASan.
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-21 21:43:52 +00:00
Guy Harris ec0aeb983b Set the VA limit with ulimit -S, and clean up comments.
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-21 21:41:47 +00:00
Guy Harris 2de2ddd229 Support bitfields for FT_CHAR.
Change-Id: I3ad1ad27107c9e2c0d9da6d05f0a06609369271f
Reviewed-on: https://code.wireshark.org/review/17789
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-19 04:16:39 +00:00
Guy Harris 11d3a0f963 Add a -a flag to specify running under ASan, and don't set ulimit -v if so.
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-11 19:09:24 +00:00
Dario Lombardo 3fce8da341 checkAPI: move atoi from deprecated to soft-deprecated list.
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-06 12:31:02 +00:00
Guy Harris 4ec7675882 We now support C++/C99-style comments.
Change-Id: I175a6b0060235c2dfc7a5b3dc4ab62843d242e94
Reviewed-on: https://code.wireshark.org/review/17514
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06 02:44:32 +00:00
Peter Wu 232a879429 Allow a lot more C99 features
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-06 02:42:27 +00:00
Dario Lombardo 474199a974 checkAPI: add deprecated atoi.
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-09-05 16:37:12 +00:00
Pascal Quantin a7dd070d55 Win: switch back to Lua library compiled with MinGW
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-31 11:56:54 +00:00
Guy Harris 8e9b6f4abe Don't use a no-longer-extant variable.
Change-Id: I41c1a37248335d983da58b0b657a28ec521be290
Reviewed-on: https://code.wireshark.org/review/17378
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30 02:50:39 +00:00
Gerald Combs c2b98004df Fuzz test: Make Valgrind error detection more verbose.
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-24 17:11:31 +00:00
João Valverde 640382c743 CMake: Allow setting per target compiler warnings
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-23 21:33:09 +00:00
Balint Reczey 40ac3c8682 Documentation with unset license is under project's license (GPL-2+)
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-23 15:02:31 +00:00
Gerald Combs f062341540 Merge the CaveBear list into manuf.tmpl.
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-22 04:46:52 +00:00
Alexis La Goutte b420d4fb44 Add tools for setup macos dev environnement using brew
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-19 02:10:32 +00:00
João Valverde 0a609d4195 pre-commit: Ignore missing pre-commit-ignore.py
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-18 11:00:27 +00:00
Jeff Morriss f17ba6b21c Add a script to validate the Diameter dictionary XML.
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-17 23:53:23 +00:00
João Valverde 9cbcdee753 pre-commit: Make version check work with git-worktree
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-17 23:50:24 +00:00
Gerald Combs 74e8b539a2 Fix a comparison in win-setup.ps1
"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-17 21:41:10 +00:00
João Valverde 5716cc6d7c Add licensecheck.pl to the tarball
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-17 00:06:53 +00:00
João Valverde 3119e2fc23 pre-commit: Fix version check to work with git-worktree
Change-Id: Ie895ca194738a022cc211ae50afbff0a561156a3
Reviewed-on: https://code.wireshark.org/review/17047
Reviewed-by: João Valverde <j@v6e.pt>
2016-08-15 10:02:30 +00:00
João Valverde e3009b0b1c checklicenses: Fix a FIXME
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-15 01:32:04 +00:00
Pascal Quantin 2227c26cb6 Windows: upgrade Lua library to 5.2.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-09 20:32:55 +00:00
João Valverde ba70b88419 checklicenses: Remove whitelisted licenses not being used
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-09 02:41:30 +00:00
Dario Lombardo 81f97a963f debian-setup: add customized profiles.
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-08 21:19:23 +00:00
João Valverde e32890af11 checklicenses.py: Remove some boilerplate from upstream
Change-Id: If8a1537fe5ad0c5decaf2facf6fd0c43b32ffe70
Reviewed-on: https://code.wireshark.org/review/16930
Reviewed-by: João Valverde <j@v6e.pt>
2016-08-06 19:19:38 +00:00
João Valverde 57be744df5 Add licensecheck.pl to our /tools directory and use it
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-06 19:17:40 +00:00
Günther Deschner 6e3ebccf22 tools/pidl: support HRESULT as return code in wireshark autogenerated 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-06 15:34:02 +00:00
Günther Deschner 29cc1817b9 tools/pidl: Keep case from fieldnames.
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-06 14:06:24 +00:00
Guy Harris d1847f0b49 Update FSF address.
Change-Id: I2a36a833f00f4acda253e5741c96c519588aa046
Reviewed-on: https://code.wireshark.org/review/16919
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-05 20:25:12 +00:00
Guy Harris d1f0ffd7e7 Fix FSF address.
Change-Id: Icf473af9487e60003813435f18551225224c6d58
Reviewed-on: https://code.wireshark.org/review/16915
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-05 20:16:51 +00:00
João Valverde 78ef23f0d2 checklicenses.py: Whitelist some plaintext files without license requirements
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-05 14:05:36 +00:00
Pascal Quantin 5661420d7f asn2wrs: put back parsetab.py file in ASN.1 source folder
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-04 18:54:05 +00:00
Balint Reczey d04be0149d Ply parser updated to 3.8 from http://www.dabeaz.com/ply/
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-04 08:20:24 +00:00
Pascal Quantin a723a30ad4 Update USBPcap installer packaged in our Windows installer
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-08-03 21:17:24 +00:00
Guy Harris 62eb424d80 Copy over change from Samba repository:
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-27 23:22:47 +00:00
Guy Harris f0ed91f79d Copy over change from Samba repository:
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-27 23:20:58 +00:00
Guy Harris 5623b7917e Copy over change from Samba repository:
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-27 23:19:14 +00:00
Guy Harris 692f0145f4 Copy change from Samba repository:
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-27 23:17:00 +00:00
Guy Harris d47f174f9e Copy over change from Samba repository:
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-27 23:14:56 +00:00
Guy Harris bd0280e8d6 Pick up changes from the Samba repository:
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-27 22:53:59 +00:00
Guy Harris 157c2fc0e1 Fix from the Samba repository:
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>
2016-07-27 22:07:56 +00:00
Michael Mann ad6fc87d64 Add proto_tree_add_checksum.
This is an attempt to standardize display/handling of checksum fields for all dissectors.
The main target is for dissectors that do validation, but dissectors that just report the
checksum were also included just to make them easier to find in the future.

Bug: 10620
Bug: 12058
Ping-Bug: 8859
Change-Id: Ia8abd86e42eaf8ed50de6b173409e914b17993bf
Reviewed-on: https://code.wireshark.org/review/16380
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-21 12:35:22 +00:00
Jeff Morriss aa9f560853 Cleanup and extend the regex for matching expert info entries.
Match each entity in the structure explicitly rather than skipping a bunch at
the end.  This makes it possible to easily (and clearly) specify where we
allow white space.

Don't capture the event group and severity: we don't use them anyway.

Don't put single character matches in []: that makes it hard to read (for
me anyway).

There's no need for both the "m"(ultiline) and "s"(ingle line) options.  Nor
the "o"optimize (make buggy) option.

These same changes should/will be applied to the hf regex later.

Change-Id: I3bf307dcd6432eb1a0c2b9aceea201f8403e08c0
Reviewed-on: https://code.wireshark.org/review/16313
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-10 15:06:20 +00:00
Pascal Quantin bed9d187ba Remove remnants of g_spawn_helper support
Change-Id: I88121a280ff01a889daeda438b308380b6ea0703
Reviewed-on: https://code.wireshark.org/review/16303
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-05 16:11:13 +00:00
Roland Knall f2786bc8ff extcap: Remove g_spawn_helper support
Move g_spawn to separate file and implement functions to
 use Windows based method of spawning, instead of the glib
 based version

Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f
Reviewed-on: https://code.wireshark.org/review/16049
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-07-05 11:54:43 +00:00
João Valverde 50614a95ba checkhf: Use colon as field separator for better readability
Comma looks like a list when skimming quickly.

Change-Id: Ic0ac1bc8746c70724d2279e3d725c5c9449b79d8
Reviewed-on: https://code.wireshark.org/review/16260
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-03 12:42:03 +00:00
Gerald Combs 9ed7568f70 Recompress PNGs.
Recompress PNGs using the current versions of various compressors:

  optipng 0.7.6
  advpng 1.20
  advdef 1.20
  pngcrush 1.8.1

Parallelize PNG compression. Note why we're not using a couple of other
compression utilities.

Change-Id: I52757d0bc2d424013e7f00b693a0f5378427cc31
Reviewed-on: https://code.wireshark.org/review/16209
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-06-30 15:41:32 +00:00
Martin Kaiser e4c86ac83c remove Wireshark.pro, modify update-tx accordingly
Wireshark.pro is the qt project file used by qmake
which in turn was used by nmake

now that nmake is gone, the only reason to keep Wireshark.pro
was the update-tx script that syncs our translation files with Transifex

update-tx calls lupdate to create a list of texts to translate and
lrelease to convert such a list into a binary file
lupdate and lrelase can read file names from a project file or
get them on the command line

modify update-tx to pass the required file names on the command line
we can use wildcards so there's no need to change update-tx when a new
source file is added

remove Wireshark.pro from the release tarball as well

Change-Id: I7ff4ebc96f13b4ffc6fb1b2f4e045999fbfbed5e
Reviewed-on: https://code.wireshark.org/review/16151
Reviewed-by: Gerald Combs <gerald@wireshark.org>
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-06-30 05:32:29 +00:00
Dario Lombardo 9a5cdac6ef debian-setup: add additional params to apt-get.
Can be used to pass params like -qq and -y for automated installations,
like in travis-ci.

Change-Id: Iddf18829f09ce6b16c1c71264adab38d0a893fe6
Reviewed-on: https://code.wireshark.org/review/15999
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-06-21 07:32:40 +00:00
AndersBroman a83f88f31e [pre-commit-ignore] Dont check the asn1 files they are imported verbatime
from standards documents in most cases.

Change-Id: Ie9db1a1431a201dc374f800b5118a199dcb51b9c
Reviewed-on: https://code.wireshark.org/review/16035
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-20 11:59:24 +00:00
Binh Trinh c07fd447c3 DCE/RPC: fix array of pointers with NULL
Change-Id: Ie89f8fd4ec744d427d41866206d5a6784c5b224f
Reviewed-on: https://code.wireshark.org/review/16004
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-18 14:42:35 +00:00
Martin Kaiser c26968434c lemon: use a define for fseek()'s whence parameter
for people who don't immediately understand what fseek(fp, 0, 2) does

Change-Id: I297ba6fd718ef0f09c4d0b29bf433262c3c38435
Reviewed-on: https://code.wireshark.org/review/15976
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-06-16 19:57:15 +00:00
Michael Mann 9a5e6a6884 DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_with_flags
Change-Id: I8891ec90244ffd9609d8443df631a7c8e6453b7e
Reviewed-on: https://code.wireshark.org/review/15942
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-06-16 17:03:38 +00:00
Alexis La Goutte 8b94a664f6 X11: Fix last indent issue on X11 generator
and regenerate X11 dissector

Change-Id: If2c781d346713f5a2a2e97de84c0fedcfd1958af
Reviewed-on: https://code.wireshark.org/review/15944
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-16 03:08:07 +00:00
Pascal Quantin 6baa1b544c Remove Nmake build system
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Reviewed-on: https://code.wireshark.org/review/15777
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-15 19:21:57 +00:00
Pascal Quantin 5a73176a9d Win: convert atkversion.h to UTF-8
Change-Id: I7bfa9be11596cc9a3e1b0226c6865edf47e96782
Reviewed-on: https://code.wireshark.org/review/15931
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-15 18:53:30 +00:00
Pascal Quantin 95a05790d2 win-setup.ps1: stop downloading user-guide; with CMake it is generated from source code
Change-Id: I3b015594bd6a6b0c41938ba17d5690c08e04f490
Reviewed-on: https://code.wireshark.org/review/15917
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-06-15 16:42:30 +00:00
João Valverde 88f437417d Indent register.c and other cosmetic changes
Change-Id: I06e863e0b87118047f4c3b7618df02b9c7384a34
Reviewed-on: https://code.wireshark.org/review/15836
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>
2016-06-13 13:12:45 +00:00
Guy Harris 38d39f292e Have MemoryCheck() directly incorporate the error message and exit.
Manually inline memory_error() in MemoryCheck(), so that static
analyzers know that, if MemoryCheck() sees a null pointer, it exists,
and the null pointer isn't subsequently used.

Use MemoryCheck() instead of the one place where we manually checked for
a null pointer and called memory_error().

Change-Id: Id6b0328cfd17cb14ec9d1e461420896a31573c71
Reviewed-on: https://code.wireshark.org/review/15851
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-12 19:18:41 +00:00
Guy Harris 7bbc60c668 Add more memory checks, and use MemoryCheck() for some existing checks.
Always check for malloc() and realloc() failing.  Use MemoryCheck() for
most of the checks - it's a bit cleaner and makes the error message the
same for those checks.

Change-Id: I533153c697b37b85adfa0259c1352efece0b0486
Reviewed-on: https://code.wireshark.org/review/15849
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-12 17:34:47 +00:00
Michael Mann 89896f83d8 Add support in checkhf.pl for expert info.
Basically a copy/paste of the existing hf_ functionality, but looking for ei_ variables instead.

Change-Id: Ic9a34f6bd5dee895fc858bb9631c00271a86486b
Reviewed-on: https://code.wireshark.org/review/15717
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-06-06 11:24:52 +00:00
Pascal Quantin 018765f41a Remove an ellipsis UTF-8 character in gsignal.h
Change-Id: Ic31dab513fc2ff5f2f182ae98c1b665ea4b8916b
Reviewed-on: https://code.wireshark.org/review/15713
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-06-03 20:08:41 +00:00
Alexis La Goutte 1b920b1dab Add nghttp2 folder to ignore pre-commit check
Change-Id: I6b76b55325db494f16488decfe94ff4129d0ac40
Reviewed-on: https://code.wireshark.org/review/15616
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-05-30 14:17:50 +00:00
Diederik de Groot 5f24676533 [skinny] Fix StartMediaTransmissionMessage and OpenReceiveChannelMessage protocol version 20
- StartMediaTransmissionMessage is variable length
- latentCapsInfo moved to protocol version 21-22

Change-Id: I4136c7007a8f9d6a8a3370d45faab62bbe983524
Reviewed-on: https://code.wireshark.org/review/15512
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-05-21 20:08:52 +00:00
Diederik de Groot 149822017a [skinny] Update message definitions
- Deal with short EnblocCallMessage coming from 7936
- SubscriptionStatReqMessage is shorter than previously known
- Use buttonType enum in FeatureStatV2Message and FeatureStatMessage

Change-Id: I0c4db5a0199ebb95bf807c858971d763faeef016
Reviewed-on: https://code.wireshark.org/review/15427
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-05-17 18:18:21 +00:00
Jeff Morriss d12561f61a Move the Valgrind size check after the capinfos check of the file.
That way if we pass a file that doesn't exist to the fuzz-test script we won't
get errors from 'ls' complaining that the file doesn't exist.

Change-Id: I33f4bd692775e6d3f990adaaa37b7530d343fe52
Reviewed-on: https://code.wireshark.org/review/15410
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-13 03:58:51 +00:00
Pascal Quantin 6d0e5bbf02 Upgrade c-ares Windows library from 1.9.1 to 1.11.0
Bug: 12412
Change-Id: I5e5f8f86293e391ec425a6e3e314573711947bce
Reviewed-on: https://code.wireshark.org/review/15345
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-05-11 05:46:02 +00:00
Guy Harris 990d51a7f7 Revert "PIDL: Remove _U_ and remove unused-parameter via pragma"
This reverts commit db4f7fcdea.

That doesn't work with the compiler being used on the OS X buildbot; that compiler is probably some version of llvm-gcc, which might be based on an older version of GCC without support for that pragma, or might not support it properly courtesy of the GCC front end and the LLVM back end not quite fitting together

Change-Id: I6cd5f1322b4872ef0c4eb5695f021cec00ba85b7
Reviewed-on: https://code.wireshark.org/review/15246
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-02 19:02:29 +00:00
Graham Bloice 2e23b506c7 Add checkAPI calls to CMake.
This generates a top level target, checkAPI, that is
excluded from the ALL build target, so must be run separately.

On Windows using a Visual Studio generator, call
msbuild /p:Configuration=RelWithDebInfo checkAPI.vcxproj

Change-Id: I44a57c564dcfc75499463b942436f4b920a82478
Reviewed-on: https://code.wireshark.org/review/14873
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-05-02 12:01:24 +00:00
Alexis La Goutte db4f7fcdea PIDL: Remove _U_ and remove unused-parameter via pragma
Change-Id: Ic40f86850dc94338a8c2205e04679793f368672f
Reviewed-on: https://code.wireshark.org/review/14967
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-05-02 05:57:20 +00:00
Pascal Quantin ae316e2d88 Compile sshdump and ciscodump for Windows
Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support

Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43
Reviewed-on: https://code.wireshark.org/review/12117
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-04-25 07:22:28 +00:00
Gerald Combs 51878efb23 Add more files to the pre-commit ignore list.
checkAPIs.pl will otherwise fail for the following files and functions:

epan/wmem/wmem_strbuf.c: strcpy
epan/wmem/wmem_strutil.c: vsprintf
wsutil/file_util.h: mkdir

Change-Id: I186730c8974499959233bd21f9b428c5d896a2b5
Reviewed-on: https://code.wireshark.org/review/14893
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: Gerald Combs <gerald@wireshark.org>
2016-04-12 18:52:26 +00:00
Gerald Combs 8710ce0205 checkAPIs: Add links to banned functions.
Add links to Microsoft's "Security Development Lifecycle (SDL) Banned
Function Calls" and "Deprecated CRT Functions".

Change-Id: I6f1ffca8158b942fccb982868c6760c2c6e2d97c
Reviewed-on: https://code.wireshark.org/review/14881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-12 04:06:24 +00:00
Pascal Quantin c39c365f86 Update USBPcap installer packaged in our Windows installer and add a warning
The newer version creates a system restore point during installation
Also add an explicit note in Wireshark installer explaining that USBPcap is
experimental and some hints on how to recover in case of issue

Bug: 12316
Change-Id: Ifb15ee98bf9db843debe5878f3df8c78f846d8d0
Reviewed-on: https://code.wireshark.org/review/14854
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-04-09 10:45:52 +00:00
João Valverde 58c7b5548c Minor lemon Makefile.am fixup
Change-Id: I80108d565e40835e9bf3fa58b1999735a45d77f0
Reviewed-on: https://code.wireshark.org/review/14860
Reviewed-by: João Valverde <j@v6e.pt>
2016-04-08 04:38:03 +00:00
João Valverde 08e01a6aeb Don't build lemon using -Werror
Change-Id: I0b7d691616578e8d5897b60fc31a469c9ab81607
Reviewed-on: https://code.wireshark.org/review/14850
Reviewed-by: João Valverde <j@v6e.pt>
2016-04-07 18:03:16 +00:00
João Valverde 2b20326fd2 autotools: Use AC_SUBST to set -Werror flag
Change-Id: I34a90155ab613ca97bf58b72f56ec08eff87d3ab
Reviewed-on: https://code.wireshark.org/review/14849
Reviewed-by: João Valverde <j@v6e.pt>
2016-04-07 17:44:36 +00:00
Guy Harris 8b9cae5ff3 Expand a comment.
Change-Id: I13732bb2877a41b5f5d018128e05ebd4bfb6a1bf
Reviewed-on: https://code.wireshark.org/review/14825
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-05 23:11:22 +00:00
João Valverde 59f6e59fd9 Fix VPATH build
Fixup for ecb4dc396e.

Change-Id: I3230e0ca203deb15dde8f22806307d59d70e05dd
Reviewed-on: https://code.wireshark.org/review/14812
Reviewed-by: João Valverde <j@v6e.pt>
2016-04-05 01:14:13 +00:00
João Valverde 7f873d92cb Use AC_REPLACE_FUNCS and LTLIBOBJS
Change-Id: I0f46167fe900c39d678560809cd5391c2a9bc4d2
Reviewed-on: https://code.wireshark.org/review/14809
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-04-04 23:58:41 +00:00
Guy Harris 59816ef00c Make the Flex scanners and YACC parser in libraries reentrant.
master-branch libpcap now generates a reentrant Flex scanner and
Bison/Berkeley YACC parser for capture filter expressions, so it
requires versions of Flex and Bison/Berkeley YACC that support that.

We might as well do the same.  For libwiretap, it means we could
actually have multiple K12 text or Ascend/Lucent text files open at the
same time.  For libwireshark, it might not be as useful, as we only read
configuration files at startup (which should only happen once, in one
thread) or on demand (in which case, if we ever support multiple threads
running libwireshark, we'd need a mutex to ensure that only one file
reads it), but it's still the right thing to do.

We also require a version of Flex that can write out a header file, so
we change the runlex script to generate the header file ourselves. This
means we require a version of Flex new enough to support --header-file.

Clean up some other stuff encountered in the process.

Change-Id: Id23078c6acea549a52fc687779bb55d715b55c16
Reviewed-on: https://code.wireshark.org/review/14719
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-03 22:21:29 +00:00
Peter Wu e6c54017a7 Fix out-of-tree "gen-authors" target
Change directory to the source tree before invoking `git shortlog`,
otherwise it fails on build directories outside the source tree.

Alexis suggested to move the git invocation to the perl script, this is
done now and also avoids writing AUTHORS.git in the source tree.

Change-Id: I5905ebf40d8d32a586c88671b52f28c542ca33ba
Reviewed-on: https://code.wireshark.org/review/14660
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-03-28 22:13:59 +00:00
Peter Wu ea062976b8 tools/generate_authors.pl: avoid duplicates
Officially, the local part of an email address is case sensitive, but in
practice this is ignored. Ensure that duplicate email addresses are not
listed.

While at it, detect duplicates using `grep -Po '<\K[^>]+' AUTHORS |
tr '[:upper:]' '[:lower:]' | sort | uniq -cd` and resolve them.

Change-Id: Ie1e853d6253758c8454d9583f0a11f317c8390cb
Reviewed-on: https://code.wireshark.org/review/14659
Reviewed-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: Michael Mann <mmann78@netscape.net>
2016-03-28 02:47:55 +00:00
João Valverde ac477e9b5d Add basic PIDL Makefile
Change-Id: I8f4c8e312df73b70f3cacd0df768375b46197ae6
Reviewed-on: https://code.wireshark.org/review/14507
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-24 20:30:22 +00:00
Guy Harris 172b74d734 Portably remove CRs from Python output.
The GNU sed manual says the only C-style backslash escapes that can be
used in regular expressions in portable sed scripts are \n and \\.

The Single UNIX Specification says that \r is one of the C-style
backslash escapes that can be used in tr, so use tr -d instead.

Change-Id: I40d97ee9b89dfce3d67f062ec8839d3aba998ff3
Reviewed-on: https://code.wireshark.org/review/14606
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24 01:09:03 +00:00
João Valverde c1692d989e Add files by folder to distribution tarball (EXTRA_DIST)
This takes away much of the pain (and merge conflicts) of micro-managing every
sub-folder file.

Change-Id: I7d7bb1173511ec9312ca4a97c6a59a26b0b194f4
Reviewed-on: https://code.wireshark.org/review/14595
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-03-24 01:04:36 +00:00
Guy Harris 77b26d6d71 That's not specific to OS X.
OS X's sed appears to be a *BSD sed, so the same problem might exist on
*BSD, or at least some *BSDs, and it might, in fact, be a problem with
everything except for GNU sed.

Change-Id: I267d9d7eb077c8ec39135bac7eff2c765af3efcf
Reviewed-on: https://code.wireshark.org/review/14601
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-23 20:12:41 +00:00
Joerg Mayer e8472e5660 Fix a problem that prevented checkins of all filenames containing the
character 'r' on MacOS with an active pre-commit hook.

Change-Id: If26fb22d5057794ec0de0def4055310b78a05f89
Reviewed-on: https://code.wireshark.org/review/14600
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-03-23 19:58:51 +00:00
João Valverde eb09239bae Make runlex.sh quieter
Change-Id: I5a20493d1cca57ecb2487c443e9c0e20120fd711
Reviewed-on: https://code.wireshark.org/review/14575
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23 00:40:18 +00:00
João Valverde df23ccb7d7 AUTHORS: More column alignment improvements
Change-Id: I29d08ca213df44c1d6d437135c45a3d6e45efa7d
Reviewed-on: https://code.wireshark.org/review/14386
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21 21:34:07 +00:00
Gerald Combs d877dcc1c4 Parallelize fuzz-test.sh
Run each "argument" test (e.g. "-nVxr" and "-nr") simultaneously in
the background. This should speed up our tests without reducing the
amount of fuzzing that we do.

Change-Id: I737d1dc09b31e07910d56632bec62da0f35fe222
Reviewed-on: https://code.wireshark.org/review/14432
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-14 15:54:26 +00:00
João Valverde 54a520d4a1 Move /asn1 to /epan/dissectors
Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9
Reviewed-on: https://code.wireshark.org/review/14388
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-13 21:30:24 +00:00
Gerald Combs 95951ad6fa Add the pass number to the fuzz failure report.
When adjusting MAX_PASSES it'd be nice to know how many passes it
normally takes to fail.

Change-Id: I335c26a1e6847371706da880b83773d142797da9
Reviewed-on: https://code.wireshark.org/review/14389
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-10 02:12:57 +00:00
Eric Anderson 2728f5673f Use AX_PROG_CC_FOR_BUILD macro to identify compiler targeting the build host.
(When cross-compiling, this is *not* the compiler used to build wireshark itself).

Macro ax_prog_cc_for_build.m4 retrieved from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git

Change-Id: I035059d9315e0081dcf1ffbafd9ce6d7ad46700c
Reviewed-on: https://code.wireshark.org/review/4503
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Eric Anderson <andersoe@cs.cmu.edu>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-10 01:54:27 +00:00
João Valverde 94869593e3 AUTHORS: Use LF line endings and remove BOM
Change-Id: I03c582baa03238ac82916d8bf865a3bf25f04cd5
Reviewed-on: https://code.wireshark.org/review/14384
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08 18:02:43 +00:00
João Valverde 28b9f05b0b AUTHORS: Add <...> to git log email addresses
Change-Id: I936e4a25833906cac75d4d5b7359b5629d14b33d
Reviewed-on: https://code.wireshark.org/review/14382
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-08 18:02:16 +00:00
João Valverde 6948e7ca19 generate_authors.pl: Use literal regex expression
Change-Id: I6828dc5f71930ce4121ab7ad24db5b0428cea7f3
Reviewed-on: https://code.wireshark.org/review/14383
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08 10:48:16 +00:00
João Valverde 6ea3f3790a generate_authors: Align git log email column
Change-Id: Ic08b23e80a982805f4b512a410a1a4414afc3a8c
Reviewed-on: https://code.wireshark.org/review/14354
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-07 06:34:53 +00:00
Alexis La Goutte 0e80176366 PIDL (NDR): fix missing $name when regenerate MAPI dissector
Issue coming from ge41f08858b

Change-Id: Ibff382b7cbf9a89904eb87d7f3e8f56b5782a0f6
Reviewed-on: https://code.wireshark.org/review/14351
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-06 13:02:35 +00:00
Gerald Combs 32d60ac2f5 CMake: Avoid pipes and the `cut` command.
Dump the output of `git shortlog` directly to AUTHORS.git instead of
piping it through `cut`. Depending on our toolchain, cmake COMMANDs might
not support pipes. This appears to be the case for MSBuild. Removing the
`cut` command has the added benefit of reducing our dependency on Cygwin.

Pass HEAD to `git shortlog`, otherwise it doesn't return anything when
run under MSBuild.

Change-Id: I23e9436c007d76a700bbbc45c2772c8aba6d5749
Reviewed-on: https://code.wireshark.org/review/14349
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>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-06 01:12:56 +00:00
Jeff Morriss be25474c94 Check source files for broken (read: not set to 8) tabstop settings.
Change-Id: I60e77a67189e7446f8c5ffd0add803cca10b4b57
Reviewed-on: https://code.wireshark.org/review/14345
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-03-05 17:46:00 +00:00
Gerald Combs 53a879c5c3 Make sure our shell, Perl, & Python tools are executable.
Change-Id: Ie58978473c4af7a0eaccf3e664c2f44bed2ef202
Reviewed-on: https://code.wireshark.org/review/14331
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-03 20:11:25 +00:00
Michael Mann 8435145b1f Create perl script to append existing AUTHORS file with information from git log.
new AUTHORS file can be created with "gen-authors" build parameter

The "original" AUTHORS file has been fixed up to be kind to parsers (so no one gets excluded) and renamed to AUTHORS.src.  This preserves the features authors worked on.  For authors that didn't list features, they may be converted to just getting information from git.

Change-Id: I9a4c4091e229f7f5e1c46d864527a98c1278e451
Reviewed-on: https://code.wireshark.org/review/14231
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-03-03 18:28:32 +00:00
Alexis La Goutte e326e85a88 debian-setup: need libtool-bin for building.
Change-Id: I761babced3eb49b8a8cea4996b7ccd6f748a6200
Reviewed-on: https://code.wireshark.org/review/13829
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-03-01 13:52:32 +00:00
João Valverde bf56f28e7f fuzz-test: Add missing new line
Change-Id: I68f85cdbef24289cabb5e46905356c3cc1c39ad8
Reviewed-on: https://code.wireshark.org/review/14252
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-29 22:06:00 +00:00
Aurelien Aptel 62a0ebf1e0 PIDL: sync pidl with samba repo
Copy pidl from samba repo after all wireshark changes were applied.

Change-Id: I0d3fb780c3f79b3b873304bab0655d98564dfc71
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-on: https://code.wireshark.org/review/13967
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-29 21:01:13 +00:00
João Valverde c51d859551 pre-commit: Use uname -a instead.
Not all shells support uname -o.

Change-Id: Ia6f46f3580f6d7b421da672418dcbee38ad9e60b
Reviewed-on: https://code.wireshark.org/review/14143
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-25 14:17:43 +00:00
João Valverde fe1de0146e pre-commit: Avoid launching python subprocesses.
This makes Python required only for (portable) fnmatch().

Change the ignore script to work as a filter.

Multi-platform improvements.

Change-Id: I6ac757d48ba2ff965da5da3dc9c25047a0e37f92
Reviewed-on: https://code.wireshark.org/review/13693
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-25 12:34:50 +00:00
Jeff Morriss 62903874f3 When installing RPMs for development, use dnf if the OS has it.
Also install the Qt5-devel packages (in addition to plain old "Qt").

Change-Id: I86f6a779dc9d0b359c69f0627106d1cce3120f83
Reviewed-on: https://code.wireshark.org/review/13916
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-02-23 22:24:41 +00:00
João Valverde 8bee8bad81 Add inet_pton/inet_ntop interface to libwsutil
Change-Id: Ifc344ed33f2f7ca09a6912a5adb49dc35f07c81f
Reviewed-on: https://code.wireshark.org/review/13881
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-02-19 15:55:09 +00:00
João Valverde 2e85975fee Just #include wsutil/inet_aton.h
No need for platform-specific system header boilerplate.

Change-Id: I5387a0005ddb0d7aab3c5b9f28d6282053c1b0fd
Reviewed-on: https://code.wireshark.org/review/13865
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-02-13 23:51:53 +00:00
João Valverde 436d01404a autotools: Add more silent build rules
Change-Id: I4abff8880d5b3ff439e6abc9cf3c2d17897501ea
Reviewed-on: https://code.wireshark.org/review/13816
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-02-11 19:21:22 +00:00
Dario Lombardo 403c6a6fd8 debian-setup: bug fix
Change-Id: I90cb9eafdef2d8f20d9c3ea0327b5cce06f2426b
Reviewed-on: https://code.wireshark.org/review/13822
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-10 05:15:16 +00:00
Dario Lombardo 22a569ad3a tools: improve valgrind script.
Change-Id: Ifae62e6334b48002516dfff6d1c2f094445f423c
Reviewed-on: https://code.wireshark.org/review/13820
Reviewed-by: Evan Huus <eapache@gmail.com>
2016-02-08 15:24:02 +00:00
Gerald Combs 005f44c222 fuzz-test: Move the ASan message outside our loops.
Change-Id: I109a3e222358523de8f43c887bf7551e92fce135
Reviewed-on: https://code.wireshark.org/review/13714
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-05 05:24:30 +00:00
João Valverde 8d0455c910 Fix asn2wrs warnings [-Wredundant-decls]
Change-Id: Iced801f17c56618eaaf1bb7c85d68ecdebd633a1
Reviewed-on: https://code.wireshark.org/review/13705
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-04 09:47:01 +00:00
Gerald Combs 29b0adac82 fuzz-test: Print the memory limit if ASan is enabled.
Update the 'ulimit -v' FAQ URL while we're here.

Change-Id: I0e1b007295bf609d7a585087b00c97eae01501c2
Reviewed-on: https://code.wireshark.org/review/13696
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-04 05:16:47 +00:00
João Valverde ff07bd4562 No need for execute bit on setuid-root.pl.in
Change-Id: I099fbd73b5a192375c8b99f0997c7074c97d0cb9
Reviewed-on: https://code.wireshark.org/review/13673
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-03 14:49:08 +00:00
João Valverde 59b5609624 lemon: Use automake rules
Change-Id: I5110e3781682e003cc4e60a592694dc9e8930456
Reviewed-on: https://code.wireshark.org/review/13641
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-03 00:07:42 +00:00
João Valverde b5ff79e80b Add silent build rules for setuid-root.pl
Change-Id: Id99c8d545b8ae53cf4dac0ccf54226df07f596bd
Reviewed-on: https://code.wireshark.org/review/13627
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-02 00:55:01 +00:00
Pascal Quantin b0a8347f42 pre-commit: ignore ASN.1 template files
They trigger false positives

Change-Id: I0cc22e0600461475e67610ac7e9dc687822c87f2
Reviewed-on: https://code.wireshark.org/review/13639
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-02-01 19:37:05 +00:00
Peter Wu 057b8d7dde plugins: do not import symbols globally
Clang's ASAN reported an ODR violation when plugins were loaded. Sure
enough, symbols did actually get loaded twice:

    ==5898==ERROR: AddressSanitizer: odr-violation (0x7fffd95a35e0):
      [1] size=7 'version' plugins/mate/plugin.c:19:31
      [2] size=6 'version' plugins/opcua/plugin.c:19:31

After this change, plugins cannot insert new symbols in the global
namespace.

Change-Id: Ib11f7263e9c586f8e7c1f8f5fb239b20d46ddd2f
Reviewed-on: https://code.wireshark.org/review/13260
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-01-31 13:31:28 +00:00
Dario Lombardo 2bf715dcc2 lemon: fix leak.
Found by clang's ccc-analyzer.

Change-Id: I04eaad73486a43a77c4f08cf519bbfe7d2d8c838
Reviewed-on: https://code.wireshark.org/review/13581
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-31 13:27:25 +00:00
Dario Lombardo 5084a423e8 tools: improve debian-setup with optional packages.
Change-Id: Ie7480b0c5297039aadfa253fce84c66b0e217814
Reviewed-on: https://code.wireshark.org/review/13596
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-01-29 13:34:13 +00:00
João Valverde 21c3a6d91b lemon: Have Makefile.am handle warnings as errors correctly
Change-Id: If0d59eb109802a799c33e439e607178102678f7d
Reviewed-on: https://code.wireshark.org/review/13580
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-01-29 13:07:34 +00:00
João Valverde 0a931aa383 Add fnmatch support to git pre-commit hook
Allows for wildcard pathname matching in ignore list.

Change-Id: I52e47c72c69e16ff9aefadfde22d1bd682df9654
Reviewed-on: https://code.wireshark.org/review/13166
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-28 10:38:29 +00:00
Guy Harris 099698445b Move the proto data stuff out of frame_data.[ch].
It's not tied to the frame_data structure any more, so it belongs by
itself.

Clean up some #includes while we're at it; in particular, frame_data.h
doesn't use anything related to tvbuffs, so don't have it gratuitiously
include tvbuff.h.

Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c
Reviewed-on: https://code.wireshark.org/review/13518
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-25 02:24:34 +00:00
Alexis La Goutte e63fd927f9 lemon (tools): Fix Dereference of null pointer found by Clang analyzer
Change-Id: Ica08d9372fbe3809eb078e0285cba2a49cee6b8d
Reviewed-on: https://code.wireshark.org/review/13331
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-22 19:36:37 +00:00
Guy Harris 43d595ec39 Fix another warning on 64-bit platforms.
Change-Id: I5cdf55cdaef048d9d564a5fca39027dae3b78bab
Reviewed-on: https://code.wireshark.org/review/13242
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12 20:29:44 +00:00
Joerg Mayer 4ffffdadd0 Add the comment about the Wireshark changes github repo from the commit
messages to the README.

Change-Id: Ia73807ca4c04ca0e9019ed22e5733bf378cdf327
Reviewed-on: https://code.wireshark.org/review/13241
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-01-12 20:17:43 +00:00
Alexis La Goutte 9a09f36807 Lemon: resync with upstream
lemon: Thu Oct 29 13:48:15 2015
lempar: Tue Nov 10 14:51:22 2015

a copy of all Wireshark changes are available https://github.com/alagoutte/sqlite/tree/wireshark

Change-Id: I51f8b40a7087362502f6ce2156820a9f107ddf15
Reviewed-on: https://code.wireshark.org/review/13033
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-12 05:42:57 +00:00
João Valverde c6e981bcff checkfiltername.pl: Don't print empty line on successful run
Change-Id: I3915a5771786bc763747ed74fadede15353fdf40
Reviewed-on: https://code.wireshark.org/review/13165
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-10 18:43:53 +00:00
Peter Wu 41e93ead25 checkAPIs: remove false positive in shadow check
" strlen (" would match the shadow regex due to backtracking. Disable
backtracking with the "possessive quantifier".

Change-Id: If5d307fd61f252c41ad6d9b6104d2add1dfa63ae
Reviewed-on: https://code.wireshark.org/review/13157
Reviewed-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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-09 20:02:01 +00:00
Alexis La Goutte ce979903fd Add lempar to pre-commit ignore list
Change-Id: I4ad9b1dadfdb51ad750cc61782eca69125989b55
Reviewed-on: https://code.wireshark.org/review/13144
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
2016-01-09 09:21:15 +00:00
João Valverde cac0ab63ee lemon: Fix warnings [-Wpedantic]
Change-Id: I7b350b2c4de5f86de24c8f2309016f3de7af8516
Reviewed-on: https://code.wireshark.org/review/12959
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-07 15:52:24 +00:00
Alexis La Goutte 3239d02bc9 checkAPIs: Add "system" to possible shadow variable (on OS X)
See I651e76c6d53b0

Change-Id: I8082f22da0d16655104ad8699f08abdaf916a941
Reviewed-on: https://code.wireshark.org/review/13078
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-06 21:41:38 +00:00
João Valverde 5815d1080a Add basic exclude facility to pre-commit hook checks
Change-Id: If08fd1481e58f785fed90a7d8c24aa2a1e0f3df7
Reviewed-on: https://code.wireshark.org/review/12958
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-05 21:32:22 +00:00
João Valverde 2bc6530a99 lemon: Fix warnings [-Wcast-qual]
Change-Id: I2b9efa50cf6385622601d2a80f4cc51691d080a1
Reviewed-on: https://code.wireshark.org/review/12960
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31 20:13:28 +00:00