metze/wireshark/wip.git
13 months agoCRC6: Fixed CRC lookup table and functions
Ross [Thu, 3 Jan 2019 22:19:59 +0000 (14:19 -0800)]
CRC6: Fixed CRC lookup table and functions

* Generated code and 256-element lookup table with pycrc
* Combined 2 crc6 functions which both have same poly 0x6f and lookup table
* Using the example file from the bug report,

    $ tshark -r ~/Downloads/M1_header_crc.pcapng -V | grep "Calculated CRC"
    1101 00.. = Header CRC: 0x34 [Calculated CRC 0x34]

Header and Calculated CRC are now both 0x34 (correct value)

* pycrc settings for generation:
    $ python pycrc.py --reflect-in False \
                      --reflect-out False \
                      --xor-in 0 \
                      --xor-out 0 \
                      --algorithm table-driven
                      --width 6 \
                      --poly 0x2f

* To manually check 3GPP protocol header CRCs, use above command with flag

    --check-hexstring=<HEADER HEX>

Bug: 14875
Change-Id: I283f52fcae10b2f92f107df6988629d49d692428
Reviewed-on: https://code.wireshark.org/review/31356
Reviewed-by: Ross Jacobs <rossbjacobs@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoepan: remove return from functions returning void.
Dario Lombardo [Thu, 3 Jan 2019 16:45:02 +0000 (17:45 +0100)]
epan: remove return from functions returning void.

Found by clang-tidy.

Change-Id: Ibedfec5e5d3eca7c2e65319b7ecb4dcbe974b88b
Reviewed-on: https://code.wireshark.org/review/31337
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoWSDG: Add a note about Npcap licensing.
Gerald Combs [Thu, 3 Jan 2019 22:05:27 +0000 (14:05 -0800)]
WSDG: Add a note about Npcap licensing.

Expand the Npcap text. Make it clear that you might need to purchase a
license to redistribute Npcap.

Change-Id: I9340ed2d363e66443797478c59859ce10d648aff
Reviewed-on: https://code.wireshark.org/review/31351
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>
13 months agoWSDG: Stop recommending DDD.
Gerald Combs [Thu, 3 Jan 2019 22:21:59 +0000 (14:21 -0800)]
WSDG: Stop recommending DDD.

Drop mentions of DDD in favor of Qt Creator, CLion, and Eclipse. From
looking at https://sourceware.org/gdb/wiki/GDB%20Front%20Ends I'm
guessing that those have superseded DDD, as nice at it is/was.

Change-Id: I445a909ab8c8aa73c90f868d6b0958bb8faf62d6
Reviewed-on: https://code.wireshark.org/review/31353
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>
13 months agotest/dissectorstest: assert that text2pcap and tshark runs
Peter Wu [Thu, 3 Jan 2019 21:58:28 +0000 (22:58 +0100)]
test/dissectorstest: assert that text2pcap and tshark runs

Fail early if these commands fail.

Change-Id: I6ba6cfa4b0b68c7282b79204b4f2bfedfefa4326
Reviewed-on: https://code.wireshark.org/review/31352
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agotest: split SubprocessTestCase.run into setUp/tearDown
Peter Wu [Thu, 3 Jan 2019 18:07:40 +0000 (19:07 +0100)]
test: split SubprocessTestCase.run into setUp/tearDown

The run method is not invoked when running in debug mode (for example,
with `pytest --pdb`) and would result in spurious errors due to "log_fd"
being None. Split the method to resolve this incompatibility.

Note that with `pytest --pdb`, the tearDown method is not called when
exceptions occur, see https://docs.pytest.org/en/latest/unittest.html

Change-Id: I4b66c03d5b050b53311ec64021fe17dc91bb48dd
Reviewed-on: https://code.wireshark.org/review/31339
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoRemove a no-longer-needed DIAG_OFF/DIAG_ON pair.
Guy Harris [Thu, 3 Jan 2019 23:43:30 +0000 (15:43 -0800)]
Remove a no-longer-needed DIAG_OFF/DIAG_ON pair.

If you're not casting anything, you're not casting away qualifiers, so
there's no need to disable warnings about casting away constness.

Change-Id: Ib6bb75a8683ce129078a09df385159c13d2cf306
Reviewed-on: https://code.wireshark.org/review/31355
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agodoc/README.display_filter: Fix typo: asser -> assert
Jim Young [Thu, 3 Jan 2019 23:36:04 +0000 (18:36 -0500)]
doc/README.display_filter: Fix typo: asser -> assert

Change-Id: If49baf3e2b4e01f4ca4ea85415a3a291f8c04c92
Reviewed-on: https://code.wireshark.org/review/31354
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
13 months agoepan: remove redundant casts.
Dario Lombardo [Thu, 3 Jan 2019 16:53:42 +0000 (17:53 +0100)]
epan: remove redundant casts.

Found by clang-tidy.

Change-Id: Iaf6cf84c33b03ddfcd39a333b49f4987002afa56
Reviewed-on: https://code.wireshark.org/review/31338
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agofile: remove redundant cast.
Dario Lombardo [Thu, 3 Jan 2019 16:41:49 +0000 (17:41 +0100)]
file: remove redundant cast.

Found by clang-tidy.

Change-Id: I58c11e09ed89e99457635dd843311ce3cf3c6bae
Reviewed-on: https://code.wireshark.org/review/31334
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agosharkd: remove redundant cast.
Dario Lombardo [Thu, 3 Jan 2019 16:42:36 +0000 (17:42 +0100)]
sharkd: remove redundant cast.

Found by clang-tidy.

Change-Id: Ie02a77ffc17050743de216594d40faa65e1dabc2
Reviewed-on: https://code.wireshark.org/review/31336
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoextcap: remove redundant casts.
Dario Lombardo [Thu, 3 Jan 2019 16:38:03 +0000 (17:38 +0100)]
extcap: remove redundant casts.

Found by clang-tidy.

Change-Id: Icd4a72d840092ce9c5e18e3d16a94b785b4521dc
Reviewed-on: https://code.wireshark.org/review/31333
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agorawshark: remove redundant cast.
Dario Lombardo [Thu, 3 Jan 2019 16:42:21 +0000 (17:42 +0100)]
rawshark: remove redundant cast.

Found by clang-tidy.

Change-Id: I50912055e0230173af3a6b008fafb12144b02f8d
Reviewed-on: https://code.wireshark.org/review/31335
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoPut a period at the end of a sentence.
Guy Harris [Thu, 3 Jan 2019 22:01:08 +0000 (14:01 -0800)]
Put a period at the end of a sentence.

Change-Id: Ifad6b9a09bc052d687cefe3ccda8c07ad765abda
Reviewed-on: https://code.wireshark.org/review/31350
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoSlight fixup for where the capture code lives.
Guy Harris [Thu, 3 Jan 2019 21:56:15 +0000 (13:56 -0800)]
Slight fixup for where the capture code lives.

