metze/wireshark/wip.git
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 months agotravis: do not run pip as root
Peter Wu [Mon, 7 Jan 2019 17:21:33 +0000 (18:21 +0100)]
travis: do not run pip as root

Both Ubuntu and macOS seems happy without it, removing sudo allows it to
be executed on Windows as well.

Change-Id: I9daece79d3bc5c97078ba27834de42228f7c3dc9
Reviewed-on: https://code.wireshark.org/review/31434
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agoQt: Clarify Remove action from the welcome page
Stig Bjørlykke [Mon, 7 Jan 2019 13:21:45 +0000 (14:21 +0100)]
Qt: Clarify Remove action from the welcome page

Rename the Remove action in the welcome page to "Remove from list" to
indicate that the file is only removed from the list, not from disk.

Change-Id: I4a47c9852203596cc601bf254a4bcfc700ccd025
Reviewed-on: https://code.wireshark.org/review/31433
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
11 months agoieee1609dot2: remove unused handoff function
Alexis La Goutte [Sun, 6 Jan 2019 19:48:02 +0000 (20:48 +0100)]
ieee1609dot2: remove unused handoff function

Change-Id: I9c3a6098e2a54d281228689cdbbbbf78604b2750
Reviewed-on: https://code.wireshark.org/review/31422
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
11 months agocesoeth: declare register and handoff function
Alexis La Goutte [Sun, 6 Jan 2019 15:17:04 +0000 (16:17 +0100)]
cesoeth: declare register and handoff function

for avoid -Wmissing-prototypes warning

Change-Id: I92edf8d62c3685033c4424f9af16d4094c6599d6
Reviewed-on: https://code.wireshark.org/review/31421
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
11 months agows_pipe(.h): fix issue on doxygen documentation
Alexis La Goutte [Sun, 6 Jan 2019 19:50:43 +0000 (20:50 +0100)]
ws_pipe(.h): fix issue on doxygen documentation

parameter 'argv' not found in the function declaration [-Wdocumentation]

Change-Id: I68262a23e3a6f4b50d8b5e666b92f055feeaf74f
Reviewed-on: https://code.wireshark.org/review/31424
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
11 months agoepan: Add a boundary check to get_t61_string.
Gerald Combs [Mon, 7 Jan 2019 22:41:29 +0000 (14:41 -0800)]
epan: Add a boundary check to get_t61_string.

Add a boundary check to make sure we don't go past the end of "ptr".

Bug: 15373
Change-Id: I85394e8e6e477b47919362af146051cc8911254b
Reviewed-on: https://code.wireshark.org/review/31437
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
11 months agostr_util(.h): fix issue on doxygen documentation
Alexis La Goutte [Sun, 6 Jan 2019 19:49:32 +0000 (20:49 +0100)]
str_util(.h): fix issue on doxygen documentation

parameter 'string' not found in the function declaration [-Wdocumentation]

Change-Id: I8c6fe47e708411e329954a682ea4da10aad348f6
Reviewed-on: https://code.wireshark.org/review/31423
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
11 months agof5ethtrailer: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 6 Jan 2019 14:42:35 +0000 (14:42 +0000)]
f5ethtrailer: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ie8f1a4a4a11370ff5d5d85f8110aec568f88877e
Reviewed-on: https://code.wireshark.org/review/31410
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
11 months agosharkd: use json_dumper for output.
Dario Lombardo [Wed, 12 Dec 2018 14:33:44 +0000 (15:33 +0100)]
sharkd: use json_dumper for output.

Change-Id: I457613ea154a86098f536b57844ad6606c595a46
Reviewed-on: https://code.wireshark.org/review/31035
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
11 months agoMinor bugfix of ASTERIX I023
Atli Guðmundsson [Sun, 6 Jan 2019 23:46:04 +0000 (23:46 +0000)]
Minor bugfix of ASTERIX I023

I023 bugfixes
- Fixed I023 Capitalisation inconsistencies

Change-Id: I39eccd0b7c3a68a8b74d68cf16b988bacce92924
Reviewed-on: https://code.wireshark.org/review/31429
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agoCIP: Correct DATE_AND_TIME parsing
Dylan Ulis [Mon, 7 Jan 2019 00:31:31 +0000 (19:31 -0500)]
CIP: Correct DATE_AND_TIME parsing

