metze/wireshark/wip.git
6 months agoSTEP01x ? OK RFC6113.asn ....
Stefan Metzmacher [Thu, 19 Feb 2015 04:40:29 +0000 (05:40 +0100)]
STEP01x ? OK RFC6113.asn ....

was OK as cee8d8d0be... STEP01x ? OK RFC6113.asn ....
as part of 4d69fe275175b4efb20a54bd8bd7f85d8d28bd61 (wireshark-wip/ws-metze/20181017)

Change-Id: Ic3327dfde770f9345485bf97e2ac6045b909b64e

6 months agosq AD TYPE
Stefan Metzmacher [Mon, 9 Nov 2015 23:10:36 +0000 (00:10 +0100)]
sq AD TYPE

Change-Id: Ia41b3eefd92d109ac476926fdbef381662f7527f

6 months agosq PA TYPE
Stefan Metzmacher [Mon, 9 Nov 2015 23:10:16 +0000 (00:10 +0100)]
sq PA TYPE

Change-Id: I6961d5c391a4f5f58e0557c7853938a391478e62

6 months agopacket-kerberos: add more AUTHDATA-TYPE values and autogenerate kerberos_AUTHDATA_TYP...
Stefan Metzmacher [Wed, 18 Feb 2015 12:01:14 +0000 (13:01 +0100)]
packet-kerberos: add more AUTHDATA-TYPE values and autogenerate kerberos_AUTHDATA_TYPE_vals

The new AUTHDATA-TYPE values are from RFC6113 and MS-KILE.

Change-Id: I269e498f6d0e7f707b5c45fab848114b2d57df03
Signed-off-by: Stefan Metzmacher <metze@samba.org>
6 months agopacket-kerberos: add more PADATA-TYPE values and autogenerate kerberos_PADATA_TYPE_vals
Stefan Metzmacher [Tue, 17 Feb 2015 08:39:47 +0000 (09:39 +0100)]
packet-kerberos: add more PADATA-TYPE values and autogenerate kerberos_PADATA_TYPE_vals

The new PADATA-TYPE values taken from rfc6113.txt

Change-Id: I42e50996c5694c34fc4714189b2e004bbbd501cf
Signed-off-by: Stefan Metzmacher <metze@samba.org>
6 months agoasn2wrs: add VALS_ATTR section
Stefan Metzmacher [Wed, 18 Feb 2015 14:10:29 +0000 (15:10 +0100)]
asn2wrs: add VALS_ATTR section

One important thing is the UPPER_CASE_FIRST flag,

INTERGER value string identifiers have to start with a lower case
letter, but UPPER_CASE_FIRST fixes this in the displayed string.

Change-Id: I902ffc7125c4bf0c2e1a9ac7105c10dad348707c
Signed-off-by: Stefan Metzmacher <metze@samba.org>
6 months agopacket-kerberos: add a hint to the used decryption key
Stefan Metzmacher [Fri, 20 Feb 2015 09:40:22 +0000 (10:40 +0100)]
packet-kerberos: add a hint to the used decryption key

Change-Id: I6f4bb1e46abb30212a87be2b574dc2679d8b7aed
Signed-off-by: Stefan Metzmacher <metze@samba.org>
6 months agoprepare-pidl-patch
Stefan Metzmacher [Tue, 29 Sep 2015 17:25:46 +0000 (19:25 +0200)]
prepare-pidl-patch

Change-Id: Ice5d7fe75438cb33bda4cf10059d80ab165a6eb7

6 months agoRevert "TODO SMB2 NegotiateContext...."
Stefan Metzmacher [Tue, 23 Sep 2014 21:13:43 +0000 (23:13 +0200)]
Revert "TODO SMB2 NegotiateContext...."

This reverts commit df732a47f554f3ba5ce004405089d0d7fbbaf586.

6 months agoTODO SMB2 NegotiateContext....
Stefan Metzmacher [Tue, 23 Sep 2014 21:13:29 +0000 (23:13 +0200)]
TODO SMB2 NegotiateContext....

Change-Id: Iff854f2d3824c8bf9f85ce7f160979bc707df222

6 months agoMIT krb5-1.12 HACK patch: Add a HACK patch for building a patched kerberos library
Matthieu Patou [Mon, 23 Sep 2013 06:24:24 +0000 (23:24 -0700)]
MIT krb5-1.12 HACK patch: Add a HACK patch for building a patched kerberos library

Also works with krb5-1.10 and maybe others too.

Change-Id: I115a07b1ddc45c99cb96b90054cb79f944749979
Signed-off-by: Matthieu Patou <mat@matws.net>
6 months agoMIT krb5-1.6 HACK patch
Stefan Metzmacher [Sat, 25 Jul 2009 08:23:26 +0000 (10:23 +0200)]
MIT krb5-1.6 HACK patch

Apply this patch to krb5-1.6.x and build it
with a special prefix that only wireshark will use!

Then start wireshark with a script like this:

-----
metze@SERNOX:~/devel/wireshark/wireshark.git$ cat ~/bin/mxwrap.wireshark.krb5

export LD_LIBRARY_PATH="/home/metze/prefix/mit-krb5-1-6/lib/:$LD_LIBRARY_PATH"
exec /home/metze/devel/prefix/wireshark/bin/wireshark $@
gdb --args /home/metze/devel/prefix/wireshark/bin/wireshark $@
------

The LD_PRELOAD only works if the krb5 library version your system one,
then you just need to replace "libk5crypto.so", otherwise wireshark
needs to all of the custom libraries.

metze

6 months agofix for netmon 3.x captures
Stefan Metzmacher [Wed, 25 Aug 2010 05:14:40 +0000 (07:14 +0200)]
fix for netmon 3.x captures

metze

6 months agoRevert "HACK setup decryption keys for kerberos session setups smbclient..."
Stefan Metzmacher [Tue, 25 Feb 2014 14:50:00 +0000 (15:50 +0100)]
Revert "HACK setup decryption keys for kerberos session setups smbclient..."

This reverts commit e701801b515a28b997e9013fd1bdfd4c5dbbea26.

6 months agoHACK setup decryption keys for kerberos session setups smbclient...
Stefan Metzmacher [Tue, 25 Feb 2014 14:37:01 +0000 (15:37 +0100)]
HACK setup decryption keys for kerberos session setups smbclient...

