Commit Graph

1794 Commits

Author SHA1 Message Date
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