Extend README with proto_tree_add_bitmask_with_flags() function.
Change-Id: Ia984080eda77ab93b063771d625bc45b5b0fc6d2
Reviewed-on: https://code.wireshark.org/review/16785
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Most distros provide GeoIP database packages that install to /usr/share/GeoIP.
Use this as a system default.
Change-Id: I2b4ddf7e2467263491b18a97e908a247db0ac9a3
Reviewed-on: https://code.wireshark.org/review/16767
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Issue reported by Padmaja Reddy
Bug:12675
Change-Id: I17323a70fdbe6f52c350a875c467c233877f4505
Reviewed-on: https://code.wireshark.org/review/16761
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
As per bug 12689, earlier versions of libtool had a bug wherein they
assumed a 1-digit second component of the OS version number, and thought
OS X 10.10 was OS X 10.1 and used the wrong linker flags. A build from
Git would succeed, but a build from the source tarball wouldn't.
Change-Id: I412d1e0b02976f44c573f9ff1b62465f5eeaeb05
Ping-Bug: 12689
Reviewed-on: https://code.wireshark.org/review/16773
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Use our normal application icon in "Programs and Features".
Change-Id: I480fcd16b9de1b58852ee8fb5226062da8ed7419
Reviewed-on: https://code.wireshark.org/review/16768
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
We may want to add expert infos for IPv6 extension headers over IPv4 (TODO).
Any side-effects that don't make sense (e.g: IPv6 Routing over IPv4) are
ignored.
The IPv6 Next Header decode as is replaced by IP Proto decode as. It
didn't fit a conceptual model well and it also was not working very well
in practice (for multiple extension headers).
We now support decoding any IP Protocol number as an extension header.
Bug: 12673
Change-Id: Icbde019aba8990cc556ef2bd832f64cba76c24b6
Reviewed-on: https://code.wireshark.org/review/16681
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>
Compress the source tarball using xz instead of bzip2. Other open source
projects (including many of our dependencies) have been using xz for a
while so hopefully this won't be too much of a shock.
Remove the patch-bzip2 Autotools target while we're here.
Change-Id: I456d27b6cd56a43aba829bd45938f98568eb7b1d
Reviewed-on: https://code.wireshark.org/review/16735
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
When processing the colorfilters file, keep and disable unknown coloring
rules instead of skipping over and discarding them. This should
hopefully keep people from losing the standard "Checksum Errors" rule
(and it's less rude in general).
Change-Id: I21796c25045d9dbf7612238ce3d27b613f1ec75f
Reviewed-on: https://code.wireshark.org/review/16673
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Allow stored options to be restored to their default values. This
adds a global cleanup method for extcap and globally defined
preference values, which fixes the parameter problem with windows
Change-Id: I48e0cf846ef81f4732d652c6a2ad0020db5df08e
Reviewed-on: https://code.wireshark.org/review/13741
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Append the platform and version to the WiX installer name similar to
our other installers.
Change-Id: Idb3e7917dda3a8e831062538d3e7d1b1c8b78d42
Reviewed-on: https://code.wireshark.org/review/16757
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Enable airpdcap debugging with explicitly with AIRPDCAP_DEBUG instead
of _DEBUG. _DEBUG might be defined automatically by Visual C++ depending
on your build type and the extra output breaks the decryption tests.
Change-Id: If6d918beb4d91233b07a3bc7b6f2f7e1849171f0
Reviewed-on: https://code.wireshark.org/review/16755
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add an ESP decryption test using the capture+keys from bug 12671.
Change-Id: I5f7ce477ec74d59c1043345728a1444842912b96
Ping-Bug: 12671
Reviewed-on: https://code.wireshark.org/review/16733
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
sys/siginfo.h (which is included by this file) defines si_code.
Change-Id: I59cfe1ea3ec01345965028db4bba3223752459e3
Reviewed-on: https://code.wireshark.org/review/16750
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Both display as zero in the UI. We shouldn't have null values for
decode as, but we do for IPv6, and the user (also the developer) can't
tell them apart from an IPv6 Hop-by-hop Option extension header.
NULL values are represented as IP Protocol 255 (Reserved) in the UI,
intead of IP Protocol 0 (Hop-By-Hop extension header).
Change-Id: I840db99df212a3bee03027b91fdec9c01886004d
Reviewed-on: https://code.wireshark.org/review/16746
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>
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>
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>
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>
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>
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>
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>
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>
The old information is copied over from one of the input files; if we
don't have information about the OS on the machine writing the *output*
file, just throw the old information away.
(We need a better way to preserve information from the input files;
perhaps this:
http://www.winpcap.org/pipermail/pcap-ng-format/2016-June/000362.html
might work.)
Change-Id: Ia25771736d267173f2b6949a91e81e217ee7d16f
Reviewed-on: https://code.wireshark.org/review/16730
Reviewed-by: Guy Harris <guy@alum.mit.edu>
IP version is always 6 and as a consequence of setting the
first byte to 0x60 the 4 high-order bits for the
traffic class field are set to zero.
Otherwise the IPv6 dissector does not look past the first TVB
byte, making randpkt useless to exercise the dissector code.
Change-Id: I372ab7f71e6c972106f9dd46edec642ca53b9557
Reviewed-on: https://code.wireshark.org/review/16708
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Having no matching in sscanf is a valid use case as the object is already initialized
Bug: 12671
Change-Id: Iee7185290ea72968437159c344a376defe464dd4
Reviewed-on: https://code.wireshark.org/review/16711
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: Michael Mann <mmann78@netscape.net>
When the cipher suite for the current decryption session is changed via
a Server Hello, it should not change the cipher suite field of the
decoder. Otherwise there is a mismatch between the cipher suite and the
capabilities of the decoder.
Fix this issue by making the decoder hold a pointer to the (constant)
SslCipherSuite structure rather than making a copy (and have the decoder
point to that data).
I also considered resetting the decoder once the cipher suite changes in
the Server Hello, but that breaks renegotiation.
Bug: 12665
Change-Id: Ieff38a535cd111d95933ec383378643b6fbab7bf
Reviewed-on: https://code.wireshark.org/review/16674
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: Peter Wu <peter@lekensteyn.nl>
The patch adds support for parsing the 4 types of ERSPAN III platform
specific sub-header, if presented.
Change-Id: I1719fceb71ed40918e6b16f25a6355d78840f6c6
Signed-off-by: William Tu <u9012063@gmail.com>
Reviewed-on: https://code.wireshark.org/review/16702
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Fill in the "gaps" so that all dissectors that verify checksums have both a
status and expert info field.
Also address comments from original proto_tree_add_checksum patch that didn't make it.
Ping-Bug: 8859
Change-Id: I2e6640108fd6bb218cb959fe9e4ba98a13e43a2f
Reviewed-on: https://code.wireshark.org/review/16590
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
It saves a little on file pollution and the g_warning call isn't
bothered in the header file.
Change-Id: Ia9bdd96d9d93bbba6811769c4e6e1ed9124c2e5a
Reviewed-on: https://code.wireshark.org/review/16698
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: Anders Broman <a.broman58@gmail.com>
BYTES was not changed to account for the change of ip_len from 16 to 32 bits.
Change-Id: I37b472971fe42a05eb612f88bd38c753f5cf0a08
Reviewed-on: https://code.wireshark.org/review/16706
Reviewed-by: João Valverde <j@v6e.pt>
Uli Heilmeier