metze/wireshark/wip.git
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 months agoMPLS Echo: Fix length for FEC stack elements
Uli Heilmeier [Sat, 12 Jan 2019 11:46:36 +0000 (12:46 +0100)]
MPLS Echo: Fix length for FEC stack elements

For the length we don't need to add another 4 bytes.

Change-Id: I276801ab4c5c6a1d9e37b55956f352c16b673db8
Ping-Bug: 15413
Reviewed-on: https://code.wireshark.org/review/31510
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agogitlab-ci: add missing package to opensuse.
Dario Lombardo [Sun, 13 Jan 2019 09:18:39 +0000 (10:18 +0100)]
gitlab-ci: add missing package to opensuse.

Ruby pkg contains gem that is required to install a working version
of asciidoctor.

Change-Id: Iabe790c17e3be3e3285868b5e0734101bad4f5a5
Reviewed-on: https://code.wireshark.org/review/31525
Reviewed-by: Dario Lombardo <lomato@gmail.com>
8 months agoUpdates and bugfixes of ASTERIX I021
Atli Guðmundsson [Thu, 10 Jan 2019 20:55:08 +0000 (20:55 +0000)]
Updates and bugfixes of ASTERIX I021

I021 updates
- Added I021/RE.BPS
- Added I021/RE.SelH
- Added I021/RE.NAV
- Added I021/RE.GAO
- Added I021/RE.SGV
- Added I021/RE.STA
- Added I021/RE.MES
I021 bugfixes
- Fixed I021 Capitalisation inconsistencies
- Fixed I021/008.TC, incorrect mask
- Fixed I021/040, missing spare bits
- Fixed I021/074.TOMRP, incorrect type
- Fixed I021/076.TOMRV, incorrect type
- Fixed I021/090.SILS, incorrect name
- Fixed I021/110#2.TCP Number, incorrect name
- Fixed I021/110#2.TD, incorrect mask
- Fixed I021/146.Source, incorrect mask
- Fixed I021/160.GSPD, incorrect type
- Fixed I021/160.TA, incorrect type
- Fixed I021/165.TAR, incorrect number of bits
- Fixed I021/260.RAC, incorrect handling of 4 bits spanning 2 bytes
- Fixed I021/271, missing spare bits
I021 v2.1 bugfixes
- Fixed I021/040, missing spare bits
- Fixed I021/271, missing spare bits, incorrect field length
- Fixed I021/271.LW, incorrect mask

Change-Id: I10a7d94d76fed436e9d103dfd13c472e66d45831
Reviewed-on: https://code.wireshark.org/review/31481
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months ago[Automatic update for 2019-01-13]
Gerald Combs [Sun, 13 Jan 2019 08:31:58 +0000 (08:31 +0000)]
[Automatic update for 2019-01-13]

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

Change-Id: Ic7f6b5dd91ca6404909b941c0b4844cb17ef4820
Reviewed-on: https://code.wireshark.org/review/31522
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 months agoCMake: Don't go on about "custom files"
João Valverde [Sat, 12 Jan 2019 21:39:38 +0000 (21:39 +0000)]
CMake: Don't go on about "custom files"

For each call of add_custom_cmake_include() CMake prints
STATUS "No custom file found in <full_path>".

This is noisy, not to mention confusing.

Print output only if a custom include is found, be silent otherwise.

Change-Id: If603d206486354993ebac8e4c61f6876a26223d3
Reviewed-on: https://code.wireshark.org/review/31517
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agotools/gitlab-ci: add missing packages for rpm builds.
Dario Lombardo [Sat, 12 Jan 2019 17:29:09 +0000 (18:29 +0100)]
tools/gitlab-ci: add missing packages for rpm builds.

Change-Id: I04e3414ff27e18db8c83581116f4099bbb696a08
Reviewed-on: https://code.wireshark.org/review/31516
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoproto: ensure valid width through assert.
Dario Lombardo [Fri, 11 Jan 2019 11:24:46 +0000 (12:24 +0100)]
proto: ensure valid width through assert.

Found by scan-build.

Change-Id: I467e56bfa4f20f5c87efa47823d54691503de318
Reviewed-on: https://code.wireshark.org/review/31486
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoproto.h: fix indentation and add modeline.
Dario Lombardo [Fri, 11 Jan 2019 11:23:38 +0000 (12:23 +0100)]
proto.h: fix indentation and add modeline.