Change-Id: I573e44de014ec318998e1bb612c95d877136594f

6 months agoRevert "reassamble TODO"
Stefan Metzmacher [Sat, 7 Nov 2015 08:24:45 +0000 (09:24 +0100)]
Revert "reassamble TODO"

This reverts commit 928e5f57d0b4223f9e9460ca0452f64c4887625d.

6 months agoreassamble TODO
Stefan Metzmacher [Sat, 7 Nov 2015 08:24:33 +0000 (09:24 +0100)]
reassamble TODO

Change-Id: I391cc75a5699d9de36decddf519c583cab78ca8b

6 months agowmem: allow wmem_destroy_list to ignore a NULL list.
Stefan Metzmacher [Tue, 21 Jun 2016 06:55:35 +0000 (08:55 +0200)]
wmem: allow wmem_destroy_list to ignore a NULL list.

I think this should not lead to a crash.

Change-Id: Ic9d903d355f925b2cd5239d51b42f441679ed771
Signed-off-by: Stefan Metzmacher <metze@samba.org>
6 months agoCMake: do not set RPATH when installing to a system directory
Peter Wu [Sat, 19 Jan 2019 00:59:29 +0000 (01:59 +0100)]
CMake: do not set RPATH when installing to a system directory

When built with -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
(as is done by many Linux distributions), do not set an unnecessary
RPATH. This was the case before v2.9.0rc0-2727-g697623411c.

Relocatable builds will still be possible with the default options as
/usr/local/lib is typically not considered a system library path.

Change-Id: Ic6ff1760183c20d3f9f9fb787604e888e116534e
Reviewed-on: https://code.wireshark.org/review/31602
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agojson_dumper: increase JSON_DUMPER_MAX_DEPTH to 1100.
Dario Lombardo [Sat, 19 Jan 2019 22:36:53 +0000 (23:36 +0100)]
json_dumper: increase JSON_DUMPER_MAX_DEPTH to 1100.

The new value has been chosen to make room for sharkd packet output
as: proto.c:MAX_TREE_LEVELS * 2 + 10% of additional sharkd overhead.

A new regression test for sharkd has been added that requires more
than 15 levels.

Change-Id: Ie54955c79c50c60b95c99b1a3c472888fc4842ac
Reviewed-on: https://code.wireshark.org/review/31624
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agoQUIC: fix packet number spaces and verification (draft -17)
Peter Wu [Sun, 20 Jan 2019 18:04:28 +0000 (19:04 +0100)]
QUIC: fix packet number spaces and verification (draft -17)

Decryption would fail after switching from Initial to the Handshake
message due to the packet number changing from 1 to 0 which would result
in the wrong reconstructed packet number. To fix this, implement three
different packet spaces and update the full packet number only if
decryption succeeds.

While at it, document all tricky interactions between packet number
spaces and different secrets / ciphers.

Bug: 13881
Change-Id: Ic88a83cdf76cb024054de8a32ea959bd1dacaca3
Reviewed-on: https://code.wireshark.org/review/31635
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 months agoQUIC: fix handshake decryption (draft -17)
Peter Wu [Sun, 20 Jan 2019 16:36:17 +0000 (17:36 +0100)]
QUIC: fix handshake decryption (draft -17)

Packet numbers in handshake messages are protected by a cipher different
from the initial cipher.

Bug: 13881
Change-Id: Ife6524c0525df10ff3c64f4333908b189f823509
Reviewed-on: https://code.wireshark.org/review/31634
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoGSM-SIM: Add file ID for DF.CDMA
Darien Spencer [Sat, 19 Jan 2019 21:07:24 +0000 (23:07 +0200)]
GSM-SIM: Add file ID for DF.CDMA

Change-Id: Ib8066c14d2a8a0e4b0464cd833518c06d2eb801c
Reviewed-on: https://code.wireshark.org/review/31613
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agosrt: redundant prototypes declaration
Alexis La Goutte [Sun, 20 Jan 2019 15:26:44 +0000 (15:26 +0000)]
srt: redundant prototypes declaration

 redundant redeclaration of ‘proto_register_srt’ [-Wredundant-decls]
redundant redeclaration of ‘proto_reg_handoff_srt’ [-Wredundant-decls]

Change-Id: Ifcc5dc5185f01601f2193c2596fa075885a412d6
Reviewed-on: https://code.wireshark.org/review/31633
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoGSM-SIM: Fix sw value for file ID not found
Darien Spencer [Sat, 19 Jan 2019 21:30:33 +0000 (23:30 +0200)]
GSM-SIM: Fix sw value for file ID not found

Change-Id: I8c4976f55c60b1d6f78ef16d7d385978d49789d4
Reviewed-on: https://code.wireshark.org/review/31617
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoQUIC: fix long packet type numbers (draft -17)
Peter Wu [Sun, 20 Jan 2019 12:18:03 +0000 (13:18 +0100)]
QUIC: fix long packet type numbers (draft -17)

Swap Retry and 0-RTT Protected identifiers to fix connection tracking
and decryption. Fix detection of Retry packets.

Bug: 13881
Change-Id: I41d1b5674a5ec634b3c55bee72d6943664039dba
Reviewed-on: https://code.wireshark.org/review/31629
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoNFS: Display ClientID in info col for Renew requests
Uli Heilmeier [Sun, 20 Jan 2019 11:03:30 +0000 (12:03 +0100)]
NFS: Display ClientID in info col for Renew requests

Instead of showing the CRC16 value of the clientid, this commit
displays the real value of the clientid in the INFO column.

Bug: 15432
Change-Id: Iaeae89bf7dfe4b08746a4da9515f25f9ae6c02ac
Reviewed-on: https://code.wireshark.org/review/31628
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoCMake: Replace PACKAGELIST magic
João Valverde [Thu, 10 Jan 2019 01:45:00 +0000 (01:45 +0000)]
CMake: Replace PACKAGELIST magic

This is more explicit and easier to read with slightly better locality
while using less code.

Also less awkward when the package doesn't fit the narrow package list
expectations.

The ws_find_package() macro doesn't include all the status messages. The
choice was to rely on standard find_package() and feature_summary() output
and be less verbose.

Avoid polluting the CLI build interface. Per target include paths and
macro definitions are preferred.