The full explanation is a bit more complicated - we'd have to mention
the dumpcap/*shark split, and the code on both sides of the split.

Change-Id: I43f8fc3c589bdf900e20714b55a3b4f544879bc2
Reviewed-on: https://code.wireshark.org/review/31349
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoWSDG: Miscellaneous updates and fixes.
Gerald Combs [Thu, 3 Jan 2019 20:01:19 +0000 (12:01 -0800)]
WSDG: Miscellaneous updates and fixes.

Update the Windows CRT text to mention the Universal CRT.

Replace references to WinPcap with Npcap.

Update the Qt LTS text.

Add a WiX / .msi section

Use curly quotes.

Use the {cpp} attribute so that the "++" in "C++" doesn't trigger
monospace formatting.

Make the various "Unix" and "Windows" subsection title names uniform.
Give them the "discrete" attribute so that they don't clutter up the
TOC.

Title-case section titles.

Remove the reference to m4. As far as I can tell we don't require it.

Change-Id: I73f851adae640f77205781d6c4962002c2d53f49
Reviewed-on: https://code.wireshark.org/review/31343
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
13 months agotest: print command output for dfiltertest failures
Peter Wu [Thu, 3 Jan 2019 18:28:44 +0000 (19:28 +0100)]
test: print command output for dfiltertest failures

The buildbot detects random errors on Windows. Log some more details in
order to understand the problem better.

Change-Id: I903457894985273a63b8907b6784a2897cd93d93
Reviewed-on: https://code.wireshark.org/review/31340
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
13 months agoAvoid definition collisions for INVALID_SOCKET.
Guy Harris [Thu, 3 Jan 2019 20:21:19 +0000 (12:21 -0800)]
Avoid definition collisions for INVALID_SOCKET.

Newer versions of libpcap define it (due to the somewhat infelicitous
API for "active mode" remote capture, which returns a socket); don't
define it ourselves if it's already defined.

Change-Id: I620576620fd2708ebd503da696e17b472bc20472
Reviewed-on: https://code.wireshark.org/review/31344
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoFix indentation.
Guy Harris [Thu, 3 Jan 2019 19:39:54 +0000 (11:39 -0800)]
Fix indentation.

Change-Id: I60d9b7b5dce04dae560a68feb329041c0374c241
Reviewed-on: https://code.wireshark.org/review/31342
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agotshark: remove redundant casts.
Dario Lombardo [Thu, 3 Jan 2019 16:16:35 +0000 (17:16 +0100)]
tshark: remove redundant casts.

Found by clang-tidy.

Change-Id: I7fe1c3219758d8daf411d094e2df17916f2eb57b
Reviewed-on: https://code.wireshark.org/review/31330
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agocapture_sync: use the same var name as in other places.
Dario Lombardo [Thu, 3 Jan 2019 15:53:01 +0000 (16:53 +0100)]
capture_sync: use the same var name as in other places.

error_message -> error_msg.

Change-Id: Ie1bc1b72800dc6c93e481cfffa202d5bd0743b5c
Reviewed-on: https://code.wireshark.org/review/31329
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agodoc: update README.display_filter for new test location
Peter Wu [Thu, 3 Jan 2019 19:14:09 +0000 (20:14 +0100)]
doc: update README.display_filter for new test location

Change-Id: I29bb00dbec43692d940ef6f389743af56dfd6995
Reviewed-on: https://code.wireshark.org/review/31341
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
13 months agorelease-notes: document TLS and library changes
Peter Wu [Thu, 3 Jan 2019 15:00:08 +0000 (16:00 +0100)]
release-notes: document TLS and library changes

Change-Id: I3af4cb96a6c87205cdd6c85c27977366cb77291f
Reviewed-on: https://code.wireshark.org/review/31327
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
13 months agoepan: use json_dumper for json outputs.
Dario Lombardo [Mon, 10 Dec 2018 12:44:03 +0000 (13:44 +0100)]
epan: use json_dumper for json outputs.

They include -Tjson, -Tjsonraw, -Tek.

Change-Id: Ib3d700482ce5c29727c3f778cc3c46a1bf7756c4
Reviewed-on: https://code.wireshark.org/review/31000
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
13 months agojson_dumper: make json_dumper_bad fatal.
Dario Lombardo [Wed, 2 Jan 2019 22:59:41 +0000 (23:59 +0100)]
json_dumper: make json_dumper_bad fatal.

A call to this function means a programming error. g_error makes it
fatal and terminates the program, making the debug easier.

Change-Id: I5c9e82507482733b4d450ed6c3a9fc17fb0fcdca
Reviewed-on: https://code.wireshark.org/review/31310
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
13 months agoGeoNetworking cleanup and minor corrections
Christophe GUERBER [Thu, 3 Jan 2019 12:33:49 +0000 (13:33 +0100)]
GeoNetworking cleanup and minor corrections

Removes obsoleted dissector tables, cleanup comments, correct elevation
display and intx display.

Change-Id: I7224bede0cecbbd5cab91630193e17a7e12615b1
Reviewed-on: https://code.wireshark.org/review/31323
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agodebian: update symbols.
Dario Lombardo [Thu, 3 Jan 2019 12:17:39 +0000 (13:17 +0100)]
debian: update symbols.

Change-Id: I550dd3b6bdf29cb8c5a80ba8d08b29ffbe3246cd
Reviewed-on: https://code.wireshark.org/review/31321
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoieee80211: print the RU Allocation in decimal
Emmanuel Grumbach [Thu, 3 Jan 2019 06:33:06 +0000 (08:33 +0200)]
ieee80211: print the RU Allocation in decimal

The RU Allocation is really a decimal number and the
standard uses it as a decimal number. It is not a bitmap.
Print it in decimal.

Change-Id: I2f8ff9798aa1af855ad3c8b0a26704282fe18189
Reviewed-on: https://code.wireshark.org/review/31315
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>
13 months agoknsxip: fix header
Alexis La Goutte [Thu, 3 Jan 2019 08:33:58 +0000 (08:33 +0000)]
knsxip: fix header

it is no longer Ethereal (=> Wireshark)

Change-Id: I2a59aa0ec4e18b05612bbce6ede18db9ae350e49
Reviewed-on: https://code.wireshark.org/review/31317
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agogeonw: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Thu, 3 Jan 2019 09:53:25 +0000 (09:53 +0000)]
geonw: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ib1e26cc20ad30889a56455bcf529ba404f14506f
Reviewed-on: https://code.wireshark.org/review/31320
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoknxip: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Thu, 3 Jan 2019 08:59:42 +0000 (08:59 +0000)]
knxip: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ifa64a819d50b730eae4a5c2447b502580a871f16
Reviewed-on: https://code.wireshark.org/review/31318
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoAdd dissector for Great Britain Companion Specification (GBCS)
Kenneth Soerensen [Sat, 22 Dec 2018 15:08:32 +0000 (16:08 +0100)]
Add dissector for Great Britain Companion Specification (GBCS)

The Smart Metering Equipment Technical Specifications (SMETS) requires
that Gas Smart Metering Equipment (GSME), and Electricity Smart
Metering Equipment (ESME) including variants, meet the requirements
described in the Great Britain Companion Specification (GBCS).

GBCS messages are end-to-end and contains ZigBee, DLMS or ASN.1
formatted payloads. The GBCS messages are transported via IPor via
the ZigBee Tunneling cluster.

https://smartenergycodecompany.co.uk/document-download-centre/download-info/gbcs-v2-1/

Bug: 15381
Change-Id: I28ca9831fc266a6abd310db103306b98786e63f9
Reviewed-on: https://code.wireshark.org/review/31168
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoCouchbase: Fixup a shadow variable.
Gerald Combs [Thu, 3 Jan 2019 01:00:22 +0000 (17:00 -0800)]
Couchbase: Fixup a shadow variable.

Rename index to byte_idx.

Change-Id: I49d09d6db71d5db9e1c65f2abadc1413b3ccb7ec
Reviewed-on: https://code.wireshark.org/review/31313
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>
13 months agoWindows: use lua-unicode as built with VS 2017
Peter Wu [Wed, 2 Jan 2019 17:17:58 +0000 (18:17 +0100)]
Windows: use lua-unicode as built with VS 2017

These binaries were built by AppVeyor using VS 2017 (MSVC 19.16.27025.1)
and replaces locally built binaries using VS 2015 (MSVC 19.0.24215.1).
I believe that these are the same as both of them use VCRUNTIME140.dll
and import the same symbols. Using a newer compiler should however
remove any doubt of compatibility with VS 2017 and should address
concerns from Anders and Graham.

These files are actually the "msvc2017_*.zip" files from
https://github.com/Lekensteyn/lua-unicode/releases/tag/5.2.4-release1

Change-Id: Ib3fdf4678267fa10c0729f98ae0ce3153ac278a4
Reviewed-on: https://code.wireshark.org/review/31307
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoDon't fall out of the loop on a write error.
Guy Harris [Wed, 2 Jan 2019 23:55:51 +0000 (15:55 -0800)]
Don't fall out of the loop on a write error.

Doing so means we'd close the FD, but we've already closed it.

Addresses Coverity CID 1442274.

Change-Id: I5aab1bd4b82e9ac0901bcdbc1ddb6b16eec30573
Reviewed-on: https://code.wireshark.org/review/31312
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months ago6lowpan: don't try to use (new) TVB that wasn't created.
Jeff Morriss [Wed, 2 Jan 2019 21:45:05 +0000 (16:45 -0500)]
6lowpan: don't try to use (new) TVB that wasn't created.

If the IPHC TVB wasn't created then bail out of dissection before trying
to use it.

Bug: 15217
Change-Id: I6e297590cdf86e13b0185f75f1d409888f2498d8
Reviewed-on: https://code.wireshark.org/review/31308
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
13 months agotools: fix trailing messages.
Dario Lombardo [Wed, 2 Jan 2019 22:11:24 +0000 (23:11 +0100)]
tools: fix trailing messages.

Change-Id: If4f213daaa27f51b1659939244945d9fdddc7772
Reviewed-on: https://code.wireshark.org/review/31309
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
13 months agoIEEE1609.2: Allow Service Specific Permissions dissection
Christophe GUERBER [Wed, 2 Jan 2019 15:15:33 +0000 (16:15 +0100)]
IEEE1609.2: Allow Service Specific Permissions dissection

IEEE1609 and GeoNetworking secured packets containing certificate
contain Service Specific Permission items that was not dissected.

This patch allows dissection of SSP both in IEEE1609dot2 dissector and
in the geonetworking dissector.

It also provides SSP dissectors for ETSI DEN and CA basic services.

Change-Id: Ic5efe403f7c4337c7e51a4eab9a9d674d2fe1cf6
Reviewed-on: https://code.wireshark.org/review/31303
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agocli_main: remove real_main from stack traces for non-Windows
Peter Wu [Wed, 26 Dec 2018 17:10:12 +0000 (18:10 +0100)]
cli_main: remove real_main from stack traces for non-Windows

Restore the "main" name since that is used everywhere else except for
Windows. On Windows, "main" is renamed via a macro to avoid a conflict
with "wmain" and to allow it to be called in cli_main.c.

For those wondering, GUI applications (such as Qt) have a different
entry point, namely WinMain. In Qt5, src/winmain/qtmain_win.cpp defines
WinMain, but seems to convert its arguments from Unicode to CP_ACP
(ASCII). It might not support UTF-8, but I did not verify this.

Change-Id: I93fa59324eb2ef95a305b08fc5ba34d49cc73bf0
Reviewed-on: https://code.wireshark.org/review/31208
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agonas5gs: Add dissection of QoS flow descriptions.
Anders Broman [Wed, 2 Jan 2019 10:38:48 +0000 (11:38 +0100)]
nas5gs: Add dissection of QoS flow descriptions.

While there renumber according to latest spec. and fix some indentation.

Change-Id: Ib9b4590d72c3124ffcb96fd719a9a19cadb4c494
Reviewed-on: https://code.wireshark.org/review/31300
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoDiameter: Add 3GPP avp name="eDRX-Related-RAT" code="1705"
Anders Broman [Wed, 2 Jan 2019 09:04:03 +0000 (10:04 +0100)]
Diameter: Add 3GPP avp name="eDRX-Related-RAT" code="1705"

Change-Id: Ib95113f12831eed298c28998e4e6106bb4df8019
Reviewed-on: https://code.wireshark.org/review/31299
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoUpdates and bugfixes of ASTERIX I062
Atli Guðmundsson [Thu, 27 Dec 2018 03:11:40 +0000 (03:11 +0000)]
Updates and bugfixes of ASTERIX I062

I062 v1.18 updates (now the default)
- Updated I062/380#10.STAT, new enum values  (6 & 7)
- Added asterix.062/080.SFC
- Added asterix.062/080.IDD
- Added asterix.062/080.IEC
I062 v1.17 updates
- Added asterix.062/060.V
- Added asterix.062/060.G
I062 bugfixes:
- Fixed I062 Capitalisation inconsistencies
- Fixed I062/080.FPLT, incorrect value mask
- Fixed I062/080.SDS, incorrect value mask
- Fixed I062/110#1.M5, incorrect name (was I062/110#1.MD5)
- Fixed I062/110#4, incorrect abbreviation (was asterix.062_11_04)
- Fixed I062/110#4, missing spare bit
- Fixed I062/110#4.RES, incorrect value mask
- Fixed I062/110#6, incorrect abbreviation (was asterix.062_11_06)
- Fixed I062/136.MFL, incorrect abbreviation (was asterix.062_136_ALT)
- Fixed I062/245.STI, was missing
- Fixed I062/245, did not display anything
- Fixed I062/290, incorrect abbreviation, (was asterix.062_)
- Fixed I062/295#7.MHG, incorrect name (was I062/295#07.MHD)
- Fixed I062/340#4/5, incorrect abbreviations (was asterix.062_340_)
- Fixed I062/380#4, incorrect abbreviation (was asterix.062_380_4)
- Fixed I062/380#4.IAS, incorrect scaling (depends on IM bit)
- Fixed I062/380#6.ALT, incorrect type (was unsigned)
- Fixed I062/380#7.ALT, incorrect type (was unsigned)
- Fixed I062/380#9.NC, incorrect value mask
- Fixed I062/380#9.TD, incorrect field size
- Fixed I062/380#9.TTR, incorrect type (was signed)
- Fixed I062/380#17.TA, incorrect type (was signed)
- Fixed I062/380#19.VUC, incorrect field size
- Fixed I062/390#3, incorrect type (was 32-bit), incorrect value mask
- Fixed I062/390#n, incorrect abbreviations (was asterix.062_nn)
- Fixed I062/500#3.APWLAT, incorrect type (was signed)
- Fixed I062/500#3.APWLON, incorrect type (was signed)
- Fixed I062/500#n, incorrect abbreviations (was asterix.062_nn)
- Fixed I062/510, missing support for slaved trackers
- Fixed I062/510.SUD, incorrect name (was I062/510.SID)
- Fixed I062/510.SUD, incorrect type (was 24-bit), incorrect value mask
- Fixed I062/510.STN, incorrect value mask
- Updated I062/RE.CST.SAC/SIC, now reports as asterix.SAC/SIC
- Updated I062/RE.CSNT.SAC/SIC, now reports as asterix.SAC/SIC

Note: incorrect value masks and field sizes would in most cases
cause an exception when trying to decode those fields.

Change-Id: If6b9662d20619dd30b4fe28907ab0630c6d55e44
Reviewed-on: https://code.wireshark.org/review/31214
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoMake dissect_icmp_extension_structure into a dissector function.
Michael Mann [Tue, 1 Jan 2019 17:45:46 +0000 (12:45 -0500)]
Make dissect_icmp_extension_structure into a dissector function.

That way there isn't a need for packet-icmp-int.h.

Change-Id: Ib523c36ab2fdf6a43ee6ff32dadfcd53e9d9bf14
Reviewed-on: https://code.wireshark.org/review/31290
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agodpaux: Minor improvements
Michael Mann [Tue, 1 Jan 2019 22:07:55 +0000 (17:07 -0500)]
dpaux: Minor improvements

1. Pass dissector data to dpaux dissector directly instead of using p_get_proto_data.
2. Don't assume dissector data will always be present and default to "sink" if
that is the case.
3. tvb_memdup isn't needed for proto_tree_add_bytes
4. Use value_string to save switch cases.
5. Bugfix major/minor version dissection.

Change-Id: I018d923537ce276fda8be1884f5bb3a8b2eef862
Reviewed-on: https://code.wireshark.org/review/31297
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>
13 months agowsutil: fix crash due to corruption of the "small_buffers" array
Peter Wu [Mon, 31 Dec 2018 13:07:32 +0000 (14:07 +0100)]
wsutil: fix crash due to corruption of the "small_buffers" array

Gracefully handle repeated calls of ws_buffer_free on the same buffer to
avoid strange crashes in other new users that allocate a "small" buffer.

The first call to ws_buffer_free would store data pointer in the
'small_buffers' array for reuse and set the pointer to NULL. Result:

    (gdb) p cfile.rec.options_buf
    $2 = {
      data = 0x0,
      allocated = 2048,     // Oops, not modified!
      start = 0,
      first_free = 0
    }

All users of Buffer (including ws_buffer_free) however asssume that
'allocated' reflects the actual size of 'data'. If this is not the case
(if ws_buffer_free is called again), then a data pointer (NULL!) will be
stored and the next ws_buffer_init request for a "small buffer" will
result in unexpected behavior (including crashes).

Fix the issue by clearing the 'allocated' field as well. Add assertions
to catch such issues earlier rather than crashing at random users of
these buffers (such as frame_tvbuff).

Bug: 15263
Change-Id: I0b491c3fccac8c6fddd43779629343d721638ca9
Reviewed-on: https://code.wireshark.org/review/31278
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoNo need to report "some files could not be saved".
Guy Harris [Tue, 1 Jan 2019 22:12:15 +0000 (14:12 -0800)]
No need to report "some files could not be saved".

We've already reported the files that couldn't be saved; no need to tell
the user something they already know by that point.

Change-Id: I8251a46134342df6b40a6324aa76a5237fde7c93
Reviewed-on: https://code.wireshark.org/review/31298
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
13 months agolorawan: fix this condition has identical branches [-Wduplicated-branches]
Alexis La Goutte [Tue, 1 Jan 2019 17:57:03 +0000 (17:57 +0000)]
lorawan: fix this condition has identical branches [-Wduplicated-branches]

Change-Id: I9bf885dcd9b8c15212062f8e6205816521e707c3
Reviewed-on: https://code.wireshark.org/review/31292
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Erik de Jong <erikdejong@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
13 months agoAlways report errors in eo_save_entry().
Guy Harris [Tue, 1 Jan 2019 21:44:07 +0000 (13:44 -0800)]
Always report errors in eo_save_entry().

If a particular save failed, always let the user know.

Change-Id: I618e0ff82813cd4249ab7b1714f9a50e095a1ea8
Reviewed-on: https://code.wireshark.org/review/31296
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoLimit the maximum *file* name length for exported objects.
Guy Harris [Tue, 1 Jan 2019 21:04:44 +0000 (13:04 -0800)]
Limit the maximum *file* name length for exported objects.

Limiting the maximum *path* name length is bogus; if the user wants to
store the file in some directory deep under the root (UN*X) or the root
of the drive (Windows), that's their choice - don't prevent them from
saving in a directory with a path longer than some maximum or limit the
file name based on the length of the path leading up to it.

Limiting the maximum *file* name is presumably to cope with, for
example, HTTP objects with a URL that had a very long query component,
so it makes sense.

Change-Id: Idfc7de8124ee80bdd4950341ff2239834eb9f6f6
Reviewed-on: https://code.wireshark.org/review/31295
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoGet rid of local_eo_save_entry().
Guy Harris [Tue, 1 Jan 2019 19:50:57 +0000 (11:50 -0800)]
Get rid of local_eo_save_entry().

Have eo_save_entry() use the report_ routines to report errors, so they
pop up a dialog in Wireshark and print an error message in command-line
programs such as TShark.  Use it instead of local_eo_save_entry().

Change-Id: I689fd880ff2a31486372374560129ee9d9692b1e
Reviewed-on: https://code.wireshark.org/review/31294
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoFixes GeoNetworking secured packets dissection
Christophe GUERBER [Tue, 1 Jan 2019 17:33:05 +0000 (18:33 +0100)]
Fixes GeoNetworking secured packets dissection

Secured packets contain Common and Extended header.

Change-Id: I60b5ed35811c19c9596bd142c1315b341d760968
Reviewed-on: https://code.wireshark.org/review/31238
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoUse dissector table to dissect content of ieee1609
Christophe GUERBER [Sun, 30 Dec 2018 14:40:29 +0000 (15:40 +0100)]
Use dissector table to dissect content of ieee1609

For unsecured and signed data, the dissector uses a dissector table to
determine the next dissector. It uses the psId field to index the table.

In the case no psId is provided inside, the caller can set a default
psid if it is provided beforehand. If none is provided, data are not
dissected.

Change-Id: I6f9d6989cd87dd373a155a5b893c460344a0c857
Reviewed-on: https://code.wireshark.org/review/31237
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoQt: Pluralize "Copy Row(s)"
Stig Bjørlykke [Sun, 30 Dec 2018 19:23:04 +0000 (20:23 +0100)]
Qt: Pluralize "Copy Row(s)"

Properly pluralize "Copy Row(s)" entry in the popup menu.

Change-Id: Ifc4f9c69ab63d2d2594648db3115087ba51a941f
Reviewed-on: https://code.wireshark.org/review/31269
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
13 months agoZ39.50: Eliminate unnecessary header.
Craig Jackson [Tue, 1 Jan 2019 02:30:18 +0000 (21:30 -0500)]
Z39.50: Eliminate unnecessary header.

I decided that packet-z3950.h was unnecessary at this time, but I didn't eliminate all trace of it.

Change-Id: Iaff41e143bac6bf42779de49f7390ac129cef3e1
Reviewed-on: https://code.wireshark.org/review/31288
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
13 months agoFix asn2wrs.py: always add BASE_VAL64_STRING
Christophe GUERBER [Tue, 1 Jan 2019 13:53:41 +0000 (14:53 +0100)]
Fix asn2wrs.py: always add BASE_VAL64_STRING

In some cases (e.g. when a field has a user defined dissection function)
the type reported for this field is a 'virtual' one and the latter is not
contained in selt.type. Consequently, BASE_VAL64_STRING is not set.

Function eth_get_type_attr should return all the attributes of a type and
it seems resonable to expect it to return the BASE_VAL64_STRING. This
will solve the above mentioned error and may solve any possible issue in
other parts that call this function.

Change-Id: Iaee9ce5bd30f2a768cfcecf628df23bf1ed54e55
Reviewed-on: https://code.wireshark.org/review/31287
Reviewed-by: Michael Mann <mmann78@netscape.net>
13 months agoHappy New Year 2019!
Stig Bjørlykke [Tue, 1 Jan 2019 11:57:07 +0000 (12:57 +0100)]
Happy New Year 2019!

Change-Id: Ic140aafdb32e649e88bf3f00bda3cec9404e555a
Reviewed-on: https://code.wireshark.org/review/31284
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
13 months agokrb5: fix parsing of PA-S4U-X509-USER in AS-REQ
Isaac Boukris [Mon, 31 Dec 2018 17:01:17 +0000 (19:01 +0200)]
krb5: fix parsing of PA-S4U-X509-USER in AS-REQ

Per [MS-SFU] 2.2.2 PA_S4U_X509_USER in AS-REQ consists of
the certificate data instead of the corresponding struct.

Also, the subject-certificate field in the struct consists
of the certificate data as well, so let's decode it as such.

Change-Id: I6f03a66eac74b7d42c0893f63cab772d8ddcb803
Signed-off-by: Isaac Boukris <iboukris@gmail.com>
Reviewed-on: https://code.wireshark.org/review/31279
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoAdd a "failed" return for tap packet routines.
Guy Harris [Tue, 1 Jan 2019 03:36:12 +0000 (19:36 -0800)]
Add a "failed" return for tap packet routines.

This allows taps that can fail to report an error and fail; a failed
tap's packet routine won't be called again, so they don't have to keep
track of whether they've failed themselves.

We make the return value from the packet routine an enum.

Don't have a separate type for the per-packet routine for "follow" taps;
they're expected to act like tap packet routines, so just use the type
for tap packet routines.

One tap packet routine returned -1; that's not a valid return value, and
wasn't one before this change (the return value was a boolean), so
presume the intent was "don't redraw".

Another tap routine's early return, without doing any work, returned
TRUE; this is presumably an error (no work done, no need to redraw), so
presumably it should be "don't redraw".

Clean up some white space while we're at it.

Change-Id: Ia7d2b717b2cace4b13c2b886e699aa4d79cc82c8
Reviewed-on: https://code.wireshark.org/review/31283
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoMove some command-line-oriented routines from wsutil to ui.
Guy Harris [Tue, 1 Jan 2019 00:55:23 +0000 (16:55 -0800)]
Move some command-line-oriented routines from wsutil to ui.

cmdarg_err() is for reporting errors for command-line programs and
command-line errors in GUI programs; it's not something for any of the
Wireshark libraries to use.

The various routines for parsing numerical command-line arguments are
not for general use, they're just for use when parsing arguments.

Change-Id: I100bd4a55ab8ee4497f41d9651b0c5670e6c1e7f
Reviewed-on: https://code.wireshark.org/review/31281
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoAdd some new symbols.
Guy Harris [Tue, 1 Jan 2019 01:37:26 +0000 (17:37 -0800)]
Add some new symbols.

Change-Id: I1652b4357ca93913696a89a9254e4bfe9c2484b7
Reviewed-on: https://code.wireshark.org/review/31282
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoWSDG: Update the find and goto images and descriptions.
Gerald Combs [Mon, 31 Dec 2018 16:36:22 +0000 (08:36 -0800)]
WSDG: Update the find and goto images and descriptions.

Change-Id: I3e8fcc3b2c940e241d4c38c2b03d4ec44bcd319e
Reviewed-on: https://code.wireshark.org/review/31280
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>
13 months agoExport ITS-AppId/psId names from IEEE1609
Christophe GUERBER [Sat, 29 Dec 2018 14:17:41 +0000 (15:17 +0100)]
Export ITS-AppId/psId names from IEEE1609

PsId and ITS-AID are defined in several documents and listed in
ieee1609.12. Put these definitions in ieee1609.2 ASN1 definition and
export it so that GeoNetworking and wsmp dissectors may use it.

Change-Id: Ia3ac181a4c9092b555decb3ee7c5e78adcece5c0
Reviewed-on: https://code.wireshark.org/review/31236
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoCESoETH: Add dissection of MEF 8 CES over Ethernet
Jaap Keuter [Fri, 28 Dec 2018 20:45:41 +0000 (21:45 +0100)]
CESoETH: Add dissection of MEF 8 CES over Ethernet

Add dissection of Metro Ethernet Forum specification of Implementation
Agreement for the Emulation of PDH Circuits over Metro Ethernet
Networks [MEF 8]. This includes the introduction of a RTP shim header
dissection function, as is not uncommon in PW and CES services.

Signed-off-by: Jaap Keuter <jaap.keuter@aimvalley.nl>
Change-Id: I6de81007ce11793cd5352fadadd80d3f6f45ae0d
Reviewed-on: https://code.wireshark.org/review/31239
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
13 months agoAccept v1 of GeoNetworking and improve item tree
Christophe GUERBER [Sun, 30 Dec 2018 14:07:41 +0000 (15:07 +0100)]
Accept v1 of GeoNetworking and improve item tree

Accept version value 1 for geonetworking, dissect last 4 bytes of SHB
and traffic class as per EN 302 636-4.

Change-Id: I254e48f888aae063d2f4b5178c2e0eadc839f8ea
Reviewed-on: https://code.wireshark.org/review/31245
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoImprove capture-on-pipe error messages.
Guy Harris [Mon, 31 Dec 2018 04:39:10 +0000 (20:39 -0800)]
Improve capture-on-pipe error messages.

Add "Please report this to us" and "Please report this to whoever wrote
the program that's writing to the pipe" secondary error messages.  Use
the latter for most of the errors, as the most likely cause is that the
program writing to the pipe is messing up somehow.

If we don't recoginze the first 4 bytes of the file, say "Data written
to the pipe is neither in a supported pcap format nor in pcapng
format." - it's not necessarily a pcap file.

Speak of "pcap" rather than "libpcap" format - it's not completely tied
to libpcap (although two of the libraries not called "libpcap" that read
it are basically libpcap+a Windows driver+a library for the Windows
driver, at this point), and the suffix generally used it ".pcap".

Change-Id: Ifb5518af5cade788294c93a7ac416893f57f6bc8
Reviewed-on: https://code.wireshark.org/review/31273
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoWSDG: Update packet list and popup images and descriptions.
Gerald Combs [Sun, 30 Dec 2018 20:29:41 +0000 (12:29 -0800)]
WSDG: Update packet list and popup images and descriptions.

Update the images and descriptions for the packet list, column header
popup, packet list popup, and packet detail popups.

Add images and descriptions for the byte view popup.

Use title case in more places.

Change-Id: Icf3af426c97c6e7cf97dee377c20039b7b8791ce
Reviewed-on: https://code.wireshark.org/review/31271
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>
13 months agoasn2wrs.py: use BASE_VAL64_STRING and val64_string
Christophe GUERBER [Sun, 30 Dec 2018 16:02:37 +0000 (17:02 +0100)]
asn2wrs.py: use BASE_VAL64_STRING and val64_string

When UINT64 contains value strings, in addition to using VALS64 to give
the list of names, the type of the structure has to be val64_string and
the display parameter has to be ORed with BASE_VAL64_STRING.

Change-Id: I0a619c91027df1eaae8209ada816f45b85d6431d
Reviewed-on: https://code.wireshark.org/review/31268
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoCMake: clean up FindGNUTLS.cmake
Peter Wu [Sun, 30 Dec 2018 16:13:47 +0000 (17:13 +0100)]
CMake: clean up FindGNUTLS.cmake

Use consistent capitalization and whitespace. Remove library names from
find_library that are unsuitable. No functional change intended.

Change-Id: Ic40516542777d768b6eef656fe5c0a0af143fb7e
Reviewed-on: https://code.wireshark.org/review/31264
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoWindows: Upgrade GnuTLS to 1.6.3
Peter Wu [Sat, 15 Dec 2018 17:45:53 +0000 (18:45 +0100)]
Windows: Upgrade GnuTLS to 1.6.3

Upgrade to GnuTLS 3.6.3-1, using MinGW binaries from Fedora 29 packages:

    mingw64-gnutls-3.6.3-1.fc29.noarch.rpm
    mingw64-gcc-8.2.0-3.fc29.x86_64.rpm
    mingw64-gmp-6.1.2-4.fc29.noarch.rpm
    mingw64-nettle-3.4-2.fc29.noarch.rpm
    mingw64-p11-kit-0.23.7-5.fc29.noarch.rpm
    mingw64-libffi-3.1-4.fc29.noarch.rpm
    mingw64-libtasn1-4.13-3.fc29.noarch.rpm
    mingw64-winpthreads-5.0.4-2.fc29.noarch.rpm

This includes libgcc_s_seh-1.dll (64-bit, new) and libgcc_s_sjlj-1.dll
(32-bit, previously included with glib2).

Built with
https://git.lekensteyn.nl/peter/wireshark-notes/tree/windows-libs/make-gnutls-libs-zip.sh?id=b86878e458d5d7deb21218ce6598b98af4ed7ec2

The main motivation is improved PKCS #11 support:
- 3.6.0: fix potential compatibility issue with SafeNet HSMs
  https://gitlab.com/gnutls/gnutls/merge_requests/398/
- 3.6.2: gnutls_pkcs11_token_get_flags now forwards token info.
- 3.6.3: new APIs for low-level PKCS #11 token or object operations.

Change-Id: I235774e3b27f3426cb74d3d9c0ab593d06870e89
Reviewed-on: https://code.wireshark.org/review/31128
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoSMPP: General improvements
Michael Mann [Sat, 29 Dec 2018 21:50:46 +0000 (16:50 -0500)]
SMPP: General improvements

1. Use proto_tree_add_item (and friends) instead of a protocol specific
wrapper for integer types
2. Create #defines for command IDs and properly sort them in the their value_string
3. Improve heuristics for command specific parameters to reduce false positives
4. Use length value in TLV for strings
5. Remove "sub tvb" creation.  The tvb passed into the pdu should be used.
6. Use proto_tree_add_bitmask_list and proto_tree_add_bitmask_list_value where applicable
7. Allow empty fields for vendor-specific TLVs.
8. Treat version fields as FT_UINT8 and use format with BASE_CUSTOM
9. Condense all command response codes to a single range_string.

Bug: 5206
Bug: 15267
Change-Id: I49751d287af1ebb9e27ae7463c08f4724ee60c07
Reviewed-on: https://code.wireshark.org/review/31267
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoKNET: Validate the length field before claiming packet
Michael Mann [Sun, 30 Dec 2018 16:37:13 +0000 (11:37 -0500)]
KNET: Validate the length field before claiming packet

Heuristic is weak, but length of packet should be non-zero.

Change-Id: I68d6d85092c84d5d421731be3ada008fe7a5b06f
Reviewed-on: https://code.wireshark.org/review/31266
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>
13 months agoGSM over IP: Require a valid message type for dissection.
Michael Mann [Sun, 30 Dec 2018 16:19:13 +0000 (11:19 -0500)]
GSM over IP: Require a valid message type for dissection.

Protects against some false positives because by default GSM over IP
claims some "frequently used" ports.

Change-Id: I94736ecef8ac1422bb330a364a3f77edd9a52a2b
Reviewed-on: https://code.wireshark.org/review/31265
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoUpdate the comment again.
Guy Harris [Mon, 31 Dec 2018 07:47:09 +0000 (23:47 -0800)]
Update the comment again.

The third URL works, but let's go https: for it.  The other two don't.

Line-wrap another part of the comment while we're at it.

Change-Id: I744770c859b317ace2a71e82f86e2419b6d7ef2b
Reviewed-on: https://code.wireshark.org/review/31276
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoUpdate a comment.
Guy Harris [Mon, 31 Dec 2018 05:51:41 +0000 (21:51 -0800)]
Update a comment.

(Thanks for killing off a bunch of comment mechanisms, not saving the
old comments and placing them somewhere useful, and not even allowing
the Wayback Machine to archive at least some of those sites, Microsoft.)

Change-Id: Ie4258250a0176a56ee33be77604acf43c6886e0f
Reviewed-on: https://code.wireshark.org/review/31274
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoUse size_t, not int, for sizes.
Guy Harris [Mon, 31 Dec 2018 02:58:54 +0000 (18:58 -0800)]
Use size_t, not int, for sizes.

Change-Id: I421acce006692d6415a3d647b262843d38858cf7
Reviewed-on: https://code.wireshark.org/review/31272
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoQt: traffic table: remove a tap listener only once
Martin Kaiser [Sun, 30 Dec 2018 12:24:36 +0000 (13:24 +0100)]
Qt: traffic table: remove a tap listener only once

Class TrafficTableTreeWidget is used by the conversation and enpoint
dialogs, both of which are subclasses of WiresharkDialog.

Those dialogs use WiresharkDialog::registerTapListener() to register tap
listeners. When the dialog is closed, those listeners are removed by
WiresharkDialog::removeTapListeners().

TrafficTableTreeWidget's destructor tries to remove its tap listener a
2nd time after WiresharkDialog did its cleanup. This causes warnings

Warn remove_tap_listener(): no listener found with that tap data

Don't call remove_tap_listener() from TrafficTableTreeWidget's
destructor. The destructor is now empty and can be removed completely.

Change-Id: I3143fa1c5116203f4a0be791bd4c5f08135aefb0
Reviewed-on: https://code.wireshark.org/review/31259
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
13 months agoCMake: clean up FindGCRYPT.cmake
Peter Wu [Sat, 29 Dec 2018 11:11:18 +0000 (12:11 +0100)]
CMake: clean up FindGCRYPT.cmake

Use consistent lowercase capitalization and whitespace. Windows: clarify
libgpg-error names and remove libgcc_s (1.7.6/1.8.3 do not need it).

Change-Id: I5d1b1a67f7a992ccfca4c28d0e19bbbfc41b7a4d
Reviewed-on: https://code.wireshark.org/review/31244
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
13 months agosrt: fix not a Doxygen trailing comment [-Wdocumentation]
Alexis La Goutte [Tue, 25 Dec 2018 17:40:25 +0000 (17:40 +0000)]
srt: fix not a Doxygen trailing comment [-Wdocumentation]

Change-Id: I78de1d2fc55ac64542d7d031c33c3b4bc58b10ff
Reviewed-on: https://code.wireshark.org/review/31199
Reviewed-by: Maxim Sharabayko <maxim.sharabayko@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoasn2wrs.py: fix regression introduced by gf4b0b2109
Pascal Quantin [Sun, 30 Dec 2018 10:48:41 +0000 (11:48 +0100)]
asn2wrs.py: fix regression introduced by gf4b0b2109

FT_(U)INT64 are restricted to integer types only currently.
Do not use VALS64() for other types.

Change-Id: Id2299a9291c53ef246b90d732eb84811510ccb85
Reviewed-on: https://code.wireshark.org/review/31257
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
13 months ago[Automatic update for 2018-12-30]
Gerald Combs [Sun, 30 Dec 2018 08:27:06 +0000 (08:27 +0000)]
[Automatic update for 2018-12-30]

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

Change-Id: Ic8eac1cb4b08b5d567ef5bd3a52062eca095458c
Reviewed-on: https://code.wireshark.org/review/31254
Reviewed-by: Gerald Combs <gerald@wireshark.org>
13 months agoRevert "Add routines to load Lua programs that assume the path is UTF-8 on Windows."
Peter Wu [Wed, 19 Dec 2018 14:52:23 +0000 (15:52 +0100)]
Revert "Add routines to load Lua programs that assume the path is UTF-8 on Windows."

This reverts commit 5953756305388724545f0df46d286be2f02c048a.

The public API should not be polluted with Windows-specific hacks. As we
already override dofile/loadfile, those should be fixed instead.

Ping-Bug: 15118
Change-Id: Ia9d5e64e8ef14032f982f695ffd4cac59067bb17
Reviewed-on: https://code.wireshark.org/review/31134
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoFixes ASN.1 generation for VALS using 64 bits
Christophe GUERBER [Sat, 29 Dec 2018 23:36:03 +0000 (00:36 +0100)]
Fixes ASN.1 generation for VALS using 64 bits

VALS generation did not take into account the constraints on integers.
We now generate VALS if no constraints are present and VALS64 if the
interger needs 64 bits.

Change-Id: Ia044ee1ba1bd5b45554c19a458876e20110b1b7f
Reviewed-on: https://code.wireshark.org/review/31252
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoUse cmdarg_err() to report errors in CLI taps.
Guy Harris [Sun, 30 Dec 2018 02:24:56 +0000 (18:24 -0800)]
Use cmdarg_err() to report errors in CLI taps.

Change-Id: Ic6b35220e394f8c67848ed067e4bbddb980d5bc0
Reviewed-on: https://code.wireshark.org/review/31253
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
13 months agoCMake output: Show Windows paths for the VC redist files
Graham Bloice [Sat, 29 Dec 2018 19:51:08 +0000 (19:51 +0000)]
CMake output: Show Windows paths for the VC redist files

Purely cosmetic, show the various VC redist paths using the native
format.

Change-Id: I96d0b088f703e3e8dea6623ec258139eff066d90
Reviewed-on: https://code.wireshark.org/review/31251
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoFix indentation.
Guy Harris [Sat, 29 Dec 2018 19:25:19 +0000 (11:25 -0800)]
Fix indentation.

Change-Id: I6cc3373d043e6a8203a5f70eb03f03bb6cd8a6d9
Reviewed-on: https://code.wireshark.org/review/31246
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoAdd support for RSA decryption using PKCS #11 tokens
Peter Wu [Wed, 12 Dec 2018 13:34:00 +0000 (14:34 +0100)]
Add support for RSA decryption using PKCS #11 tokens

Add support for loading RSA private key files from PKCS #11 tokens,
identified by PKCS #11 URIs. Add a new 'pkcs11_libs' UAT which can
dynamically load PKCS #11 provider libraries that are not found by
p11-kit.

The configuration GUI will need additional code to discover available
PKCS #11 tokens and will be added later.

This feature requires GnuTLS 3.4 with PKCS #11 support, so Windows,
macOS via Homebrew, Ubuntu 16.04, Debian Stretch. Not supported: RHEL7.
Currently macOS via official packages disables PKCS #11 support, so that
will also not work.

Change-Id: I20646bfd69c6bd13c8c2d27cb65c164a4b0b7a66
Reviewed-on: https://code.wireshark.org/review/30855
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
13 months agoLua: fix crash in reloading Lua plugins that use FileHandler
Peter Wu [Mon, 17 Dec 2018 00:07:25 +0000 (01:07 +0100)]
Lua: fix crash in reloading Lua plugins that use FileHandler

Reloading Lua plugins did not actually remove registered FileHandler
instances which resulted in a use-after-free of lua_State. Fix this by
tracking instances and release them in wslua_deregister_filehandlers.

Other required fixes to allow reregistration after reloading:
- Fix END_FILEHANDLER_ROUTINE not to block all new registrations.
- wtap file subtypes are apparently persistent, even after
  "unregistering". Fix this by looking up the previous subtype that
  matches the FileHandler short name. Add a small sanity check to
  wtap_register_file_type_subtypes to prevent internal handlers from
  being overwritten.

This patch creates a potential memleak of registered_file_handlers as
wslua_deregister_filehandlers is not called on program exit (yet?).

Bug: 13264
Change-Id: I4f5935cde6ff8dc4de333359bad3efca96d4fb9b
Reviewed-on: https://code.wireshark.org/review/31068
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
13 months agoAdd jsonraw to tshark's -T man page synopsis
Jim Young [Sat, 29 Dec 2018 04:49:19 +0000 (23:49 -0500)]
Add jsonraw to tshark's -T man page synopsis

Change-Id: Icf3dacb143b19a55788a30dac297787ab3d2c3f0
Reviewed-on: https://code.wireshark.org/review/31242
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agodocsis: enhancements and additions for DOCSIS TLVs 5.20 and 5.40
Andrii Vladyka [Sat, 29 Dec 2018 01:30:27 +0000 (17:30 -0800)]
docsis: enhancements and additions for DOCSIS TLVs 5.20 and 5.40

Change-Id: If819d1f7e75b458d5fc28e23b28fa260637491fb
Reviewed-on: https://code.wireshark.org/review/31240
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agotest: add tests for Unicode paths in Lua and tshark -G folders
Peter Wu [Thu, 20 Dec 2018 22:25:23 +0000 (23:25 +0100)]
test: add tests for Unicode paths in Lua and tshark -G folders

Check for potential Unicode-related problems on Windows.

Change-Id: I147c07749c5073a9ae00f07914dd80347d17c40f
Ping-Bug: 15118
Reviewed-on: https://code.wireshark.org/review/31154
Tested-by: Petri Dish Buildbot
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoWindows: fix handling of Unicode paths in Lua
Peter Wu [Fri, 28 Dec 2018 11:49:33 +0000 (12:49 +0100)]
Windows: fix handling of Unicode paths in Lua

Lua internally uses ANSI C APIs (such as fopen). On many systems (macOS
and Linux for example) these work fine with UTF-8. Windows however
requires special Unicode APIs (such as _wfopen), so patch the Lua
library to interpret paths are UTF-8 and call appropriate Unicode APIs.

Changes compared to the previous LuaBinaries zip archive:

- Patched with UTF-8 support for loadfile, os.execute, etc.
- Built with VS 2015 (VCRUNTIME140.dll) instead of MinGW (MSVCRT.dll).
- Includes PDB file for lua52.dll
- Includes lua52.exe and luac52.exe with UTF-8 argv support (wmain).
- Includes build scripts, source files and README.md.
- Extra subdirectory named after the zip file.

These zip files are taken from https://github.com/Lekensteyn/lua-unicode
(the "prepared" source zips can be found here as well.)

Bug: 15118
Change-Id: I219f046d6e0fd5093287b5d6503a48ba7d1fc6a4
Reviewed-on: https://code.wireshark.org/review/31165
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>
13 months agoFix typo: aplications to applications
Jim Young [Sat, 29 Dec 2018 05:37:18 +0000 (00:37 -0500)]
Fix typo: aplications to applications

Change-Id: I14948f563a7638b5bd28f4450ffe1bd98a491e6a
Reviewed-on: https://code.wireshark.org/review/31243
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoAdd interface name when outputting packets dropped.
Michael Mann [Thu, 27 Dec 2018 16:34:09 +0000 (11:34 -0500)]
Add interface name when outputting packets dropped.

Add interface name (colon delimited) to SP_DROPS ('D') message so when dropped
packets are outputted, they include the interface name for clarity.

Bug: 13498
Change-Id: I68cdde4f20a574580f089dc5096d815cde5d3357
Reviewed-on: https://code.wireshark.org/review/31218
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
13 months agoSmall cleanups.
Guy Harris [Sat, 29 Dec 2018 03:26:03 +0000 (19:26 -0800)]
Small cleanups.

Get rid of an extra blank line in a comment.

Change another comment to refer to "error packets", as we do elsewhere.

Fix indentation.

Change-Id: I4d81b8856ea876f20914352f962b1df0e115404c
Reviewed-on: https://code.wireshark.org/review/31241
Reviewed-by: Guy Harris <guy@alum.mit.edu>
13 months agoFixed ASTERIX 6bit callsign decoding
Atli Guðmundsson [Fri, 28 Dec 2018 15:51:06 +0000 (15:51 +0000)]
Fixed ASTERIX 6bit callsign decoding

The callsign was being truncated to 7 letters.
This affects the following fields:
- I004/100#01.AN
- I004/170#08.MS1
- I004/170#08.MS2
- I025/020.SD
- asterix.AI, which is included in:
-- I021/170
-- I048/240
-- I062/245
-- I062/380#02
-- I062/380#03_v0_17

Change-Id: Idbbb3891d96e906053fc1f0c447e37bae87d207a
Reviewed-on: https://code.wireshark.org/review/31230
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
13 months agoCorrect PsId dissection in WSMP
Christophe GUERBER [Fri, 28 Dec 2018 19:15:22 +0000 (20:15 +0100)]
Correct PsId dissection in WSMP

Get rid of length determinant in the value returned for psid. Length
determinant is not part of the value.
This helps comparison with other protocols possibly containing a psid
also.

Change-Id: I2bd93bd6849f8bfa686f0574f05b0a65f587e4ad
Reviewed-on: https://code.wireshark.org/review/31235
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
13 months agoDNS: Use seconds as resolution for stat response time.
Michael Mann [Thu, 27 Dec 2018 19:54:34 +0000 (14:54 -0500)]
DNS: Use seconds as resolution for stat response time.

This keeps it in the same resolution as the dns.time field.

Ping-Bug: 15382
Change-Id: Ibacf8761819c0fac2e87fa147f7381336ce5cb39
Reviewed-on: https://code.wireshark.org/review/31223
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
13 months agoAllow floating point values for stats_tree
Michael Mann [Thu, 27 Dec 2018 19:47:02 +0000 (14:47 -0500)]
Allow floating point values for stats_tree

Bug: 4234
Change-Id: Ibd59809b2dd9890a7851eb57ef7af384e280a74b
Reviewed-on: https://code.wireshark.org/review/31222
Reviewed-by: Michael Mann <mmann78@netscape.net>
13 months agoGTPv2: fix dissection of APN IE
Pascal Quantin [Fri, 28 Dec 2018 09:38:44 +0000 (10:38 +0100)]
GTPv2: fix dissection of APN IE

The total maximum length of the APN with Network Identifier and Operator
Identifier is 100 bytes.

Bug: 15383
Change-Id: Ib74eac1f18f2235c2788e58370f50eeb9a678357
Reviewed-on: https://code.wireshark.org/review/31225
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
13 months agoNAS EPS: upgrade dissector to v15.5.0
Pascal Quantin [Fri, 28 Dec 2018 11:39:08 +0000 (12:39 +0100)]
NAS EPS: upgrade dissector to v15.5.0

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