metze/wireshark/wip.git
2 years agoMore information on the Windows Console and escape sequences.
Guy Harris [Mon, 8 Jan 2018 21:08:55 +0000 (13:08 -0800)]
More information on the Windows Console and escape sequences.

Change-Id: I8a57053658ef17d28c28c458e8fe5350332a953b
Reviewed-on: https://code.wireshark.org/review/25201
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2 years agoandroiddump: Fix crash in add_tcpdump_interfaces
Mikael Kanstrup [Mon, 8 Jan 2018 19:02:08 +0000 (20:02 +0100)]
androiddump: Fix crash in add_tcpdump_interfaces

If there's a network interface on the device without the 'flags'
field and at the same time exist other network interfaces
with the 'flags' field present a null-dereference happens accessing
the non-matched regex flags field.

Fix crash by adding explicit null check to ensure (optional) regex
group really matched.

Fixes: 7dcf57719f ("androiddump: Support older on-target tcpdump versions")

Change-Id: Ia08dd8547c9cdda96b3c62b99d98ff1d85bd6cd2
Reviewed-on: https://code.wireshark.org/review/25198
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoPoint to the MSDN blog post about 24-bit color support in cmd.exe.
Guy Harris [Mon, 8 Jan 2018 20:50:23 +0000 (12:50 -0800)]
Point to the MSDN blog post about 24-bit color support in cmd.exe.

Change-Id: Ic23f1d6ee35333ab4775970455f71315925f4cc6
Reviewed-on: https://code.wireshark.org/review/25200
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2 years agoUpdate a comment about Windows Console color support.
Gerald Combs [Mon, 8 Jan 2018 18:04:18 +0000 (10:04 -0800)]
Update a comment about Windows Console color support.

Change-Id: I39171a3c95ca48a39fbbc90ceadb9b1436f2402c
Reviewed-on: https://code.wireshark.org/review/25196
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoAdd a mutex for the protocol registration callback name.
Gerald Combs [Sun, 7 Jan 2018 17:30:04 +0000 (09:30 -0800)]
Add a mutex for the protocol registration callback name.

Fixes TSAN warnings on macOS.

Change-Id: I6cef7b49874011fd2da2c8dd15b59ce2ae08537a
Reviewed-on: https://code.wireshark.org/review/25185
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2 years ago[Thrift] Dissect Thrift over SSL.
AndersBroman [Mon, 8 Jan 2018 14:05:21 +0000 (15:05 +0100)]
[Thrift] Dissect Thrift over SSL.

Change-Id: Ifa7676decc3b853a41c16bd962a25da6ccfac7c7
Reviewed-on: https://code.wireshark.org/review/25193
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoOSPF: Dissect LS Type bytes of OSPFv3 LS Request
Uli Heilmeier [Sun, 7 Jan 2018 14:30:37 +0000 (15:30 +0100)]
OSPF: Dissect LS Type bytes of OSPFv3 LS Request

Dissecting of LS Types bytes for LS Requests was missing.
Dissecting of LS Types bytes for LS Acknowledgments have been implemented.

Bug: 14310
Change-Id: I13d5b564a1e97f0c5a33c749273b11f94c90cbc0
Reviewed-on: https://code.wireshark.org/review/25183
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years ago[Kingfisher] Include extra function types to allow dissection of additional messages
Will Robertson [Mon, 8 Jan 2018 08:23:29 +0000 (19:23 +1100)]
[Kingfisher] Include extra function types to allow dissection of additional messages

Change-Id: I6a2c17785ea58a1c0661bee5879099bc838f6bc3
Reviewed-on: https://code.wireshark.org/review/25191
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoBugfix the sort order of protocols in Preference dialog.
Michael Mann [Sun, 7 Jan 2018 02:40:19 +0000 (21:40 -0500)]
Bugfix the sort order of protocols in Preference dialog.

Sort properly by module title.

Also consolidate some of the searching in PrefModuleTreeView.

Change-Id: I5312581c63f8626de08bd9f03613219b34bf968a
Reviewed-on: https://code.wireshark.org/review/25176
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agotetra: Capitalize protocol short name
Stig Bjørlykke [Mon, 8 Jan 2018 08:26:29 +0000 (09:26 +0100)]
tetra: Capitalize protocol short name

Change-Id: I8287c4492b9eab087b98820f7bd69b1bbe3b66fa
Reviewed-on: https://code.wireshark.org/review/25190
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2 years agochargen: Capitalize protocol short name
Stig Bjørlykke [Mon, 8 Jan 2018 08:26:25 +0000 (09:26 +0100)]
chargen: Capitalize protocol short name

Change-Id: I26b938a44e696fafb715eb30f2e6780ec812fb2f
Reviewed-on: https://code.wireshark.org/review/25189
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2 years agoextcap: remove conditional compilation.
Dario Lombardo [Sat, 6 Jan 2018 20:39:26 +0000 (21:39 +0100)]
extcap: remove conditional compilation.

Change-Id: Ia54bba388755cf27a343fe6d69d244bf1ab897f9
Reviewed-on: https://code.wireshark.org/review/25186
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoCDP: Resolve 802.2 Protocol type protocols, show IPv6
Uli Heilmeier [Fri, 5 Jan 2018 21:58:49 +0000 (22:58 +0100)]
CDP: Resolve 802.2 Protocol type protocols, show IPv6

Protocols of protocol type 802.2 (PT = 2) are encoded with the
"normal" ethernet type when PT length == 8.

Used reference: https://docs.fd.io/vpp/17.10/d2/d71/cdp__protocol_8h_source.html

Show IPv6 addresses as IPv6 and not as bytes.