Because this patch intentionally removes the global CMAKE_*_FLAGS
and include_directories() usage in favor of target properties, some
untested build configurations may inadvertently break because of
missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This
required a manual review of dependencies that might have been
incomplete.

${PACKAGE_VAR}_LINK_FLAGS seems to be unused.

Changing the CMake Qt code to use more modern CMake component syntax
is left as future work.

Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78
Reviewed-on: https://code.wireshark.org/review/31496
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months ago[Automatic update for 2019-01-20]
Gerald Combs [Sun, 20 Jan 2019 08:30:26 +0000 (08:30 +0000)]
[Automatic update for 2019-01-20]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I18a5419a2953f5893aa76e2823c50d48e284b270
Reviewed-on: https://code.wireshark.org/review/31625
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 months agoOpenFlow 1.5: implement version specific parts
Christophe GUERBER [Thu, 17 Jan 2019 08:51:31 +0000 (09:51 +0100)]
OpenFlow 1.5: implement version specific parts

B.18.1 Egress Tables (EXT-306):
B.18.2 Packet Type aware pipeline (EXT-112)
B.18.3 Extensible Flow Entry Statistics (EXT-334)
B.18.4 Flow Entry Statistics Trigger (EXT-335)
B.18.6 Packet Register pipeline fields (EXT-244)
B.18.11 Scheduled Bundles (EXT-340)
B.18.12 Controller connection status (EXT-454)
B.18.14 Enable setting all pipeline fields in packet-out (EXT-427)
B.18.15 Port properties for pipeline fields (EXT-388)
B.18.16 Port property for recirculation (EXT-399)
B.18.21 Rename some type for consistency (EXT-302)

Change-Id: I02d2370f6cf661e400bb8b690213589cd030a541
Reviewed-on: https://code.wireshark.org/review/31566
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoCMake: do not set an invalid INSTALL_RPATH for (plugin) libraries
João Valverde [Sat, 19 Jan 2019 13:26:14 +0000 (13:26 +0000)]
CMake: do not set an invalid INSTALL_RPATH for (plugin) libraries

CMAKE_INSTALL_RPATH also applies to libraries such as plugins. This
should not happen when relative RPATHs (through $ORIGIN) are in use, so
fix that.

Change-Id: I154d93ba6ed66c2f78a42b25e352b5b54e9b8818
Reviewed-on: https://code.wireshark.org/review/31609
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agoRename a Boolean flag variable to reflect the non-default behavior.
Guy Harris [Sat, 19 Jan 2019 21:55:45 +0000 (13:55 -0800)]
Rename a Boolean flag variable to reflect the non-default behavior.

This makes it slightly clearer, from code inspection, what the -C flag
does.  The default behavior is to continue; -C cause capinfos to stop,
rather than continue, after an open failure.

Change-Id: I8bc67ce61c5d828c7f0ed87ee397ef994ff99aa4
Reviewed-on: https://code.wireshark.org/review/31621
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 months agoRevert "Change comment to reflect reality."
Guy Harris [Sat, 19 Jan 2019 21:39:36 +0000 (21:39 +0000)]
Revert "Change comment to reflect reality."

This reverts commit b32c8432c76ab9e86fb1fd796fa5600d181e02ae.

Reason for revert: the variable name was confusing - it describes
the behavior if the -C flag is *absent*, and -C sets it to *false*.

Change-Id: Ia4d2fb954466b710db3fd1b9897feb9f3818c3a9
Reviewed-on: https://code.wireshark.org/review/31618
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 months agoChange comment to reflect reality.
Guy Harris [Sat, 19 Jan 2019 21:34:14 +0000 (13:34 -0800)]
Change comment to reflect reality.

When the -C flag was added, it meant (and still means) "[C]ontinue after
open errors", which was new behavior; the default "exit on open errors"
behavior was not changed.

Change-Id: I066c1aaef544e57efb39404e2dd61acbd9a91754
Reviewed-on: https://code.wireshark.org/review/31614
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 months agoMEGACO: fix dissection of Remote Descriptor
Pascal Quantin [Sat, 19 Jan 2019 13:26:54 +0000 (14:26 +0100)]
MEGACO: fix dissection of Remote Descriptor

Display the right field name.

Bug: 15430
Change-Id: I1d7da96a351bfad275142a36975df294bfec1a50
Reviewed-on: https://code.wireshark.org/review/31608
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 months agoNGAP: dissect NASC IE
Pascal Quantin [Sat, 19 Jan 2019 12:52:47 +0000 (13:52 +0100)]
NGAP: dissect NASC IE

Change-Id: I35210fe4088afb69f9b03b9cfcc12e8309ccd8b3
Reviewed-on: https://code.wireshark.org/review/31607
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 months agoLTE RRC: dissect 2 InterNode IEs
Pascal Quantin [Sat, 19 Jan 2019 11:28:15 +0000 (12:28 +0100)]
LTE RRC: dissect 2 InterNode IEs

Change-Id: I17424675a7b60f468e94134f17533cd891d135f7
Reviewed-on: https://code.wireshark.org/review/31606
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 months agodiam_dict.l,wimaxasncp_dict.l: fix -Werror=stringop-truncation
Peter Wu [Fri, 18 Jan 2019 23:32:49 +0000 (00:32 +0100)]
diam_dict.l,wimaxasncp_dict.l: fix -Werror=stringop-truncation

The given "len" is the size of the string in "txt" excluding the NUL
terminator. GCC 8.2.1+20181127-1 rightfully complains that strncpy will
not terminate the destination buffer.

Change-Id: I592c7c218cf07c13697de4e60f454326a93d1124
Reviewed-on: https://code.wireshark.org/review/31600
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agovwr: fix -Werror=maybe-uninitialized with GCC 8.2.1+20181127-1
Peter Wu [Fri, 18 Jan 2019 23:13:06 +0000 (00:13 +0100)]
vwr: fix -Werror=maybe-uninitialized with GCC 8.2.1+20181127-1

Change-Id: I58d61d29719facb5d639bdbd7e3d790096f69486
Reviewed-on: https://code.wireshark.org/review/31599
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoZigBee: Correct command names in Key-Establishment cluster
Kenneth Soerensen [Fri, 18 Jan 2019 12:16:28 +0000 (13:16 +0100)]
ZigBee: Correct command names in Key-Establishment cluster