Change-Id: I1d1adb6456c4a80f2a157cb29dc19c63755ee3fd
Reviewed-on: https://code.wireshark.org/review/31485
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>
8 months agogitlab-ci: upgrade before anything else in fedora28.
Dario Lombardo [Sat, 12 Jan 2019 22:33:18 +0000 (23:33 +0100)]
gitlab-ci: upgrade before anything else in fedora28.

Fix a bug in linking:
/usr/lib/gcc/x86_64-redhat-linux/8/../../../../lib64/libgnutls.so: undefined reference to `nettle_rsa_sec_decrypt@HOGWEED_4'

Change-Id: Icc85813bd72274e448667bab4a80037ec5bdd48d
Reviewed-on: https://code.wireshark.org/review/31519
Reviewed-by: Dario Lombardo <lomato@gmail.com>
8 months agoftype: rework val_from_unparsed to avoid double free.
Dario Lombardo [Sat, 12 Jan 2019 21:58:28 +0000 (22:58 +0100)]
ftype: rework val_from_unparsed to avoid double free.

Found by scan-build.

Change-Id: I07e8bf2099e08f3f544dd846572717044aa95f7c
Reviewed-on: https://code.wireshark.org/review/31487
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 months agotravis: initial Windows support with non-interactive Qt installer
Peter Wu [Sun, 6 Jan 2019 22:41:59 +0000 (23:41 +0100)]
travis: initial Windows support with non-interactive Qt installer

The current preview release of Windows support on Travis lacks many
packages (like Qt and Python 3) and is very much tied to git-bash
(unlike AppVeyor which has a more native Windows experience).

Several workarounds were necessary, such as reimplementing refreshenv,
setting CMAKE_PROGRAM_PATH) and setting a supported language. See also
https://travis-ci.community/t/feedback-from-windows-integration-for-a-cmake-qt-c-python-perl-project/1706

I wrote the Qt installer script originally for Qt 5.6, ported it to Qt
5.9.5 and finally updated it for 5.12, some comments could be outdated.

Duration as measured for one x64 build:
- 3m00s - restore cache (Qt and wireshark-libs)
- 2m22s - choco install
- 0m8s - pip install
- 2m20s - cmake
- 18m5s - build all
- 0m20s - build test-programs
- 5m34s - pytest -v
- 2m46s - store cache (Qt and wireshark-libs)
- (total duration about 36m)
- (installing Qt 5.12.0 from scratch would add 7m)

Cache size for extracted x64 build: wireshark-libs is 187M, Qt 604M.
(179M and 516M for 32-bit respectively.)

Change-Id: I9881ab6439e9ca99efad16a6c861862ab9d35252
Reviewed-on: https://code.wireshark.org/review/31454
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 months agowiretap: remove dependency on version_info
Peter Wu [Sat, 12 Jan 2019 18:21:26 +0000 (19:21 +0100)]
wiretap: remove dependency on version_info

Avoid including the precise version string in the pcapng file that is
created for 3GPP TS 32.423 formats. This avoids unnecessarily relinking
of applications depending on wiretap.

Change-Id: Ida1f3c0c998d811cbf85734bd83438bcbfc39cf4
Reviewed-on: https://code.wireshark.org/review/31513
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoFix copy-and-pasteo.
Guy Harris [Sat, 12 Jan 2019 18:26:35 +0000 (10:26 -0800)]
Fix copy-and-pasteo.

Change-Id: Ib31602f79203a6bd3313b55ea9d83cf56933c171
Reviewed-on: https://code.wireshark.org/review/31514
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 months agoCMake: change static qtui library into an object library
Peter Wu [Sat, 12 Jan 2019 15:33:39 +0000 (16:33 +0100)]
CMake: change static qtui library into an object library

Save 800ms and avoids a synchronization point (improves build
parallelism) by directly adding object files to the wireshark binary.

Change-Id: I7d1484c65a26f3f6874474b61d38ba474aba8347
Reviewed-on: https://code.wireshark.org/review/31512
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>
8 months agoCMake: use object libraries to avoid redundant builds
Peter Wu [Sat, 12 Jan 2019 11:43:18 +0000 (12:43 +0100)]
CMake: use object libraries to avoid redundant builds

Some source files are duplicated via add_executable. Assuming that these
are not affected by target-specific preprocessor macros, they can be
built only once and shared among executables.

In one configuration, this reduces the number of object files by 55
(cli_main.c and version_info.c alone were built 15 times each).

Removes the version dependency from each target since the 'version_info'
target can now declare this dependency. Remove CLEAN_C_FILES from extcap
since it is not used to set -Werror. Due to removing some files from
wireshark_FILES (and others), these are no longer part of checkAPIs
though. Hopefully that is acceptable.

Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58
Reviewed-on: https://code.wireshark.org/review/31509
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 months agoCMake: Fix inconsistent find_package() report output
João Valverde [Fri, 11 Jan 2019 21:47:59 +0000 (21:47 +0000)]
CMake: Fix inconsistent find_package() report output

Most CMake find modules report the binary found, the modules
fixed by this change represent an inconsistent exception.

The first REQUIRED_VAR argument to
find_package_handle_standard_args() is the one used by CMake
to report on the result of find_package().

Compare (master)
  -- Found SNAPPY: /usr/include
to (this change)
  -- Found SNAPPY: /usr/lib/x86_64-linux-gnu/libsnappy.so

This convention of using XXX_LIBRARY matches upstream practice.

Change-Id: Iaa0ec644e963430d73722354f6ee2a3694906ba7
Reviewed-on: https://code.wireshark.org/review/31498
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 months agoCMake: Remove legacy workaround for GTK+Zlib
João Valverde [Sat, 12 Jan 2019 01:53:40 +0000 (01:53 +0000)]
CMake: Remove legacy workaround for GTK+Zlib

Right now only the GTK+ 2.24.23 and GnuTLS 3.4.11 packages in trunk contain
include/zconf.h, these are used by master-2.6 but not current master.

Change-Id: If4e0407c83432fa0780e0ac8a2e15b92dbca8f17
Reviewed-on: https://code.wireshark.org/review/31505
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Roland Knall <rknall@gmail.com>
8 months agoUse sentence case for the title, as we do for other documents.
Guy Harris [Sat, 12 Jan 2019 02:20:27 +0000 (18:20 -0800)]
Use sentence case for the title, as we do for other documents.

Change-Id: I72b1676bdc2af41031535e75189c0c15fdf7e551
Reviewed-on: https://code.wireshark.org/review/31506
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 months agoFix up the lists of binaries and man pages in dpkgs.
Guy Harris [Fri, 11 Jan 2019 22:43:46 +0000 (14:43 -0800)]
Fix up the lists of binaries and man pages in dpkgs.

Sort both lists; for the man pages, sort the extcap man pages after the
regular command-line tool man pages.

Add the captype and randpkt programs and man pages, and the udpdump man
page.

Change-Id: I0244013f8d08685d61ba70274185cb5539ff0545
Reviewed-on: https://code.wireshark.org/review/31503
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 months agoAdd captype and reordercap to the list of command-line binaries.
Guy Harris [Fri, 11 Jan 2019 22:31:01 +0000 (14:31 -0800)]
Add captype and reordercap to the list of command-line binaries.

Change-Id: I7e9460960b83d673727aca1783c03952622aabb5
Reviewed-on: https://code.wireshark.org/review/31500
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 months agoAdd randpkt to the Windows installers.
Guy Harris [Fri, 11 Jan 2019 21:13:48 +0000 (13:13 -0800)]
Add randpkt to the Windows installers.

Bug: 15395
Change-Id: Ic0c28b42a5e70edc5eb6441f71b6b614deae9d9f
Reviewed-on: https://code.wireshark.org/review/31497
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 months agoInclude the reordercap and dftest documentation in Windows packages.
Guy Harris [Fri, 11 Jan 2019 20:06:38 +0000 (12:06 -0800)]
Include the reordercap and dftest documentation in Windows packages.

We package the documentation for other programs we supply, so we should
package the documentation for them as well.

Change-Id: I37854631bad4aa799fb6ebb009bea3f4692fe530
Reviewed-on: https://code.wireshark.org/review/31492
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 months agoUnit tests for ASTERIX I048
Atli Guðmundsson [Sun, 6 Jan 2019 15:35:48 +0000 (15:35 +0000)]
Unit tests for ASTERIX I048

Change-Id: I0138681650dcabb01e08f3d25817b5fdd30f45e8
Reviewed-on: https://code.wireshark.org/review/31380
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 months agoquic: fix compilation without libgcrypt aead.
Dario Lombardo [Fri, 11 Jan 2019 15:44:29 +0000 (15:44 +0000)]
quic: fix compilation without libgcrypt aead.

When that version isn't available, we still need to have this
function available. Make it always available, then, with empty
implementation.

Change-Id: Ia827922c181676bbb2ba4a02dc09290b8cdb1a5c
Reviewed-on: https://code.wireshark.org/review/31491
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agomas5gs: Add dissection of IE 9.11.3.10 ABBA
Anders Broman [Fri, 11 Jan 2019 15:21:19 +0000 (16:21 +0100)]
mas5gs: Add dissection of IE 9.11.3.10 ABBA

Change-Id: Id1d0641bfbee94a62a6b7296dd7cc02680bdd5a6
Reviewed-on: https://code.wireshark.org/review/31490
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoF1AP: upgrade dissector to v15.4.0
Pascal Quantin [Fri, 11 Jan 2019 14:49:34 +0000 (15:49 +0100)]
F1AP: upgrade dissector to v15.4.0

Change-Id: I568a5f27c8be6b172856d908da6aa4f2782136d9
Reviewed-on: https://code.wireshark.org/review/31489
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 months agonettrace: Fix missing tag length for IPV4_DST.
Anders Broman [Fri, 11 Jan 2019 13:13:25 +0000 (14:13 +0100)]
nettrace: Fix missing tag length for IPV4_DST.

Change-Id: I00564adaef2922ff991887f0ee5c04a3c7307019
Reviewed-on: https://code.wireshark.org/review/31488
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoXnAP: upgrade dissector to v15.2.0
Pascal Quantin [Fri, 11 Jan 2019 11:16:01 +0000 (12:16 +0100)]
XnAP: upgrade dissector to v15.2.0

Change-Id: Ie26f8918aff20ade21eda611950795a320a417f2
Reviewed-on: https://code.wireshark.org/review/31483
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 months agodissectors: remove unused assignments.
Dario Lombardo [Fri, 11 Jan 2019 08:18:34 +0000 (09:18 +0100)]
dissectors: remove unused assignments.

Found by clang-scan.

Change-Id: I46d3be9032c8d34a76ecd844287c36aff733ea2d
Reviewed-on: https://code.wireshark.org/review/31482
Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 months agoQUIC: initial support for new header protection cipher (draft -17)
Peter Wu [Thu, 10 Jan 2019 21:25:42 +0000 (22:25 +0100)]
QUIC: initial support for new header protection cipher (draft -17)

The old packet number encryption method was replaced by a new header
protection mechanism which also encrypts some bits of the first byte.
Patch the old code to support this byte. Future patch should clean up
this messy code, but at least (Initial) packet decryption works now.

Bug: 13881
Change-Id: Ia0f40614c1084ba6f7fc597b8f6dc85845ea1fbd
Reviewed-on: https://code.wireshark.org/review/31480
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoMPLS Echo: Additional downstream mappings RFC8287
Uli Heilmeier [Thu, 10 Jan 2019 20:19:23 +0000 (21:19 +0100)]
MPLS Echo: Additional downstream mappings RFC8287

Add additonal protocols as defined in RFC8287 section 6

Bug: 15410
Change-Id: I2254cda6031c85d103b85f47604265d80a54f436
Reviewed-on: https://code.wireshark.org/review/31478
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoQUIC: update flag on long packet headers (draft-17)
Alexis La Goutte [Sun, 6 Jan 2019 10:13:19 +0000 (11:13 +0100)]
QUIC: update flag on long packet headers (draft-17)

Bug: 13881
Change-Id: I3e92ec8cba3482ab9d13f1102425a7b9ec7ccd76
Reviewed-on: https://code.wireshark.org/review/31407
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
8 months agodfilter: remove size() function.
Dario Lombardo [Wed, 9 Jan 2019 11:27:56 +0000 (12:27 +0100)]
dfilter: remove size() function.

It is overlapping to len(), then they've been merged into len()
that now gives the length of any field.

Change-Id: I8e39536a4d15eff4c4b44bb39fd965729cc46951
Reviewed-on: https://code.wireshark.org/review/31462
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
8 months agoCMake: try harder to find the right Python version
Peter Wu [Wed, 9 Jan 2019 18:34:57 +0000 (19:34 +0100)]
CMake: try harder to find the right Python version

The FindPythonInterp module does not verify that a discovered 'python'
program is actually Python 3. Replace this deprecated module by a modern
version that was introduced with CMake 3.12.

Remove PYTHON_EXECUTABLE from WSDG now that it is much more likely that
CMake discovers the right version.

Change-Id: I1f8438baced3d5bf9e1e2732980ad177d3257ca3
Reviewed-on: https://code.wireshark.org/review/31468
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoMove make-version.pl to tools.
Gerald Combs [Wed, 9 Jan 2019 22:47:02 +0000 (14:47 -0800)]
Move make-version.pl to tools.

Move make-version.pl to the tools directory.

Change-Id: I7c3ec8951a682d45d650e3fdb1580d90bf19e8b4
Reviewed-on: https://code.wireshark.org/review/31473
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>
8 months agoWSDG: Move README.packaging to the Developer's Guide.
Gerald Combs [Wed, 9 Jan 2019 23:48:55 +0000 (15:48 -0800)]
WSDG: Move README.packaging to the Developer's Guide.

Move doc/README.packaging to the Developer's Guide and update the
content.

Change-Id: I25fda6cade8f3cfd11af865745bedd0fb5a7c86f
Reviewed-on: https://code.wireshark.org/review/31474
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agodebian: Fixup symbols.
Gerald Combs [Thu, 10 Jan 2019 01:46:55 +0000 (17:46 -0800)]
debian: Fixup symbols.

Change-Id: I544220cdcc43b20b4f6b663e28039804cd6d3619
Reviewed-on: https://code.wireshark.org/review/31475
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 months agoClarify the name and description for a link-layer encapsulation type.
Guy Harris [Wed, 9 Jan 2019 21:21:10 +0000 (13:21 -0800)]
Clarify the name and description for a link-layer encapsulation type.

What we were calling the "name" is actually a description to show to
users; what were calling the "short name" is just the name to use on the
command line.

Rename some routines and structure members, and put the name first and
description second in the table.

Expand some descriptions to give more details (e.g., to be more than
just a capitalized version of the name).

Fix the CamelCase capitalization of InfiniBand.

Change-Id: I060b8bd86573880efd0fab044401b449469563eb
Reviewed-on: https://code.wireshark.org/review/31472
Reviewed-by: Guy Harris <guy@alum.mit.edu>
8 months agoE1AP: upgrade dissector to v15.2.0
Pascal Quantin [Wed, 9 Jan 2019 19:36:02 +0000 (20:36 +0100)]
E1AP: upgrade dissector to v15.2.0

Change-Id: Ieafe6558e54a04ce7004c4005f646cea88ac9e5d
Reviewed-on: https://code.wireshark.org/review/31469
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 months agoNGAP: use extended value_string for CauseRadioNetwork
Pascal Quantin [Wed, 9 Jan 2019 19:39:28 +0000 (20:39 +0100)]
NGAP: use extended value_string for CauseRadioNetwork

Change-Id: Ie32c8c63e26a31c1fd76cf8f1e7d6ef9103c5960
Reviewed-on: https://code.wireshark.org/review/31470
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 months agoNGAP: upgrade dissector to v15.2.0
Pascal Quantin [Wed, 9 Jan 2019 11:40:01 +0000 (12:40 +0100)]
NGAP: upgrade dissector to v15.2.0

Change-Id: Id050878d8d18fda321304ce5dd2d7842e66cfa93
Reviewed-on: https://code.wireshark.org/review/31463
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 months agozbee: zbee_zdp.profile wrong data type
Dana Sy [Tue, 8 Jan 2019 19:56:56 +0000 (11:56 -0800)]
zbee: zbee_zdp.profile wrong data type

Fixed the data type for zbee_zdp.profile to use the proper data type
of UINT16.

Change-Id: I20bac57ec3a0a7261aeb65333d9dd4b5bdb4a85c
Reviewed-on: https://code.wireshark.org/review/31458
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agordp: add parsing MONITOR_DEF fields [1]
Mariusz Zaborski [Sat, 5 Jan 2019 19:19:29 +0000 (20:19 +0100)]
rdp: add parsing MONITOR_DEF fields [1]

[1] https://msdn.microsoft.com/en-us/library/dd342324.aspx

Change-Id: I671ebdd5900a0cd409159388e2f72e6e5fbfd6a2
Reviewed-on: https://code.wireshark.org/review/31390
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agodissectors: j1939: Use raw id to filter packets
Maksim Salau [Tue, 8 Jan 2019 17:35:00 +0000 (20:35 +0300)]
dissectors: j1939: Use raw id to filter packets

Using raw CAN id allows us to drop error frames and frames with
standard ids since J1939 work only with extended ids.
Also if allows us to not to decode payload of RTR frames.

Change-Id: I06cec52176be79028f9ac5bce2017907c06aacfb
Reviewed-on: https://code.wireshark.org/review/31449
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoAdd validate-clang-check script for Petri Dish
Alexis La Goutte [Fri, 2 Nov 2018 10:31:12 +0000 (10:31 +0000)]
Add validate-clang-check script for Petri Dish

Launch clang-check -analyze for each file...

Change-Id: Ic4132d563ccaa5d375f27d08366ba6fc052f095c
Reviewed-on: https://code.wireshark.org/review/30482
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 months agodissectors: socketcan: Pass raw ids to dissectors
Maksim Salau [Tue, 8 Jan 2019 16:49:26 +0000 (19:49 +0300)]
dissectors: socketcan: Pass raw ids to dissectors

In the current implementation only masked id is provided to
subdissectors, which doesn't allow to filter packets effectively.
E.g.: J1939 should dissect only extended frames. Without EFF flag, the
subdissector is unable to filter out frames with 11-bit ids.
Also J1939 tries to dissect pyaload of RTR of ERR frames, which obviously
doesn't make sense.

The change exports raw id alongside the masked one for backwards
compatibility. Once all the CAN dissectors are updated to use the raw
variant (if necessary) the masked variant may be dropped.

Change-Id: I52df5673ecfd53d2e65790c4187ea129e67a88e9
Reviewed-on: https://code.wireshark.org/review/31448
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoQt: Cleanup deletion of CopyFromProfileMenu
Stig Bjørlykke [Tue, 8 Jan 2019 16:48:21 +0000 (17:48 +0100)]
Qt: Cleanup deletion of CopyFromProfileMenu

Set the push button as parent to the profile list menu so it will
be deleted when that parent is destroyed.

Change-Id: Ide4a234e039a3e27d9ee4732a3800906c80be173
Reviewed-on: https://code.wireshark.org/review/31446
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agovalgrind-wireshark: default to looking in run/ for our binaries.
Jeff Morriss [Tue, 8 Jan 2019 20:24:11 +0000 (15:24 -0500)]
valgrind-wireshark: default to looking in run/ for our binaries.

If33a39c26714ebe699463d1c8c67469025767efb made this change for the other
scripts.

Change-Id: I158c1c2d0b564a115443e96a6d90733c2ffff071
Reviewed-on: https://code.wireshark.org/review/31459
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoCMake: remove LocatePythonExecutable.cmake for Windows
Peter Wu [Tue, 8 Jan 2019 18:24:38 +0000 (19:24 +0100)]
CMake: remove LocatePythonExecutable.cmake for Windows

Cygwin is now unsupported, so remove special handling for it and rely on
FindPythonInterp.cmake to locate an appropriate version.

This patch can only cause issues if the PATH environment variable
contains the Cygwin binary directory without any native Python version
appearing before that. In that case, either remove Cygwin from PATH or
add the native Python (e.g. C:\Python37) earlier in PATH.

Change-Id: Ia5554e5a83d06a941dacf4a28d41d84fca4fe99d
Reviewed-on: https://code.wireshark.org/review/31453
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
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>
8 months agoCMake,WSDG: Remove Cygwin support
Peter Wu [Tue, 8 Jan 2019 18:12:43 +0000 (19:12 +0100)]
CMake,WSDG: Remove Cygwin support

Declare Cygwin as unsupported and remove all supporting code. Simplify
some Chocolatey notes in the WSDG.

Remove FindPerl.cmake as it only existed to force use of Wireshark's
bundled FindCygwin.cmake (bug 13922). FindXSLTPROC.cmake special
handling for Cygwin was also removed, in theory this could cause issues
when the PATH contains a Cygwin xsltproc, but it's unsupported anyway.

Change-Id: Iabfac2b4a9fd930530505d27bdba618bdb8f7f34
Reviewed-on: https://code.wireshark.org/review/31452
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agodissectors: socketcan: Fix indentation
Maksim Salau [Tue, 8 Jan 2019 16:43:28 +0000 (19:43 +0300)]
dissectors: socketcan: Fix indentation

Change-Id: I4b9023a812e7f24a8980abe871f7fa28f60cefec
Reviewed-on: https://code.wireshark.org/review/31447
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
8 months agoQt: Fix copy ASCII characters from ByteView
Stig Bjørlykke [Tue, 8 Jan 2019 09:48:07 +0000 (10:48 +0100)]
Qt: Fix copy ASCII characters from ByteView

Only copy ASCII characters when doing "Copy Bytes as Hex + ASCII Dump"
from the ByteView. This is what we do in all other Hex Dumps.

Also change the parameter name to reflect this.

Change-Id: I63cc79ffa014fd9aa50c84d765ee168f0b1ea44a
Reviewed-on: https://code.wireshark.org/review/31442
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
8 months agomas5gs: Fix dissection of QoS flow descriptions and QoS rules.
Anders Broman [Tue, 8 Jan 2019 13:37:59 +0000 (14:37 +0100)]
mas5gs: Fix dissection of QoS flow descriptions and QoS rules.

Change-Id: Ie4b9fcf0afdea19ba6f2fb531e84096ac103c99b
Reviewed-on: https://code.wireshark.org/review/31443
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoS1AP: upgrade dissector to v15.4.0
Pascal Quantin [Tue, 8 Jan 2019 14:07:32 +0000 (15:07 +0100)]
S1AP: upgrade dissector to v15.4.0

Change-Id: Iecf02ce3858cd2cea12bc73e402ace0c558d8abc
Reviewed-on: https://code.wireshark.org/review/31444
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
8 months agoQt: Pluralize "Export TLS Session Keys (%Ln key(s))"
Stig Bjørlykke [Mon, 7 Jan 2019 08:19:29 +0000 (09:19 +0100)]
Qt: Pluralize "Export TLS Session Keys (%Ln key(s))"

Properly pluralize "Export TLS Session Keys (%Ln key(s))" in the
window caption.

Change-Id: Ida7d725a2b8daa356cb44aec4d4475151916a425
Reviewed-on: https://code.wireshark.org/review/31432
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
8 months agoQt: Add syntax line edit feedback symbols.
Gerald Combs [Wed, 5 Dec 2018 23:37:27 +0000 (15:37 -0800)]
Qt: Add syntax line edit feedback symbols.

Draw a circle+backslash or a warning triangle in the far right of the
line edit entry for invalid and deprecated filters respectively. This
should provide an additional clue for color blind users.

Bug: 15326
Change-Id: I55a1e214834a340ccda3bfe8880bba12c5e274e9
Reviewed-on: https://code.wireshark.org/review/30936
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>
8 months agoCIP Safety: Correct Safety Configuration ID
Dylan Ulis [Tue, 8 Jan 2019 01:52:23 +0000 (20:52 -0500)]
CIP Safety: Correct Safety Configuration ID

This was previously being parsed as a UNID, which is not correct.

Change-Id: I2f9fc17debf3ce60d35d71a28bd1d19f54a1b982
Reviewed-on: https://code.wireshark.org/review/31441
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
8 months agoNTP: don't increment offsets that aren't used again.
Jeff Morriss [Mon, 7 Jan 2019 21:27:35 +0000 (16:27 -0500)]
NTP: don't increment offsets that aren't used again.

This avoids warnings from Clang.  Rewriting this to use the cursor API might
be interesting.

Change-Id: I8a5459ffbee8d0907757e99eff273d7eff6d1735
Reviewed-on: https://code.wireshark.org/review/31436
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>