DATE_AND_TIME struct is actually time then date. We were previously
parsing it as date then time.

Change-Id: I7367b5502318de32b7c9e7fd170ae58de4c3347f
Reviewed-on: https://code.wireshark.org/review/31431
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agodfilter: remove legacy comment.
Dario Lombardo [Sun, 6 Jan 2019 20:48:06 +0000 (21:48 +0100)]
dfilter: remove legacy comment.

Change-Id: Iec4ea07e86907e9c52b2b58a3e7d8f4a75e747ef
Reviewed-on: https://code.wireshark.org/review/31426
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agoFix whitespace.
Guy Harris [Sun, 6 Jan 2019 19:44:13 +0000 (11:44 -0800)]
Fix whitespace.

Change-Id: I87e441d3a00c00d4ec7dff5717899408a8e7ab3a
Reviewed-on: https://code.wireshark.org/review/31420
Reviewed-by: Guy Harris <guy@alum.mit.edu>
11 months agoRequire that dissect_atm_pw_oam_cell() be called with a non-null data pointer.
Guy Harris [Sun, 6 Jan 2019 19:42:56 +0000 (11:42 -0800)]
Require that dissect_atm_pw_oam_cell() be called with a non-null data pointer.

The only place where it's currently called passes it data.

Do a DISSECTOR_ASSERT() check to make sure it's non-null.

Remove null-pointer checks that this renders no longer necessary.

Change-Id: I2fc86f9591a7126d328029379ecfe98400dd01cb
Reviewed-on: https://code.wireshark.org/review/31419
Reviewed-by: Guy Harris <guy@alum.mit.edu>
11 months agocdma2k: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 6 Jan 2019 14:40:51 +0000 (14:40 +0000)]
cdma2k: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ied58cd7f969121aa51579fdd0919fdfe33e552e3
Reviewed-on: https://code.wireshark.org/review/31409
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agonettrace_3gpp_32_423: Fix Dead Store (Dead assignement/Dead increment) Warning found...
Alexis La Goutte [Sun, 6 Jan 2019 14:47:06 +0000 (14:47 +0000)]
nettrace_3gpp_32_423: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I9f59b5ae6fe34d124b6930fa759c7c76c38aa213
Reviewed-on: https://code.wireshark.org/review/31412
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agoNo need to check whether atm_info is null in that code path.
Guy Harris [Sun, 6 Jan 2019 19:05:54 +0000 (11:05 -0800)]
No need to check whether atm_info is null in that code path.

All exported (via dissector tables and dissector handles) routines that
call dissect_atm_common() first do DISSECTOR_ASSERT(atm_info != NULL),
so dissect_atm_common() will never be called iwth a null data pointer.
dissect_reassembled_pdu() is called only from dissect_atm_common(), so
it also won't ever be called with a non-null data pointer.

Fixes Coverity CID 1442299.

Change-Id: I3b455ac546a6a0cd6aa8ef184c71fda2ca2a0710
Reviewed-on: https://code.wireshark.org/review/31418
Reviewed-by: Guy Harris <guy@alum.mit.edu>
11 months agopgsql: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 6 Jan 2019 14:47:56 +0000 (14:47 +0000)]
pgsql: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Iddbc5257108c7e77eff5e43f0421a688709680f3
Reviewed-on: https://code.wireshark.org/review/31413
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
11 months agoISIS(-lsp): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 6 Jan 2019 15:02:30 +0000 (15:02 +0000)]
ISIS(-lsp): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ic9851860e4b6e2f55efa5de6553c71ed84012c55
Reviewed-on: https://code.wireshark.org/review/31415
Reviewed-by: Taisuke Sasaki <taisasak@cisco.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
11 months agoH2Operations: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 6 Jan 2019 14:34:13 +0000 (14:34 +0000)]
H2Operations: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I9913b9653fedeb9cc119f10632f4c96fe54027b4
Reviewed-on: https://code.wireshark.org/review/31408
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
11 months agofpp: fix this condition has identical branches [-Wduplicated-branches]
Alexis La Goutte [Tue, 1 Jan 2019 17:54:43 +0000 (17:54 +0000)]
fpp: fix this condition has identical branches [-Wduplicated-branches]