Change-Id: I5c6a25bfc31160c722ddefb811cc3b1beeec772b
Reviewed-on: https://code.wireshark.org/review/31594
Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoLTE RRC: upgrade dissector to v15.4.0
Pascal Quantin [Fri, 18 Jan 2019 17:40:00 +0000 (18:40 +0100)]
LTE RRC: upgrade dissector to v15.4.0

Change-Id: I90b3a5afe782992eac98b37336cc9267ba73dbc0
Reviewed-on: https://code.wireshark.org/review/31595
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 months agoCMake: avoid including file modification time for RCC
Peter Wu [Fri, 18 Jan 2019 12:39:41 +0000 (13:39 +0100)]
CMake: avoid including file modification time for RCC

Resources such as translations (autogenerated qm files) and SVG images
resulted in non-reproducible builds. Be sure to disable this to make the
resources reproducible on Qt < 5.8 or Qt >= 5.9 (excluding Qt 5.8.x).

With this change, the Wireshark build is reproducible invariant of the
build directory (but not the source directory).

Bug: 15163
Change-Id: I9240d2aa6e7298e1928c0f1d97ce83673320024d
Reviewed-on: https://code.wireshark.org/review/31593
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agonas5gs: Add NAS 5GS media type dissection.
Anders Broman [Fri, 18 Jan 2019 12:37:19 +0000 (13:37 +0100)]
nas5gs: Add NAS 5GS media type dissection.

While at it set p2p_dir.

Change-Id: Ia63ba998db72353963eddc4baa811ce552fd617a
Reviewed-on: https://code.wireshark.org/review/31590
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Joakim Karlsson <oakimk@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agogprscdr: Added backward compabillity addition in ChangeCondition
Joakim Karlsson [Fri, 18 Jan 2019 11:53:12 +0000 (12:53 +0100)]
gprscdr: Added backward compabillity addition in ChangeCondition

Adding back values existed in older relese, rel6, rel7.

Change-Id: I68de38965dc5de2ac39c04467810ce93af37fe1f
Reviewed-on: https://code.wireshark.org/review/31587
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoCMake: set CMAKE_BUILD_RPATH_USE_ORIGIN
Peter Wu [Fri, 18 Jan 2019 10:18:42 +0000 (11:18 +0100)]
CMake: set CMAKE_BUILD_RPATH_USE_ORIGIN

Tested with cmake v3.13.3-952-gf4c17c041, the resulting binaries indeed
contain $ORIGIN and are invariant of the build directory.

Change-Id: I5dad9493a6d54a0b03a3494fce69cc69a25b2f84
Ping-Bug: 15163
Reviewed-on: https://code.wireshark.org/review/31586
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agogitlab-ci: keep artifacts in rpm builds.
Dario Lombardo [Thu, 17 Jan 2019 09:13:09 +0000 (10:13 +0100)]
gitlab-ci: keep artifacts in rpm builds.

Change-Id: I7117c05a59b82bd925f82dfdfdda770fa507b7d4
Reviewed-on: https://code.wireshark.org/review/31575
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agogitlab-ci: use ninja in opensuse builds.
Dario Lombardo [Thu, 17 Jan 2019 13:08:07 +0000 (14:08 +0100)]
gitlab-ci: use ninja in opensuse builds.

Change-Id: I80df02fb3db6ab5a742726c3beaa30a203db7237
Reviewed-on: https://code.wireshark.org/review/31576
Reviewed-by: Dario Lombardo <lomato@gmail.com>
6 months agodocbook: use fixed space section for filters code.
Dario Lombardo [Thu, 17 Jan 2019 10:42:26 +0000 (11:42 +0100)]
docbook: use fixed space section for filters code.

Change-Id: I6052bc3ec9705a272d0cd6f31cf8b5c1f4b8d45c
Reviewed-on: https://code.wireshark.org/review/31573
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoIEEE 802.11 dissector: Fixed description for reason code 12
Mister X [Thu, 17 Jan 2019 00:59:04 +0000 (17:59 -0700)]
IEEE 802.11 dissector: Fixed description for reason code 12

Change-Id: I5031f4ca7401be0e785502abfe871cda52388085
Reviewed-on: https://code.wireshark.org/review/31570
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
6 months agoebhscr: increasing ebhscr snaplen
Pantar Ana [Tue, 15 Jan 2019 13:38:09 +0000 (14:38 +0100)]
ebhscr: increasing ebhscr snaplen

Change-Id: Ie033196c099927912b1e7849299e786dc8416923
Reviewed-on: https://code.wireshark.org/review/31554
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoMQTT v5 malformed packet fixes.
Roger Light [Thu, 17 Jan 2019 19:06:24 +0000 (19:06 +0000)]
MQTT v5 malformed packet fixes.

PUBACK, PUBREC, PUBREL, and PUBCOMP can all have abbreviated packets
which are not currently handled, leading to those forms being marked as
malformed.

Bug: 15428
Change-Id: I1e6e5dbbca29e7e731683d5c166f9abf978f62b2
Reviewed-on: https://code.wireshark.org/review/31580
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoWindows: upgrade libxml2 to 2.9.9
Pascal Quantin [Fri, 18 Jan 2019 07:11:19 +0000 (08:11 +0100)]
Windows: upgrade libxml2 to 2.9.9

Change-Id: I0496974b09e9183879e2f1421e69aab06040d23a
Reviewed-on: https://code.wireshark.org/review/31585
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 months agowiretap,file.c: ensure DSBs are reapplied on redissection
Peter Wu [Fri, 18 Jan 2019 00:54:22 +0000 (01:54 +0100)]
wiretap,file.c: ensure DSBs are reapplied on redissection

After redissection, the TLS dissector did not remember the DSB secrets
anymore. Since the secrets callback is only invoked on the sequential
read in wtap, be sure to reapply the existing DSBs to the new session.

Bug: 15252
Change-Id: I125f095acb8d577c2439a10e3e65c8b3cfd976b9
Reviewed-on: https://code.wireshark.org/review/31584
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoCIP: Improve API/RPI precision
Dylan Ulis [Fri, 18 Jan 2019 00:31:09 +0000 (19:31 -0500)]
CIP: Improve API/RPI precision