Change-Id: I0f192e758bcc1a562f042609fa5d0d9527551bb8
Bug: 14311
Reviewed-on: https://code.wireshark.org/review/25168
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoZigBee: Enable heuristic dissection of Tunneling cluster payload
Kenneth Soerensen [Sun, 7 Jan 2018 09:52:59 +0000 (10:52 +0100)]
ZigBee: Enable heuristic dissection of Tunneling cluster payload

The Smart Energy Tunneling cluster can carry various payloads.
The type of payload is determined when the tunnel is established.
However, we cannot be sure to capture the tunnel establishment and
therefore heuristics are used to determine the payload type.

The IP protocol is added as a heuristic dissector because the
specification allows IP in the tunnel payload. However, the only
real life payload type I am aware of is GBCS messages in
UK Smart Metering (https://smartenergycodecompany.co.uk).

Finally, if a heuristic dissector cannot be found, the Data
dissector is used.

Change-Id: I4942bf00d0d0efe7047db6494cd4f8a9d19c96b6
Reviewed-on: https://code.wireshark.org/review/25181
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years ago[Automatic update for 2018-01-07]
Gerald Combs [Sun, 7 Jan 2018 08:16:04 +0000 (08:16 +0000)]
[Automatic update for 2018-01-07]

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

Change-Id: I65801bc1440f64c28ee003e23be2ca528bc1adc8
Reviewed-on: https://code.wireshark.org/review/25178
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2 years agoDo SMB_COM_SEARCH or SMB_COM_FIND results ever have a Unicode file name?
Guy Harris [Sun, 7 Jan 2018 03:02:16 +0000 (19:02 -0800)]
Do SMB_COM_SEARCH or SMB_COM_FIND results ever have a Unicode file name?

Change-Id: I11d3091bdaa7d4ecff66c238e45b265a57ef1af7
Reviewed-on: https://code.wireshark.org/review/25177
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2 years agoSet captures preferences for PREF_EFFECT_CAPTURE.
Michael Mann [Sat, 6 Jan 2018 17:10:06 +0000 (12:10 -0500)]
Set captures preferences for PREF_EFFECT_CAPTURE.

This is a simple example of changing preferences that don't
affect dissection to something else, so that changing them
doesn't cause a file to be redissected unnecessarily

Change-Id: I77c64c739e8bbc9f2a202f744f27cb07be4a822b
Reviewed-on: https://code.wireshark.org/review/25173
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoNote that the object size type is, in effect, size_t.
Guy Harris [Sat, 6 Jan 2018 23:32:25 +0000 (15:32 -0800)]
Note that the object size type is, in effect, size_t.

We currently accumulate all of the object data in memory, so we can't
support objects whose size doesn't fit in a size_t; that means the
maximum object size is 2^32-1 bytes on ILP32 platforms, even though we
allow the size to be up to 2^63-1 bytes.

Change-Id: I2b45f2f1a6a4a68c97d34931aea6f5294db41b6e
Reviewed-on: https://code.wireshark.org/review/25174
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2 years agoWLAN stats: make filter + apply button work
Martin Mathieson [Sat, 6 Jan 2018 00:01:30 +0000 (00:01 +0000)]
WLAN stats: make filter + apply button work

Also export as text just the networks.
Change-Id: I228d65cb219792a70c6077932dbe9cf65b92eb6e
Reviewed-on: https://code.wireshark.org/review/25169
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2 years agoAdd ability for preferences to determine what they can change.
Michael Mann [Sat, 6 Jan 2018 04:39:55 +0000 (23:39 -0500)]
Add ability for preferences to determine what they can change.

Add flags field to preference structure to help determine what
areas of Wireshark are affected by a preference changing.  The
intent is to be able to distinguish dissection from GUI or other
changes that are not dissection.

The default is to have all preferences affect dissection, but their
flags can be changed.  This patch doesn't change any flags from the
default.

Change-Id: Ied5ae961bc3f33f5b730b2892fff3fa0898380b8
Reviewed-on: https://code.wireshark.org/review/25171
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoTShark: Fix color handling on Windows.
Gerald Combs [Fri, 5 Jan 2018 23:40:19 +0000 (15:40 -0800)]
TShark: Fix color handling on Windows.

Use SetConsoleTextAttribute to reset our colors on Windows. Update the
release notes and man page.

Change-Id: I2bc309787f9c2331324503092bd1c9ae6360eb55
Reviewed-on: https://code.wireshark.org/review/25170
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>
2 years agobluetooth: Group Bluetooth dissector preferences
Stig Bjørlykke [Fri, 5 Jan 2018 13:00:44 +0000 (14:00 +0100)]
bluetooth: Group Bluetooth dissector preferences

Change-Id: Ib5360fcbfd8f6b2aee6b33ec7d9dc77362feb50e
Reviewed-on: https://code.wireshark.org/review/25162
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoRRC: Fix direction values
Nick James [Sat, 6 Jan 2018 09:44:42 +0000 (11:44 +0200)]
RRC: Fix direction values

Values were swapped: uplink is 0, downlink is 1.

Change-Id: I30dbb6d89ea832741c3ce4a319be1cb261b1565b
Reviewed-on: https://code.wireshark.org/review/25143
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2 years agoDiameter: fix retrieval of message flags
Pascal Quantin [Fri, 5 Jan 2018 16:03:08 +0000 (17:03 +0100)]
Diameter: fix retrieval of message flags

Bug introduced in g7ade1695ba

Change-Id: I83e2c2df4f7764130ebe342170f40de5e7610611
Reviewed-on: https://code.wireshark.org/review/25164
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2 years agowireshark_preference.cpp: rework comments to please MSVC2015
Pascal Quantin [Fri, 5 Jan 2018 17:09:51 +0000 (18:09 +0100)]
wireshark_preference.cpp: rework comments to please MSVC2015

Change-Id: Ic7a1f51df833e8aec7555f796e9a86f1d120cdc1
Reviewed-on: https://code.wireshark.org/review/25165
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2 years agoQt: Fix windows version of Preference Dialog
Roland Knall [Fri, 5 Jan 2018 14:21:17 +0000 (15:21 +0100)]
Qt: Fix windows version of Preference Dialog

Initializing a static member on Windows C++ has to be done differently.

This fixes the segfault introduced with Ia611ec192dcc1ad638a997182cec1ab5bdb7859c

Change-Id: Ib7a9840feda74830f835345c666f57e23e9e4e0b
Reviewed-on: https://code.wireshark.org/review/25163
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoNAS EPS: upgrade dissector to v15.1.0
Pascal Quantin [Fri, 5 Jan 2018 11:43:51 +0000 (12:43 +0100)]
NAS EPS: upgrade dissector to v15.1.0

Change-Id: I0ea263b693910c1d8036a18e612c1daf538482dd
Reviewed-on: https://code.wireshark.org/review/25161
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2 years agoctdb: check return value from wmem_tree_lookup32_array (CID: 1073824).
Dario Lombardo [Wed, 3 Jan 2018 12:50:46 +0000 (13:50 +0100)]
ctdb: check return value from wmem_tree_lookup32_array (CID: 1073824).

Change-Id: I0f504ea8ab0608e41566996d380b05ca5d77e3c4
Reviewed-on: https://code.wireshark.org/review/25160
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoerf: remove redundant check (CID: 1159076).
Dario Lombardo [Wed, 27 Dec 2017 21:17:51 +0000 (22:17 +0100)]
erf: remove redundant check (CID: 1159076).

This check has been alreay done in line 433: since then packet_size
is only decreased, then the check is redudant.

Change-Id: I8ede5c733867ccc98ab2d470181d1e4a29ae5b49
Reviewed-on: https://code.wireshark.org/review/25023
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoOpenFlow 1.5: fix port_stats dissector
Laszlo Papp [Wed, 3 Jan 2018 13:51:32 +0000 (13:51 +0000)]
OpenFlow 1.5: fix port_stats dissector

Change-Id: Id8f078d9f9c327f3e9c2b50daaf23639cad1ae8f
Reviewed-on: https://code.wireshark.org/review/25157
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years ago[SBC-AP] Update to 3GPP TS 29.168 V14.2.0 (2017-12)
AndersBroman [Fri, 5 Jan 2018 09:55:03 +0000 (10:55 +0100)]
[SBC-AP] Update to 3GPP TS 29.168 V14.2.0 (2017-12)

Change-Id: I84c178c01cfa6d3765d672d6ebbb842e4de55f26
Reviewed-on: https://code.wireshark.org/review/25156
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQt: Add manager for preference dialog
Michael Mann [Fri, 29 Dec 2017 16:23:07 +0000 (11:23 -0500)]
Qt: Add manager for preference dialog

Abstract out the different types of preferences into a visitor
and factory pattern to handle the preference dialog.

Change-Id: Ia611ec192dcc1ad638a997182cec1ab5bdb7859c
Reviewed-on: https://code.wireshark.org/review/25142
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2 years agoQt: Bring back correct profile_status font size
Stig Bjørlykke [Fri, 5 Jan 2018 10:31:21 +0000 (11:31 +0100)]
Qt: Bring back correct profile_status font size

The refactoring in ga79b7986 did not preserve the font size
for the profile name in the status bar.

Change-Id: If38224a43043dd572992836b6fe78f1829f9cccd
Reviewed-on: https://code.wireshark.org/review/25159
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2 years agobtsmp: Put <none> in COL_INFO when having no keys
Stig Bjørlykke [Fri, 5 Jan 2018 08:58:39 +0000 (09:58 +0100)]
btsmp: Put <none> in COL_INFO when having no keys

Change-Id: If2db9fa1894f586523df882dca224b3b7b0eecb0
Reviewed-on: https://code.wireshark.org/review/25153
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2 years agobtatt: Avoid duplicate "Handle:" in COL_INFO
Stig Bjørlykke [Fri, 5 Jan 2018 08:45:20 +0000 (09:45 +0100)]
btatt: Avoid duplicate "Handle:" in COL_INFO

Do not add two "Handle:" in COL_INFO for opcode "Error Response".

Change-Id: I13dd5fc3bbef1762c2e868dfe885fa5d6437412e
Reviewed-on: https://code.wireshark.org/review/25152
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2 years agoieee1905: Fix a bunch of issues after testing and spec changes.
Richard Sharpe [Thu, 4 Jan 2018 03:31:30 +0000 (19:31 -0800)]
ieee1905: Fix a bunch of issues after testing and spec changes.

Change-Id: I8f61ed9866760d13daa0cc65c2a771da3dcf280f
Reviewed-on: https://code.wireshark.org/review/25151
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQt: Byte view recent updates.
Gerald Combs [Wed, 3 Jan 2018 21:29:55 +0000 (13:29 -0800)]
Qt: Byte view recent updates.

Add a recent.gui_bytes_encoding preference and use it for the byte view
encoding as requested in bug 14044.

The recent.gui_bytes_view preference is an enum, so make it one.

Bug: 14044
Change-Id: Ibc40721c29465aca1940467e41d71e9dd2485e71
Reviewed-on: https://code.wireshark.org/review/25147
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2 years agoOpenFlow 1.4: fix port_stats dissector
Laszlo Papp [Wed, 3 Jan 2018 13:51:32 +0000 (13:51 +0000)]
OpenFlow 1.4: fix port_stats dissector

Change-Id: I3ebe1590b9d5fd864746339612ac1396c13196b9
Reviewed-on: https://code.wireshark.org/review/25128
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQUIC: Add Payload (length and data) of PING frame (draft-08)
Alexis La Goutte [Thu, 4 Jan 2018 21:29:26 +0000 (22:29 +0100)]
QUIC: Add Payload (length and data) of PING frame (draft-08)

Bug: 13881
Change-Id: I44a924da6e8da52bdee0f397545d504aee5290bc
Reviewed-on: https://code.wireshark.org/review/25145
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQUIC: Dissect Version Negotiation of draft-08
Alexis La Goutte [Wed, 3 Jan 2018 19:15:24 +0000 (20:15 +0100)]
QUIC: Dissect Version Negotiation of draft-08

If on Long Header, the version field is set to 0x00000000, it is a version Negotiation Packet
with the list of all supported version (with some GREASE)

Bug: 13881
Change-Id: I56b7cecd112950fb557aadc434f367b74eebe07b
Reviewed-on: https://code.wireshark.org/review/25138
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQUIC: Display Connection in hex on Short Header too
Alexis La Goutte [Wed, 3 Jan 2018 19:09:47 +0000 (20:09 +0100)]
QUIC: Display Connection in hex on Short Header too

Bug: 13881
Change-Id: Ifc6e4b7be78fe00fce780e002dd77d67f17ebdaf
Reviewed-on: https://code.wireshark.org/review/25137
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQUIC: Fix Connection ID flag with draft-08
Alexis La Goutte [Wed, 3 Jan 2018 19:07:41 +0000 (20:07 +0100)]
QUIC: Fix Connection ID flag with draft-08

With draft-08 Connection ID is changed to Omit Connection ID in Short Header frame

Bug: 13881
Change-Id: I9e53dc370ea692636143d2129754a3dc62d068bd
Reviewed-on: https://code.wireshark.org/review/25136
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQt: Move sized toolbar images to stock_icons.
Gerald Combs [Thu, 21 Dec 2017 23:06:20 +0000 (15:06 -0800)]
Qt: Move sized toolbar images to stock_icons.

The sized (WWxHH) icons in the toolbar directory aren't limited to
toolbars. Create a "stock_icons" directory and move them and their
related SVGs there.

Change-Id: I2c1852499594aa738371c79542f24bd3351653bb
Reviewed-on: https://code.wireshark.org/review/25133
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoQt: Cleanup cases where QTreeWidgetItem is no longer used
Michael Mann [Thu, 4 Jan 2018 22:24:05 +0000 (17:24 -0500)]
Qt: Cleanup cases where QTreeWidgetItem is no longer used

Change-Id: Ib2b6d4f73a6c9f1dacb728f6275a240487a73a02
Reviewed-on: https://code.wireshark.org/review/25149
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoAdd an exit code to make-dissectors.
Gerald Combs [Thu, 4 Jan 2018 23:04:18 +0000 (15:04 -0800)]
Add an exit code to make-dissectors.

Explicitly return 0 from make-dissectors on success. Hopefully this will
fix some Windows builder failures.

Change-Id: I0c172597584c52ced2380719135e8559ef83392a
Reviewed-on: https://code.wireshark.org/review/25150
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2 years agoQt: Reexpand dissector table and enabled protocol trees when dialog is searched.
Michael Mann [Thu, 4 Jan 2018 21:57:01 +0000 (16:57 -0500)]
Qt: Reexpand dissector table and enabled protocol trees when dialog is searched.

If search text ends up with no results, the tree is cleared.  When the search
text is removed, it results in all but main leaf being collapsed.  Restore
the search tree to its default state after any search text has been entered.

Change-Id: Id7d1a4fcb4355c6e2551cf3dfd300e26bf683ca3
Reviewed-on: https://code.wireshark.org/review/25148
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agonfs: Add the second version of the Primary Data NFSv4 file handle dissector
Tom Haynes [Thu, 4 Jan 2018 06:19:30 +0000 (22:19 -0800)]
nfs: Add the second version of the Primary Data NFSv4 file handle dissector

Change-Id: I05da9a546f5de81783e4c9d004aff7dbb3ead44b
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Reviewed-on: https://code.wireshark.org/review/25146
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoPre-commit: Don't force whitespace checks everywhere.
Gerald Combs [Thu, 4 Jan 2018 20:34:22 +0000 (12:34 -0800)]
Pre-commit: Don't force whitespace checks everywhere.

Move the whitespace check (git diff-index --check --cached) inside the
CHECK_FILES loop, otherwise editing SVGs with Inkscape will be much less
convenient.

Change-Id: I2b9e3575d54091572caa89e3e317e5e121984010
Reviewed-on: https://code.wireshark.org/review/25144
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2 years agoConvert preference dialog to use more models.
Michael Mann [Fri, 29 Dec 2017 16:23:07 +0000 (11:23 -0500)]
Convert preference dialog to use more models.

Convert Advanced view and Modules view to use a single base model,
loading the preferences once and then filter and display what they
need with QSortFilterProxyModel derived classes.

Convert the PreferencePane "types" to just strings.  This allows
a more straightforward relationship between the "special" modules
that need custom widgets for preference manipulation and it also
removes dependency on preferences_dialog.h for many files.

Change-Id: I091deb3061564aa4d1564e9ca1c792715961b083
Reviewed-on: https://code.wireshark.org/review/25134
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2 years agoQt: Redesign profile menu in status bar
Roland Knall [Thu, 4 Jan 2018 14:55:33 +0000 (15:55 +0100)]
Qt: Redesign profile menu in status bar

Remove global variables and move menu to where it is created.
Additionally exchange LabelStack with ClickableLable, as it
was overkill.

Change-Id: I04528b707e9e491d0dd43063f5a47b08dfdb3471
Reviewed-on: https://code.wireshark.org/review/25140
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2 years ago[Diameter] Use proto_tree_add_item_ret..() and proto_tree_add_bitmask_with_flags()
Anders [Thu, 4 Jan 2018 13:14:43 +0000 (14:14 +0100)]
[Diameter] Use proto_tree_add_item_ret..() and proto_tree_add_bitmask_with_flags()

Change-Id: I864a385283aa6975a075f8621d871b73356ecf57
Reviewed-on: https://code.wireshark.org/review/25139
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQt: add conditional compilation in switches.
Dario Lombardo [Wed, 3 Jan 2018 14:05:03 +0000 (15:05 +0100)]
Qt: add conditional compilation in switches.

Compiling without pcap, the lack of all the cases causes an error.

../ui/qt/main_window_slots.cpp:756:13: error: enumeration values 'Capture',
'Update', and 'Fixed' not handled in switch [-Werror,-Wswitch]
    switch (ev->captureContext()) {
            ^
1 error generated.

Change-Id: I36c0bc854b1d864ebf54ac59ca15743918bc7d2b
Reviewed-on: https://code.wireshark.org/review/25127
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2 years agobtatt: Support BBC micro:bit Bluetooth profile
Stig Bjørlykke [Thu, 4 Jan 2018 08:26:20 +0000 (09:26 +0100)]
btatt: Support BBC micro:bit Bluetooth profile

Change-Id: I32e47e1eef57bb5f8e15e8d83219d6ab034bab73
Reviewed-on: https://code.wireshark.org/review/25135
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQt: Fix capture file properties averages.
Gerald Combs [Wed, 3 Jan 2018 16:49:57 +0000 (08:49 -0800)]
Qt: Fix capture file properties averages.

Round our average packet sizes to the nearest whole number as described
in bug 9836 and change 687.

Change-Id: I842eca7650d19be66eb35c40a886bd591a86650d
Reviewed-on: https://code.wireshark.org/review/25129
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2 years agobacapp: Add more enumerated values
Dirk Römmen [Wed, 3 Jan 2018 20:55:43 +0000 (21:55 +0100)]
bacapp: Add more enumerated values

Ping-Bug: 12457
Change-Id: Ie97747704b12a0ba70bb6adb1a8c251dfcaca08f
Reviewed-on: https://code.wireshark.org/review/25132
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years ago3GPP NAS: upgrade dissector to v15.1.0
Pascal Quantin [Wed, 3 Jan 2018 18:22:38 +0000 (19:22 +0100)]
3GPP NAS: upgrade dissector to v15.1.0

Change-Id: Ibfbed335d842e53eabce36e2955a9bb2790d46fb
Reviewed-on: https://code.wireshark.org/review/25131
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2 years agowsutil: return false if NULL is asked as profile name (CID: 1405202).
Dario Lombardo [Wed, 3 Jan 2018 11:08:49 +0000 (12:08 +0100)]
wsutil: return false if NULL is asked as profile name (CID: 1405202).

Better not rely on the fact that the caller won't pass NULL. A NULL
profile would be lead to a wrong behaviour.

Change-Id: I281f0d2364af9f7b78268580dd73024b07bcba83
Reviewed-on: https://code.wireshark.org/review/25124
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2 years agobthci: Update bthci_cmd_appearance_vals
Stig Bjørlykke [Wed, 3 Jan 2018 11:14:41 +0000 (12:14 +0100)]
bthci: Update bthci_cmd_appearance_vals

Change-Id: I385808b95f823a2242844173927cc6abd05c1905
Reviewed-on: https://code.wireshark.org/review/25125
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2 years ago[glib-compat] Include <wsutil/glib-compat.h>
Anders [Wed, 3 Jan 2018 10:38:34 +0000 (11:38 +0100)]
[glib-compat] Include <wsutil/glib-compat.h>

Change-Id: Id505f1dc8dbbeb241162156fc3ef557599a251fb
Reviewed-on: https://code.wireshark.org/review/25123
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agodcerpc-spoolss: use value_name variable to store string (CID: 1158734).
Dario Lombardo [Fri, 29 Dec 2017 18:26:11 +0000 (19:26 +0100)]
dcerpc-spoolss: use value_name variable to store string (CID: 1158734).

Change-Id: I30780134b3d8a8e48b8b4997ea27ce82171b4508
Reviewed-on: https://code.wireshark.org/review/25069
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agowireshark-qt(.cpp): fix no previous declaration for ‘void g_log_message_handler(QtMsg...
Alexis La Goutte [Wed, 3 Jan 2018 09:57:19 +0000 (09:57 +0000)]
wireshark-qt(.cpp): fix no previous declaration for ‘void g_log_message_handler(QtMsgType, const QMessageLogContext&, const QString&)’ [-Wmissing-declarations]

Change-Id: Ia08cf5a03be10b8553516196e24d51e5f48934a7
Reviewed-on: https://code.wireshark.org/review/25122
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years ago[SIP] Use proto_tree_add_item_ret_string() to get the method string.
Anders [Tue, 2 Jan 2018 14:35:44 +0000 (15:35 +0100)]
[SIP] Use proto_tree_add_item_ret_string() to get the method string.

Change-Id: I8c1933d17a613917c6b6482199949e103c3d1eaf
Reviewed-on: https://code.wireshark.org/review/25112
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQUIC: Enhance *BLOCKED* frame
Alexis La Goutte [Wed, 3 Jan 2018 07:30:08 +0000 (08:30 +0100)]
QUIC: Enhance *BLOCKED* frame

Add new offset field in BLOCKED and STREAM_BLOCKED frame
Add new stream_id field in STREAM_ID_BLOCKED

Bug: 13881
Change-Id: If030728c46607ea9ea3a500d925b30aaf9a841a8
Reviewed-on: https://code.wireshark.org/review/25121
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoTLS(QUIC): Enhance MAX_STREAM_ID parameter (from draft-08)
Alexis La Goutte [Wed, 3 Jan 2018 07:16:45 +0000 (08:16 +0100)]
TLS(QUIC): Enhance MAX_STREAM_ID parameter (from draft-08)

MAX_STREAM_ID is rename to MAX_STREAM_ID_BIDI
and there is a new paramter MAX_STREAM_ID_UNI

Bug: 13881
Change-Id: I99bcc559a133ded88f4caedd887f481147063496
Reviewed-on: https://code.wireshark.org/review/25120
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoTLS(QUIC): Add ACK_delay_exponent parameter from draft-07
Alexis La Goutte [Wed, 3 Jan 2018 07:04:43 +0000 (08:04 +0100)]
TLS(QUIC): Add ACK_delay_exponent parameter from draft-07

Bug: 13881
Change-Id: I56ac681174e4058c4d4fefe40084905538222c1b
Reviewed-on: https://code.wireshark.org/review/25119
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQUIC(TLS): Fix length of parameter tree
Alexis La Goutte [Wed, 3 Jan 2018 06:53:20 +0000 (07:53 +0100)]
QUIC(TLS): Fix length of parameter tree

Bug: 13881
Change-Id: I583c9290c5e4d2aaefc2d3ae09babfa82dfbd299
Reviewed-on: https://code.wireshark.org/review/25118
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQt: Use switch/case in MainWindow::captureEventHandler
Stig Bjørlykke [Wed, 3 Jan 2018 09:38:13 +0000 (10:38 +0100)]
Qt: Use switch/case in MainWindow::captureEventHandler

Change-Id: I765667465e08ec51a107edbee3c2026a52cacb74
Reviewed-on: https://code.wireshark.org/review/25117
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2 years ago[BTMESH] Dissect more of Upper transport Layer.
Anders [Tue, 2 Jan 2018 16:30:38 +0000 (17:30 +0100)]
[BTMESH] Dissect more of Upper transport Layer.

Change-Id: I5d33c64a57689939c9915336701accba8b893415
Reviewed-on: https://code.wireshark.org/review/25115
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQt: Fix CaptureEvent::Reload event handling
Stig Bjørlykke [Wed, 3 Jan 2018 09:00:39 +0000 (10:00 +0100)]
Qt: Fix CaptureEvent::Reload event handling

Fix an error introduced in signal/slot redesign in gd5d81518.

This error disabled all capture file menu items after doing a rescan,
like when adding a display filter.

Change-Id: Ib468051c15b9f1a15faa2ed07b958340b82a662b
Reviewed-on: https://code.wireshark.org/review/25116
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2 years agogitlab-ci: install ninja-build using debian script.
Dario Lombardo [Tue, 2 Jan 2018 14:38:25 +0000 (15:38 +0100)]
gitlab-ci: install ninja-build using debian script.

Change-Id: I5bf1f1ea36f970be4ccf1a11b3da4198f83a6e68
Reviewed-on: https://code.wireshark.org/review/25114
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2 years agows_pipe: fix format error for size_t buffer_size
Uli Heilmeier [Tue, 2 Jan 2018 11:11:08 +0000 (12:11 +0100)]
ws_pipe: fix format error for size_t buffer_size

Fix error: format '%ld' expects argument of type 'long int', but argument 4 has type 'size_t'

Change-Id: I86ec4076bb7e8c11d5cf82187a46a528bf43c514
Reviewed-on: https://code.wireshark.org/review/25109
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2 years ago[NAS-EPS] 5G NAS EPS network feature supported and capability info update.
Anders [Tue, 2 Jan 2018 13:06:30 +0000 (14:06 +0100)]
[NAS-EPS] 5G NAS EPS network feature supported and capability info update.

Change-Id: I243b52e8c448541636f3f94007ee3d850a5811ab
Reviewed-on: https://code.wireshark.org/review/25111
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agowsutil: Add missing include
Roland Knall [Tue, 2 Jan 2018 12:23:08 +0000 (13:23 +0100)]
wsutil: Add missing include

Otherwise gboolean is undeclared in files depending on the functionality,
like extcap.c for instance

Change-Id: I329715b2bb7bfd5d12ce3f1a035ecda6dff16a2d
Reviewed-on: https://code.wireshark.org/review/25110
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2 years agopacket-mq: Fix after change 25009
Robert Grange [Tue, 2 Jan 2018 09:17:09 +0000 (10:17 +0100)]
packet-mq: Fix after change 25009

Fix for unused variable mq_MQPRI_vals
Fix test when displaying unique MQ Segment (vs multi MQ segment)
Changed my name in AUTHORS

Change-Id: I8ffa5523dbf8469d2814d2a90348eea61a05823a
Reviewed-on: https://code.wireshark.org/review/25106
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2 years agobtatt: Remove custom UUID dissectors from btatt.handle DecodeAs
Stig Bjørlykke [Tue, 2 Jan 2018 09:30:41 +0000 (10:30 +0100)]
btatt: Remove custom UUID dissectors from btatt.handle DecodeAs

Do not add custom UUID dissectors to the DecodeAs "btatt.handle"
table because it does not work to DecodeAs this attributes using
the "BT ATT Handle" field.

This removes some of the artificial protocols which is generated
from BT attributes, and avoids adding new ones when extending
the custom UUID dissection support.

Change-Id: I8384a56b49cac2ea64508470d67c67b6ec7cd13e
Reviewed-on: https://code.wireshark.org/review/25107
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoBuild: Fix Ubuntu moc build
Roland Knall [Tue, 2 Jan 2018 10:19:55 +0000 (11:19 +0100)]
Build: Fix Ubuntu moc build

Includepaths for moc where not correctly applied

Change-Id: I1e3df133736372f3e4139957dc2e426f51764c86
Reviewed-on: https://code.wireshark.org/review/25108
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2 years agoQUIC: use varint for all type (draft-08)
Alexis La Goutte [Sun, 31 Dec 2017 15:02:12 +0000 (16:02 +0100)]
QUIC: use varint for all type (draft-08)

Bug: 13881
Change-Id: Ia68659fed9b884bd99de8179e4a320089920df4d
Reviewed-on: https://code.wireshark.org/review/25088
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agomq: DEF_VALSB(MQPRI) is still unused
Stig Bjørlykke [Tue, 2 Jan 2018 08:07:22 +0000 (09:07 +0100)]
mq: DEF_VALSB(MQPRI) is still unused

Change-Id: I269c2f367d1d65b006ad881976085dbdf983c407
Reviewed-on: https://code.wireshark.org/review/25105
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2 years agotfshark: Fix arguments to write_pdml_proto_tree
Stig Bjørlykke [Tue, 2 Jan 2018 08:05:19 +0000 (09:05 +0100)]
tfshark: Fix arguments to write_pdml_proto_tree

Change-Id: Iae6b7940213ea702d72870f1f27c694fd41ba983
Ping-Bug: 13020
Reviewed-on: https://code.wireshark.org/review/25104
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2 years agonxp802154: Remove unused code
Stig Bjørlykke [Mon, 1 Jan 2018 22:38:13 +0000 (23:38 +0100)]
nxp802154: Remove unused code

The IEEE 802.15.4 dissector is built-in and will never be not present,
and if disabled then call_dissector() will call data handle.

Change-Id: Ie8d2a1bed1ba540df1a5bc239b57e475b346c8f1
Reviewed-on: https://code.wireshark.org/review/25103
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQUIC: Add new ACK type (0x0e) of draft-08
Alexis La Goutte [Sun, 31 Dec 2017 09:58:09 +0000 (10:58 +0100)]
QUIC: Add new ACK type (0x0e) of draft-08

Bug: 13881
Change-Id: I7340c6cf2c149cbc547133ea89083c75a5ad05f1
Reviewed-on: https://code.wireshark.org/review/25084
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQUIC: Add decrypt Handshake Packet
Alexis La Goutte [Sun, 31 Dec 2017 07:51:42 +0000 (08:51 +0100)]
QUIC: Add decrypt Handshake Packet

From/to Server/Client

Store the port destination to found key need to be used

Change-Id: If7f2edcdb21f5b5aa9de28431db8dc3ec6d76602
Reviewed-on: https://code.wireshark.org/review/25083
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoTLS(QUIC): update TransportParameter to draft-08
Alexis La Goutte [Wed, 27 Dec 2017 21:10:33 +0000 (22:10 +0100)]
TLS(QUIC): update TransportParameter to draft-08

not longer negotiated version on Client Hello but on encrypted extensions

Missing add new TransportParameterId (ack_delay_exponent and initial_max_stream_id_uni)

Bug: 13881
Change-Id: I5d76662b8c7767c48fdec460e2249d49c6693f18
Reviewed-on: https://code.wireshark.org/review/25018
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQUIC: Add new STREAM type (0x10 to 0x17) of draft-08
Alexis La Goutte [Sun, 24 Dec 2017 14:03:58 +0000 (15:03 +0100)]
QUIC: Add new STREAM type (0x10 to 0x17) of draft-08

using varint for Stream ID/Offset/Length

Bug: 13881
Change-Id: I9c9524e494e6cb8785d919fee596f94401b12fed
Reviewed-on: https://code.wireshark.org/review/24991
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoAdd ENC_VARINT_QUIC
Alexis La Goutte [Sun, 24 Dec 2017 07:29:50 +0000 (08:29 +0100)]
Add ENC_VARINT_QUIC

Used to support variable length in QUIC protocol

Bug: 13881
Change-Id: Ia274b1530152376c5fb4e364fc4cf5ab246be1b3
Reviewed-on: https://code.wireshark.org/review/24990
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Craig Jackson <cejackson51@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoAdd columns (_ws.col) to output formats json, ek, pdml
Merlin Chlosta [Thu, 21 Dec 2017 13:58:07 +0000 (14:58 +0100)]
Add columns (_ws.col) to output formats json, ek, pdml

Bug: 13020
Change-Id: Ia83797a4e390be7cc59a9718735edc1c7f9a5712
Reviewed-on: https://code.wireshark.org/review/24928
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agopacket-mq: Improve display of ID Struct + Segmented Msgs
Robert Grange [Wed, 27 Dec 2017 07:17:19 +0000 (08:17 +0100)]
packet-mq: Improve display of ID Struct + Segmented Msgs

Improve display of ID Struct for FAP Lvl 13
Improve display for Segmented MQ Mesages
Add also the ReasonCode of the ASYNCH_MESSAGE in column and tre node
Added various new CONST for display

Change-Id: I458296e466d0744627e0b4f645d634b0c6d930de
Reviewed-on: https://code.wireshark.org/review/25009
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoandroiddump: Support older on-target tcpdump versions
Florian Bezold [Thu, 7 Dec 2017 07:54:41 +0000 (08:54 +0100)]
androiddump: Support older on-target tcpdump versions

The output of 'tcpdump -D' only outputs interface flags from Android 7
onwards. Since it would be sad to lose the great androiddump support for
all older devices because of this, the logic is extended so that it
lists all interfaces if no '[' and ']' is found in the output.

Also, the used regex seemed to require an interface description, which
might not exist (even with new tcpdump versions). Now, interfaces
without description are not filtered.

Change-Id: I92b550a37b9bc0d0142aed68ee98f26de79be759
Reviewed-on: https://code.wireshark.org/review/24720
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>
2 years agoLNET: Fix gcc 7 compiler complaints
Michael Mann [Mon, 1 Jan 2018 19:11:26 +0000 (14:11 -0500)]
LNET: Fix gcc 7 compiler complaints

Change-Id: Idad6411139226cb6694b8dad5cb2107882f90848
Reviewed-on: https://code.wireshark.org/review/25102
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>
2 years agows_pipe: provide a null terminated string anyway (CID: 1364684).
Dario Lombardo [Fri, 29 Dec 2017 19:07:24 +0000 (20:07 +0100)]
ws_pipe: provide a null terminated string anyway (CID: 1364684).

Change-Id: I4143b499986cbd31db524db73dde72ddbe26077d
Reviewed-on: https://code.wireshark.org/review/25072
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agodmp: rework build_national_strings() to avoid read/write overrun.
Dario Lombardo [Fri, 29 Dec 2017 22:00:50 +0000 (23:00 +0100)]
dmp: rework build_national_strings() to avoid read/write overrun.

CID: 1417455
CID: 1417459

Change-Id: Idb63e21608825562f61c445309c1b95bb5b3692c
Reviewed-on: https://code.wireshark.org/review/25075
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoIPv6: Add segmentation offload (TSO) support
Uli Heilmeier [Sun, 17 Dec 2017 17:40:17 +0000 (18:40 +0100)]
IPv6: Add segmentation offload (TSO) support

When capturing on hardware with segmentation offload enabled IPv6
payload size can be reported as zero.

This commit adds a preference to dissect such frames.

Heavily based on the TSO code of packet-ip.c

Bug: 14155
Change-Id: Ibec3c35c739d8673fa655bde4f66198a22f567c4
Reviewed-on: https://code.wireshark.org/review/24900
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoTDS: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 1 Jan 2018 18:54:57 +0000 (19:54 +0100)]
TDS: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I3345246de63781decc1046834f82f60f02ad54c0
Reviewed-on: https://code.wireshark.org/review/25101
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agoQUIC: fix build when don't have libgcrypt with AEAD (< 1.6.0)
Alexis La Goutte [Mon, 1 Jan 2018 18:49:31 +0000 (19:49 +0100)]
QUIC: fix build when don't have libgcrypt with AEAD (< 1.6.0)

Change-Id: Ic77d12ac07f82ea315734782f97b035376b8b2e8
Reviewed-on: https://code.wireshark.org/review/25099
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2 years agoAdd dissector for NXP's 802.15.4 sniffer server messages
Lee Mitchell [Sun, 31 Dec 2017 17:23:53 +0000 (17:23 +0000)]
Add dissector for NXP's 802.15.4 sniffer server messages

Change-Id: I360bc4f802e28e9fc64cbd5cc06e514cbaf3b25f
Reviewed-on: https://code.wireshark.org/review/25091
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2 years agoICMP: Resolve Extension Object Class value
Uli Heilmeier [Mon, 1 Jan 2018 16:22:25 +0000 (17:22 +0100)]
ICMP: Resolve Extension Object Class value

Resolve ICMP Extension Object Class value to name as defined at
https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xhtml#icmp-parameters-ext-classes

Ping-Bug: 6632
Change-Id: I73ce9dbef5b09aa49f16c73a04ce474cd46f5695
Reviewed-on: https://code.wireshark.org/review/25098
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2 years agoHappy New Year 2018!
Stig Bjørlykke [Mon, 1 Jan 2018 11:24:06 +0000 (12:24 +0100)]
Happy New Year 2018!

Change-Id: I61ece8256384786c718fe2c1bc8813560fa372eb
Reviewed-on: https://code.wireshark.org/review/25094
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2 years agosharkd: Add narrowing cast
Graham Bloice [Sun, 31 Dec 2017 20:49:17 +0000 (20:49 +0000)]
sharkd:  Add narrowing cast

Needed on x86 windows as size_t < gint64

Change-Id: I2d5ca99c71a9f3a0138da786d10b111867337904
Reviewed-on: https://code.wireshark.org/review/25093
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2 years agonfapi: Fix spurious checkAPI warnings
Graham Bloice [Sun, 31 Dec 2017 19:10:44 +0000 (19:10 +0000)]
nfapi: Fix spurious checkAPI warnings

Uppercase a lot of "index" words in strings to quieten checkAPI.
Removed some redundant double spaces.

Change-Id: Ica5915095037ec3da1d7c92d05c3a4d155bb302c
Reviewed-on: https://code.wireshark.org/review/25092
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2 years agobtmesh: replace\convert g_warning
Graham Bloice [Sun, 31 Dec 2017 16:58:05 +0000 (16:58 +0000)]
btmesh: replace\convert g_warning

Replace g_warning with ws_g_warning, add expert info.

Change-Id: I54ae5959f89ee85bdd821f07af8cf4ec3172748e
Reviewed-on: https://code.wireshark.org/review/25090
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>