Change-Id: I09e9a2ee8a89e4784057eb50e47022a7d1e74943
Reviewed-on: https://code.wireshark.org/review/31291
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
11 months agosmpp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 6 Jan 2019 14:48:47 +0000 (14:48 +0000)]
smpp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ifbe72c48ec401582d2df30b440e449398c71eb40
Reviewed-on: https://code.wireshark.org/review/31414
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
11 months agoNAS 5Gs: PDU session establishment reject msg fix
Swapnil Roy [Sat, 5 Jan 2019 06:04:15 +0000 (11:34 +0530)]
NAS 5Gs: PDU session establishment reject msg fix

Change-Id: Ic9774cc09ab5c7582dc85bf41e4021bddfca1ebe
Reviewed-on: https://code.wireshark.org/review/31382
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
11 months agoUpdates and bugfixes of ASTERIX I048
Atli Guðmundsson [Wed, 2 Jan 2019 20:57:57 +0000 (20:57 +0000)]
Updates and bugfixes of ASTERIX I048

I048 v1.23 updates (now the default)
- Added I048/020.ERR
- Updated I048/170.CDM value meaning
I048 v1.21 updates
- Added I048/020.XPP
- Updated I048/030.WE with new value codes (19-23)
I048 updates
- Added I048/RE.MD5, Mode 5 Reports
- Added I048/RE.M5N, Mode 5 Reports, New Format
- Added I048/RE.M4E, Extended Mode 4 Report
- Added I048/RE.RPC, Radar Plot Characteristics
- Added I048/RE.ERR, Extended Range Report
I048 bugfixes
- Fixed I048 Capitalisation and spelling inconsistencies
- Fixed I048/030, now displays up to 10 Warning/Error codes
- Fixed I048/100, fixed order and invalid masks of all sub-fields
- Fixed I048/120#0.CAL, incorrect type, missing mask
- Fixed I048/120#1.DOP, incorrect type
- Fixed I048/120#1.AMB, incorrect type
- Fixed I048/120#1.FRQ, incorrect type
- Fixed I048/260.ACAS, not displaying anything, incorrect type

Change-Id: I5d742fded258e3831392cb6f1e1d9d3eafd6e938
Reviewed-on: https://code.wireshark.org/review/31379
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agoUnit tests for ASTERIX I034
Atli Guðmundsson [Sun, 6 Jan 2019 04:29:17 +0000 (04:29 +0000)]
Unit tests for ASTERIX I034

Change-Id: I7a063fdbc08a79c0358857d1e38ded41ae122b23
Reviewed-on: https://code.wireshark.org/review/31399
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agoBugfixes of ASTERIX I034
Atli Guðmundsson [Sun, 6 Jan 2019 04:15:57 +0000 (04:15 +0000)]
Bugfixes of ASTERIX I034

I034 bugfixes
- Fixed I034 Capitalisation inconsistencies
- Fixed I034/041.ARS, incorrect name
- Fixed I034/060#2.RED-RAD, incorrect name
- Fixed I034/060#2.STC, incorrect mask
- Fixes I034/060#3.RED-RAD, incorrect name
- Fixes I034/060#4.RED-RAD, incorrect name
- Fixed I034/110.TYP, incorrect name

Change-Id: I9a78a08ecfd34044030e36c9050fd7b848b80051
Reviewed-on: https://code.wireshark.org/review/31398
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months ago[Automatic update for 2019-01-06]
Gerald Combs [Sun, 6 Jan 2019 08:26:28 +0000 (08:26 +0000)]
[Automatic update for 2019-01-06]

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

Change-Id: I0e282baebc0cda0e54e49eff60827eec02f6f797
Reviewed-on: https://code.wireshark.org/review/31402
Reviewed-by: Gerald Combs <gerald@wireshark.org>
11 months agoFix typo.
Guy Harris [Sun, 6 Jan 2019 07:15:00 +0000 (23:15 -0800)]
Fix typo.