1. Show 3 digits of precision after the decimal place for API/RPI when
displaying in ms.
2. Remove displaying the value as hex microseconds.

Change-Id: I483739c13ff0e02bd773b5207b41a5eec6c23289
Reviewed-on: https://code.wireshark.org/review/31583
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agomacos-setup.sh: Bump our libxml2 version.
Gerald Combs [Thu, 17 Jan 2019 17:08:35 +0000 (09:08 -0800)]
macos-setup.sh: Bump our libxml2 version.

Libxml2 2.9.9 was recently released and fixes a couple of security
flaws.

Change-Id: I59865a35c97e05d7bf41ca9b7688c3dd89507a66
Reviewed-on: https://code.wireshark.org/review/31578
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoCMake: Fix Vcpkg x86 directory discovery.
Gerald Combs [Thu, 17 Jan 2019 22:32:33 +0000 (14:32 -0800)]
CMake: Fix Vcpkg x86 directory discovery.

`vcpkg export` installs files into an architecture-dependent
subdirectory which matches the PLATFORM environment variable on 64-bit
Windows but not 32-bit Windows. Replace $ENV{PLATFORM} in FindWSWinLibs
with a variable derived from WIRESHARK_TARGET_PLATFORM.

Change-Id: I142615bd50179fdffdebd2bb1f193ef0070c0483
Reviewed-on: https://code.wireshark.org/review/31582
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agoUpdate tooltip for "Resolve network (IP) addresses"
Stig Bjørlykke [Thu, 17 Jan 2019 22:00:31 +0000 (23:00 +0100)]
Update tooltip for "Resolve network (IP) addresses"

Remove name resolution from DNS packets from the tooltip because
resolving from DNS packets has it's own check box.

Change-Id: I0a4039a1639f22b51429c3771fd828d9727aca08
Reviewed-on: https://code.wireshark.org/review/31581
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agoCMake: silence CMP0083 warning from future CMake 3.14
Peter Wu [Thu, 17 Jan 2019 18:34:37 +0000 (19:34 +0100)]
CMake: silence CMP0083 warning from future CMake 3.14

The current development version of CMake started emitting warnings due
to the use of CMAKE_POSITION_INDEPENDENT_CODE without setting CMP0083.

Change-Id: Id6747c00fea7a1d28e5ba900ba4578fe89f40f83
Reviewed-on: https://code.wireshark.org/review/31579
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agoDTLS: add DSB support, use the key log file from the TLS dissector
Peter Wu [Thu, 17 Jan 2019 16:52:52 +0000 (17:52 +0100)]
DTLS: add DSB support, use the key log file from the TLS dissector

The DTLS and TLS dissectors already share code for parsing the key log
file contents but the actual key material was stored separately. As
implementations (like GnuTLS) write the TLS and DTLS secrets to the same
file (specified by the SSLKEYLOGFILE environment variable), it seems
reasonable to combine them.

This also enables use of the pcapng Decryption Secrets Block for
decryption of DTLS traces. The dtls.keylog_file preference has become
obsolete and can no longer be used (this was not tested anyway).

A new test was added based on dtls12-aes128ccm8.pcap, the master secret
was extracted using the tls.debug_file preference.

Bug: 15252
Change-Id: Idfd52c251da966fe111dea37bc3fb143d968f744
Reviewed-on: https://code.wireshark.org/review/31577
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agosmpp: Make it clearer that it's a heuristic dissector.
Anders Broman [Thu, 17 Jan 2019 12:00:39 +0000 (13:00 +0100)]
smpp: Make it clearer that it's a heuristic dissector.

Should this be default off? I had a false positive.
While at it remove unused hf entry.

Change-Id: Ia3ec0f2e127659349226af9bc2acb0812960a0a6
Reviewed-on: https://code.wireshark.org/review/31574
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoCIP: Add more objects
Dylan Ulis [Thu, 17 Jan 2019 00:14:59 +0000 (19:14 -0500)]
CIP: Add more objects

Add newer CIP objects

Change-Id: Ie1fcc219ee2d8abece8aaa9c4bbaade42f029ef9
Reviewed-on: https://code.wireshark.org/review/31568
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoCIP Safety: Multicast Active/Idle was reversed
Dylan Ulis [Thu, 17 Jan 2019 00:10:16 +0000 (19:10 -0500)]
CIP Safety: Multicast Active/Idle was reversed

Corrected the Multicast Active/Idle true_false_string order

Change-Id: I1753f4cfc9e1ea138789a236976b649607d74831
Reviewed-on: https://code.wireshark.org/review/31567
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoVPP: add vpp graph dispatch trace dissector
Dave Barach [Wed, 9 Jan 2019 15:39:44 +0000 (10:39 -0500)]
VPP: add vpp graph dispatch trace dissector

Add a dissector for http://fd.io vpp graph dispatch traces. The file
format is described in detail here:
       https://fdio-vpp.readthedocs.io/en/latest/gettingstarted\
               /developers/vnet.html#graph-dispatcher-pcap-tracing

Fuzz-tested with good results.

Bug: 15411
Change-Id: I3b040bb072ce43fb2fb646a9e473c5486654906a
Signed-off-by: Dave Barach <dave@barachs.net>
Reviewed-on: https://code.wireshark.org/review/31466
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoLTE RRC: fix dissection of measResultSCG-r15 IE
Pascal Quantin [Thu, 17 Jan 2019 08:41:33 +0000 (09:41 +0100)]
LTE RRC: fix dissection of measResultSCG-r15 IE

Change-Id: I68bdc75fc1fb270f815004f2cb6eafbb7bfc2329
Reviewed-on: https://code.wireshark.org/review/31572
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 months agoQUIC: Reorder Frame type code
Alexis La Goutte [Wed, 16 Jan 2019 20:12:39 +0000 (21:12 +0100)]
QUIC: Reorder Frame type code

Change-Id: I2b0a7ef2d46f6266c6d96ac74e590869144a39bd
Reviewed-on: https://code.wireshark.org/review/31565
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agoudp-nm: Extend and rename to autosar-nm
Maksim Salau [Tue, 15 Jan 2019 19:26:10 +0000 (22:26 +0300)]
udp-nm: Extend and rename to autosar-nm

The UDP-NM dissector is actually AUTOSAR-NM and works over UDP and CAN.