Change-Id: I03291922ddef34ab1408684df650dbac191a2020
Reviewed-on: https://code.wireshark.org/review/31401
Reviewed-by: Guy Harris <guy@alum.mit.edu>
11 months agoFix link, don't put it separately from the introductory words.
Guy Harris [Sun, 6 Jan 2019 07:09:52 +0000 (23:09 -0800)]
Fix link, don't put it separately from the introductory words.

Change-Id: If144fb08d27886ae1bf3610c2157c8a25d1de75e
Reviewed-on: https://code.wireshark.org/review/31400
Reviewed-by: Guy Harris <guy@alum.mit.edu>
11 months agoReplace ancient notes about modifying libpcap with a link to a newer doc.
Guy Harris [Sun, 6 Jan 2019 03:06:10 +0000 (19:06 -0800)]
Replace ancient notes about modifying libpcap with a link to a newer doc.

Instead of giving horribly out-of-date instructions on how to add a new
module to libpcap, just point to the document that I started whipping up
earlier today (it definitely needs work - it's incomplete - but I'll be
getting back to it).

While we're at it, update the notes on adding support for new LINKTYPE_
values to libwiretap, and note that it's only necessary if you had to
add a new DLT_ *and* there isn't already a WTAP_ENCAP_ value that would
correspond to that DLT_.

Change-Id: I3882d0a57b29e98f73c074317bc6df7458fcc677
Reviewed-on: https://code.wireshark.org/review/31397
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
11 months agoAdd a coloring rule for system events.
Gerald Combs [Fri, 4 Jan 2019 17:08:37 +0000 (09:08 -0800)]
Add a coloring rule for system events.

Add a coloring rule for sdjournal and sysdig events.

Change-Id: I92f0bea238a9f0242d4790c58867144f0e256097
Reviewed-on: https://code.wireshark.org/review/31369
Reviewed-by: Michael Mann <mmann78@netscape.net>
11 months agodoc: remove wrong trailing slash.
Dario Lombardo [Sat, 5 Jan 2019 22:22:50 +0000 (23:22 +0100)]
doc: remove wrong trailing slash.

Change-Id: If6bcf2ce9754453cfff434dde67b682761b37231
Reviewed-on: https://code.wireshark.org/review/31394
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
11 months ago ATM: add new dissector table
Andrii Vladyka [Sat, 5 Jan 2019 18:26:01 +0000 (10:26 -0800)]
 ATM: add new dissector table

 The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination

Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96
Reviewed-on: https://code.wireshark.org/review/31381
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
11 months agoRemove comment whose meaning is unclear at best.
Guy Harris [Sat, 5 Jan 2019 21:35:08 +0000 (13:35 -0800)]
Remove comment whose meaning is unclear at best.

What is is it saying we shouldn't be doing?

Change-Id: Iad26687f3f3f482af09760255fef7189ed71a3ae
Reviewed-on: https://code.wireshark.org/review/31391
Reviewed-by: Guy Harris <guy@alum.mit.edu>
11 months agotravis: remove asciidoctor
Peter Wu [Sat, 5 Jan 2019 11:41:55 +0000 (12:41 +0100)]
travis: remove asciidoctor

It is already installed in debian-setup.sh. brew setup does not install
it, but as no documentation is built it should not matter.

Change-Id: I0cfa343d1c837ebba3b020a6586fb4dd0ae57f9b
Reviewed-on: https://code.wireshark.org/review/31387
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agotravis: remove obsolete sudo key
Peter Wu [Sat, 5 Jan 2019 11:29:46 +0000 (12:29 +0100)]
travis: remove obsolete sudo key

Container-based builds have been removed, sudo is always available now:
https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration

Change-Id: Id7cbcf0e406f4c7199f5fd7a3848023e78249a92
Reviewed-on: https://code.wireshark.org/review/31386
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agoNTP: Adding missing commands of ntpdc mode 7
Uli Heilmeier [Sat, 5 Jan 2019 07:48:00 +0000 (08:48 +0100)]
NTP: Adding missing commands of ntpdc mode 7

Used documentation of bug report.

Bug: 15272
Change-Id: I83871b7458c36df711502bc6aa954a8c3c53604d
Reviewed-on: https://code.wireshark.org/review/31385
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agordp: Parse the CS_MONITOR flags.
Mariusz Zaborski [Sat, 5 Jan 2019 19:17:14 +0000 (20:17 +0100)]
rdp: Parse the CS_MONITOR flags.