The change also adds parsing of reserved bits of control bit vector and
the 'NM Coordinator Id' field which was present in revision 3.2 but now
is deprecated (bits are marked as reserved).

Since not every packet on a CAN bus is an Network Management one,
parameters were added to filter only packets with specific ids.
In order to define ids to be dissected one should define a reference id
and a mask in preferences.

Change-Id: Ica69032b7200c4c3a1f81130ebcea0dd4144cbf2
Reviewed-on: https://code.wireshark.org/review/31560
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoRTPS: Possible buffer overrun fixed in PID_TYPEOBJECT_LB dissection.
ismaelrti [Fri, 11 Jan 2019 11:45:28 +0000 (12:45 +0100)]
RTPS: Possible buffer overrun fixed in PID_TYPEOBJECT_LB dissection.

In PID_TYPEOBJECT_LB dissection class_id_enum_names char* array has
been replaced by a string_values so it won't cause any issue if
the read index value is out of bounds.

Bug: 15405
Change-Id: I0dc9d8d00024a2fbb03fca7238ab709b91b059aa
Reviewed-on: https://code.wireshark.org/review/31484
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoIS-IS: support for dissecting IS-IS BIER Info Sub-TLV (RFC 8401)
Rohan Saini [Tue, 15 Jan 2019 06:22:17 +0000 (22:22 -0800)]
IS-IS: support for dissecting IS-IS BIER Info Sub-TLV (RFC 8401)

Added support for dissecting IS-IS BIER Info Sub-TLV and BIER MPLS
Encapsulation Sub-sub-TLV, as per RFC 8401

Bug: 15421
Change-Id: Iec5e275f3afef7cb64d474634bd0a89b42a1b480
Reviewed-on: https://code.wireshark.org/review/31551
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agomake-version.pl: Add a comment about version.h.
Gerald Combs [Thu, 17 Jan 2019 00:48:24 +0000 (16:48 -0800)]
make-version.pl: Add a comment about version.h.

Note that we might want to give CMakeLists.txt the ability to generate
version.h independently.

Change-Id: I4864504790aee4c40805f5ae3584db027a2762f5
Reviewed-on: https://code.wireshark.org/review/31569
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 months agoWSDG: make Testing more accessible, add missing anchors
Peter Wu [Mon, 14 Jan 2019 22:42:06 +0000 (23:42 +0100)]
WSDG: make Testing more accessible, add missing anchors

Rename sections to avoid files named like
_documentation_toolchain.html and _adding_or_modifying_tests.html.

Rewrite the testing introduction to directly show the required commands
for the pytest method. That provides much nicer output and finishes
faster, except when you cannot install extra build dependencies there
should be no reason to avoid it. ctest is removed from the description
since it does not provide many advantages over the test target (except
for the possibility of adding --verbose I guess).

Group some related sections under a "Test suite structure" heading in
order to collect some small sections on a single page.

Fix some other grammatical issues while at it.

Change-Id: I8ab821a67254e62c0fc3d18630e4bc8b0ef872dd
Reviewed-on: https://code.wireshark.org/review/31550
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agoQt: IO Graph correct color selection
Roland Knall [Wed, 9 Jan 2019 13:57:17 +0000 (14:57 +0100)]
Qt: IO Graph correct color selection

The correct method of selection of colors is just using the
QColorDialog not a specialized object. Implementing it just
that way, to correct bug on Linux

Bug: 15399
Change-Id: I3c4785d352888ec34c34534667c3f7df182f9fd7
Reviewed-on: https://code.wireshark.org/review/31465
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
6 months agonas_5gs: remove dead increment.
Dario Lombardo [Wed, 16 Jan 2019 15:29:39 +0000 (16:29 +0100)]
nas_5gs: remove dead increment.

Found by scan-build.

Change-Id: I499dcc0781cddbf10e117ab91c58a3213adbbc63
Reviewed-on: https://code.wireshark.org/review/31564
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoieee80211: calculate the number of tones for RU allocation
Emmanuel Grumbach [Tue, 15 Jan 2019 19:00:25 +0000 (11:00 -0800)]
ieee80211: calculate the number of tones for RU allocation

It can be annoying to have to manually calculate the number
of tones based on the global bandwidth and the RU allocation.
Do that in the dissector.

Change-Id: I42eb403a91ebacc4fcfaa3e8c3e793a055d2b9f8
Reviewed-on: https://code.wireshark.org/review/31559
Reviewed-by: Emmanuel Grumbach <egrumbach@gmail.com>
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
6 months agoCouchbase: Fix another shadow variable.
Gerald Combs [Tue, 15 Jan 2019 22:43:49 +0000 (14:43 -0800)]
Couchbase: Fix another shadow variable.

Change-Id: Id66535f9e21a9e311cb69af2b46fa896186e8b10
Reviewed-on: https://code.wireshark.org/review/31561
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoFix capitalization of "radiotap".
Guy Harris [Tue, 15 Jan 2019 23:16:19 +0000 (15:16 -0800)]
Fix capitalization of "radiotap".

Change-Id: I9f5925be9305b72fbe4ccd98c0c77aadb629ea8f
Reviewed-on: https://code.wireshark.org/review/31563
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 months agoQUIC: Reorder line code for QUIC Transport Parameter (draft -17)
Alexis La Goutte [Tue, 15 Jan 2019 12:12:47 +0000 (13:12 +0100)]
QUIC: Reorder line code for QUIC Transport Parameter (draft -17)

Bug: 13881
Change-Id: I3f721441a793740aaff7eae5a2bc10ec66e8e220
Reviewed-on: https://code.wireshark.org/review/31553
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agossh: Host key tree selection, fix off by 4
Daniel Hirschberger [Wed, 9 Jan 2019 12:16:49 +0000 (13:16 +0100)]
ssh: Host key tree selection, fix off by 4

When selecting the Host key tree 4 bytes of the host key are missing because
the subtree has length key_len and does not include the length of key length
field itself.

Change-Id: I1a1ca2f3a5ea651c9dab4f0edc705df2c98a7ae4
Reviewed-on: https://code.wireshark.org/review/31464
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 months agomake-version.pl updates.
Gerald Combs [Thu, 10 Jan 2019 17:22:45 +0000 (09:22 -0800)]
make-version.pl updates.

Read our major, minor, and micro versions from CMakeLists.txt.

Add the ability to set our extra version information differently if our
Git commit is tagged or untagged. Change our extra version placeholder
from "%#" to "{vcsinfo}".

Add --tagged-version-extra (-t) and --untagged-version-extra (-u)
arguments for specifying the tagged and untagged extra formats. Add
--force-extra (-f) so that we can force one format or the other.

Require the major.minor.micro version to be specified when using
--set-version (-v).

Update appveyor.yml and the Developer's Guide to match the new behavior.

Change-Id: I6e5d55470aff7e7c61e75f208e24c4105276905a
Reviewed-on: https://code.wireshark.org/review/31479
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 months agoNR-RRC: upgrade dissector to v15.4.0
Pascal Quantin [Tue, 15 Jan 2019 17:45:54 +0000 (18:45 +0100)]
NR-RRC: upgrade dissector to v15.4.0

Change-Id: I6a50623a485796a12f01ca1352ba31caa0d96eee
Reviewed-on: https://code.wireshark.org/review/31558
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 months agoGSUP: add CHECK-IMEI message decoding
Oliver Smith [Tue, 8 Jan 2019 13:04:29 +0000 (14:04 +0100)]
GSUP: add CHECK-IMEI message decoding

Implement necessary messages for Procedure Check_IMEI_VLR (TS 23.018
Chapter 7.1.2.9). This lets the VLR ask the EIR to check if an IMEI
is valid.

Use the IMEI dissector from BSSAP by making it available as stand-alone
dissector.

For more information, please see:

https://git.osmocom.org/libosmocore/commit/?id=10db2817e5ce76eebd61dd6b607a6dfad57fa417
https://git.osmocom.org/osmo-gsm-manuals/commit/?id=0f41399d36770fb6d2069d5aea7e5315beb368e6

Change-Id: Ie66c79ace7a9448b3191bec8208805aa3bb7888e
Reviewed-on: https://code.wireshark.org/review/31445
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 months agoBSSAP: fix typo imesiv -> imeisv
Oliver Smith [Tue, 15 Jan 2019 14:26:33 +0000 (15:26 +0100)]
BSSAP: fix typo imesiv -> imeisv

Change-Id: If92783c2dc57d3cf35b8a2a7c2fcb72e5219c0ad
Reviewed-on: https://code.wireshark.org/review/31555
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 months agoCIP: Correct SSN to SNN
Dylan Ulis [Sat, 12 Jan 2019 14:11:22 +0000 (09:11 -0500)]
CIP: Correct SSN to SNN

SNN = Safety Network Number

No functional/parsing changes.

Changes:
1. Fix some display fields and filter names that previously used the
incorrect ssn naming.
2. Changed all variable names in a similar way.

Change-Id: I7bdc52a5aef31a9c6007545d5a79c99bab6cd184
Reviewed-on: https://code.wireshark.org/review/31549
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoIMAP: Fix regression introduced by change 30876
Christophe GUERBER [Mon, 14 Jan 2019 09:50:39 +0000 (10:50 +0100)]
IMAP: Fix regression introduced by change 30876

UID prefixed commands where not dissected correctly.

Change-Id: I280e3ff7edff11fa67b4a3567b4a0614271d9f6a
Reviewed-on: https://code.wireshark.org/review/31542
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoieee80211: print the TSF in decimal
Emmanuel Grumbach [Mon, 14 Jan 2019 18:50:58 +0000 (10:50 -0800)]
ieee80211: print the TSF in decimal

The TSF values are "normal" numbers, not a bitmap
or anything like that.
Moreover, we often need to add or substract values
from the TSF of a beacon. Change it to be printed in
decimal to make people's life easier.

Change-Id: I01505395fb10538b204a87dd864ac04e29b821e0
Reviewed-on: https://code.wireshark.org/review/31544
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoWindows: Use a c-ares DLL built with vcpkg.
Gerald Combs [Fri, 4 Jan 2019 18:14:13 +0000 (10:14 -0800)]
Windows: Use a c-ares DLL built with vcpkg.

Update the Windows build environment to use c-ares packages built from
a VS 2017 command prompt with

    set CARES_VERSION=1.15.0
    vcpkg install c-ares:x86-windows c-ares:x64-windows
    vcpkg export c-ares:x86-windows --output=c-ares-%CARES_VERSION%-win32ws --zip
    vcpkg export c-ares:x64-windows --output=c-ares-%CARES_VERSION%-win64ws --zip

The packages also include a PDB, so  copy it to the build directory and
add it to the PDB .zip.

Change-Id: I1887ca89d897bea184144315219b366096519961
Reviewed-on: https://code.wireshark.org/review/31376
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 months agogitlab-ci: do not build the all target when invoking rpm-package
Peter Wu [Mon, 14 Jan 2019 12:09:19 +0000 (13:09 +0100)]
gitlab-ci: do not build the all target when invoking rpm-package

It doubles the build time for little benefit as rpm-package will
essentially build the same binaries again.

Adjust the "tshark --version" invocation, besides "build" (normal
build), also look in "build/packaging/rpm/BUILD/wireshark-*/build"
(OpenSUSE) and "build/packaging/rpm/BUILD/wireshark-*" (CentOS).

rpmbuild from OpenSUSE sets -DCMAKE_SKIP_RPATH=ON, as a workaround set
LD_LIBRARY_PATH to ensure that tshark can find its libraries.

Change-Id: I5ce8b97515516adbbba2f1e445a9dd1abf08d530
Reviewed-on: https://code.wireshark.org/review/31541
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agoRPM: remove dependency on the which utility
Peter Wu [Mon, 14 Jan 2019 13:20:20 +0000 (14:20 +0100)]
RPM: remove dependency on the which utility

It is not necessary to know the full path to a program. Instead use the
'type' shell builtin (part of POSIX) to detect availability.

Change-Id: Id68b298625d389a1f7843f52f56312bf81d97b80
Reviewed-on: https://code.wireshark.org/review/31540
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agoX2AP: upgrade dissector to v15.4.0
Pascal Quantin [Mon, 14 Jan 2019 16:59:25 +0000 (17:59 +0100)]
X2AP: upgrade dissector to v15.4.0