The CS_MONITOR package have also a flags fields wich is not used. [1]
This fix parsing the CS_MONITOR package.

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

Change-Id: I99eea5abe95d4654aed8dc0d0e137c845aaba3aa
Reviewed-on: https://code.wireshark.org/review/31389
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agoPass a structure including an atm_phdr to dissect_atm_pw_oam_cell().
Guy Harris [Sat, 5 Jan 2019 07:39:38 +0000 (23:39 -0800)]
Pass a structure including an atm_phdr to dissect_atm_pw_oam_cell().

This will allow the VPI and VCI to be handed to
dissect_atm_cell_payload() in
https://code.wireshark.org/review/c/31381/.

That structure also needs to include the enable_fill_columns_by_atm_dissector
flag; we remove that from the pwatm_private_data_t, which is now private
to the ATM pseudo-wire dissector, and put it in the new structure.

Change-Id: I88f4a9f4b3c4c1c94914311bb883ea38e10ca4b4
Reviewed-on: https://code.wireshark.org/review/31384
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
11 months agoWSDG: update testing section to cover use of pytest
Peter Wu [Thu, 3 Jan 2019 23:36:41 +0000 (00:36 +0100)]
WSDG: update testing section to cover use of pytest

Remove traces of the "config" module, it was removed. Add a new section
on using pytest.

Change-Id: I763fc53359157f5fcb04198ed98e2d7f7a2c7220
Reviewed-on: https://code.wireshark.org/review/31372
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agotest: enable parallelism by default for pytest
Peter Wu [Fri, 4 Jan 2019 18:47:53 +0000 (19:47 +0100)]
test: enable parallelism by default for pytest

Consistent with tools like "ninja", enable parallelism by default. It
can be disabled again with `pytest -n0`.

This makes pytest-xdist a dependency when pytest is used as test runner.
This does not affect the unittest-based test runnet (test/test.py).

Change-Id: I4dc905f097c57a869aa39487b15361502b431616
Reviewed-on: https://code.wireshark.org/review/31371
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agopytest.ini: declare minimum version requirement
Peter Wu [Fri, 4 Jan 2019 19:06:45 +0000 (20:06 +0100)]
pytest.ini: declare minimum version requirement

pytest 3.0.0 (2016-08-18) or newer is required due to the use of the
yield keyword in fixtures and the use of getfixturevalue. Do not bother
supporting older versions, install newer versions via pip instead.

Change-Id: I35ae787e2abcc706c19251d29a7d5b8513079c15
Reviewed-on: https://code.wireshark.org/review/31373
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agotest: allow running pytest without specifying the tests directory
Peter Wu [Thu, 3 Jan 2019 22:43:56 +0000 (23:43 +0100)]
test: allow running pytest without specifying the tests directory

This allows `pytest` to be executed from the top-level source or build
directory (or any other directory below).

Change-Id: Ib7af2ea2aaf01319d6839d2dc67228fbb5a7bc34
Reviewed-on: https://code.wireshark.org/review/31370
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
11 months agomaxmind_db: Close our pipe FDs inside a lock.
Gerald Combs [Fri, 4 Jan 2019 21:24:10 +0000 (13:24 -0800)]
maxmind_db: Close our pipe FDs inside a lock.

Lock our pipe mutex before closing its file descriptors. This should
hopefully fix some infrequent crashes that I'm seeing on my Windows 7 VM.

Add a note about GRWLock behavior on Windows which doesn't appear to be
related to this issue, but which is nevertheless important.

Ping-Bug: 14701
Change-Id: I32e66a24258264fa65a907f319755594f90c0177
Reviewed-on: https://code.wireshark.org/review/31375
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>
11 months agoadd encoding windows 1251, cp855, cp866
kanidef [Thu, 3 Jan 2019 07:07:02 +0000 (10:07 +0300)]
add encoding windows 1251, cp855, cp866

Change-Id: I0e8507cf63d89942167ca579ef304bc3d679346e
Reviewed-on: https://code.wireshark.org/review/31316
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>