Change-Id: I67d26dd142ffdb79bc304d44f9cfb5bc8e0acd1f
Reviewed-on: https://code.wireshark.org/review/31543
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 months agotarball+RPM: Fetch our version from CMake.
Gerald Combs [Fri, 11 Jan 2019 22:34:03 +0000 (22:34 +0000)]
tarball+RPM: Fetch our version from CMake.

Move git-export-release.sh to packaging/source. Have the source and RPM
packaging derive version information from CMake's VERSION variable. This
brings them in line with the rest of our packaging and avoids having to
read chicken entrails^W^Wgit output.

Make sure we always generate wireshark.spec.

Bug: 15359
Change-Id: I188efda489c94449a10a612abebf9c2872c305cb
Reviewed-on: https://code.wireshark.org/review/31504
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 months agodfilter: add string() function.
Dario Lombardo [Sun, 6 Jan 2019 09:34:32 +0000 (10:34 +0100)]
dfilter: add string() function.

This function can convert non-string fields into strings. This allows the
user to apply string functions (like contains and matches) to non-string fields.

Examples:

string(frame.number) matches "[13579]$" => for odd frames
string(eth.dst) matches "aa\.bb\.cc\.dd\.ee\..." => to match a group of stations
string(snmp.name) matches "^1.2.3.4" => for all OIDs under a specific node

Change-Id: I18173f50ba5314ecdcd1e4b66c7e8ba5b44257ee
Reviewed-on: https://code.wireshark.org/review/31427
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 months agoCMake: remove --clean from rpmbuild invocation
Peter Wu [Mon, 14 Jan 2019 12:26:14 +0000 (13:26 +0100)]
CMake: remove --clean from rpmbuild invocation

This allows for inspection of the build artifacts for a RPM build.
It is consistent with the deb-package target not executing --post-clean.

Change-Id: I63e3c571c893a104b5cfa98a0c67c8fdca03a964
Reviewed-on: https://code.wireshark.org/review/31538
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agonettrace: Handle beginTime with fractions of seconds.
Anders Broman [Fri, 11 Jan 2019 16:03:28 +0000 (17:03 +0100)]
nettrace: Handle beginTime with fractions of seconds.

Change-Id: If12f5430e816a373c084996a6e55846ce825a4de
Reviewed-on: https://code.wireshark.org/review/31539
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agogprscdr: Update to 3GPP TS 32.298 V15.5.1
Joakim Karlsson [Mon, 14 Jan 2019 12:38:35 +0000 (13:38 +0100)]
gprscdr: Update to 3GPP TS 32.298 V15.5.1

Change-Id: I753f87080273f6d959cd75f7082c70ce62753498
Reviewed-on: https://code.wireshark.org/review/31537
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoQUIC: Update QUIC Transport Parameter (draft-17)
Alexis La Goutte [Sun, 13 Jan 2019 17:46:17 +0000 (18:46 +0100)]
QUIC: Update QUIC Transport Parameter (draft-17)

- Renumbered transport parameters (TP)
- Use varints (for integer)
- Rename initial_max_bidi_streams -> initial_max_streams_bidi (likewise for uni).

Bug: 13881
Change-Id: I1d748a756d36c73119ce6b2b72994796b89c46b1
Reviewed-on: https://code.wireshark.org/review/31534
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoQUIC: Initial support of draft-17
Alexis La Goutte [Sun, 6 Jan 2019 08:49:45 +0000 (09:49 +0100)]
QUIC: Initial support of draft-17

Renumber frame types, consolidate CONNECTION_CLOSE frames,

Bug: 13881
Change-Id: Id71cb5983748487947b15db625e5a8e9eea1eadc
Reviewed-on: https://code.wireshark.org/review/31405
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoUpdate packet-dcm.h using DICOM 2018e definitions
Rickard Holmberg [Sun, 13 Jan 2019 15:55:11 +0000 (16:55 +0100)]
Update packet-dcm.h using DICOM 2018e definitions

Change-Id: Icb77f0a81547655694c7bcbadcbdcde299928ae0
Reviewed-on: https://code.wireshark.org/review/31531
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoMPLS Echo: Dissect additional FEC stack RFC8287
Uli Heilmeier [Sat, 12 Jan 2019 11:32:58 +0000 (12:32 +0100)]
MPLS Echo: Dissect additional FEC stack RFC8287

Dissect additional FEC stack segments IDs according to RFC 8287

Bug: 15413
Change-Id: I2d1782d71f0a77ef2affdeca03180acaa31bc10e
Reviewed-on: https://code.wireshark.org/review/31536
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agodissectors: can: Handle CAN id flags
Maksim Salau [Wed, 9 Jan 2019 18:46:38 +0000 (21:46 +0300)]
dissectors: can: Handle CAN id flags

The change adds support of CAN flags stored in ids.
The flags allow dissectors to distinguish error frames,
remote transmission request frames and identify id type used (either
standard 11-bit or extended 29-bit).

Addition of bit flags allowed to add more checks whether a CAN frame may
be decoded by a particular dissector. I.e. some dissectors work only
with 11-bit ids (CANopen, DeviceNet) some only with 29-bit (J1939,
ISObus), others should be fine with bot types (OBD-II, ISO 15765).

The change also fixes 2 bugs in the DeviceNet dissector:
* removed byte swapping of CAN id (the pcap file seems to be broken;
  verified dissector operation with random traffic generated by cangen)
* fixed "Warn Dissector bug, protocol DeviceNet, in packet N":
  added a default value for fragmented message type string value lookup.

Bug: 15418
Change-Id: I70e91130789bb3367fe19e51489cd34e97d678a6
Reviewed-on: https://code.wireshark.org/review/31471
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agopfcp: Update to 3GPP TS 29.244 V15.4.0
Joakim Karlsson [Sun, 13 Jan 2019 16:17:21 +0000 (17:17 +0100)]
pfcp: Update to 3GPP TS 29.244 V15.4.0

Change-Id: I285c79b7113597f47d9c5cbfd5a99b977e4d21b2
Reviewed-on: https://code.wireshark.org/review/31530
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 months agoLPP: upgrade dissector to v15.2.0
Pascal Quantin [Sun, 13 Jan 2019 13:52:19 +0000 (14:52 +0100)]
LPP: upgrade dissector to v15.2.0

Change-Id: If94146ac8f4a54d45c0448e236543927df438aeb
Reviewed-on: https://code.wireshark.org/review/31529
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>