metze/wireshark/wip.git
6 years agoCMake: Add a note about passing /external to Visual C++.
Gerald Combs [Wed, 4 Apr 2018 00:51:05 +0000 (17:51 -0700)]
CMake: Add a note about passing /external to Visual C++.

According to

https://blogs.msdn.microsoft.com/vcblog/2017/12/13/broken-warnings-theory/

/external: will let is ignore warnings in external headers.

Change-Id: Ib3000d7654ffab99a001b225ce6162aab88fc8fa
Reviewed-on: https://code.wireshark.org/review/26734
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoLTE RRC: upgrade dissector to v15.1.0
Pascal Quantin [Wed, 4 Apr 2018 13:23:12 +0000 (15:23 +0200)]
LTE RRC: upgrade dissector to v15.1.0

Change-Id: If8447a010d967dbc58d520bfcc23fecb65f25ed9
Reviewed-on: https://code.wireshark.org/review/26739
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoMAC-NR: upgrade dissector to v15.1.0
Pascal Quantin [Tue, 3 Apr 2018 20:04:23 +0000 (22:04 +0200)]
MAC-NR: upgrade dissector to v15.1.0

Change-Id: Ie9a11cd9049d19f95f4f48f3380847329536d762
Reviewed-on: https://code.wireshark.org/review/26737
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoLPP: upgrade dissector to v14.5.1
Pascal Quantin [Wed, 4 Apr 2018 12:09:32 +0000 (14:09 +0200)]
LPP: upgrade dissector to v14.5.1

Change-Id: If0044a46c1aef24fa3bf323eceb0bdf004d2a81b
Reviewed-on: https://code.wireshark.org/review/26738
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoZigBee: Many-to-one route options info column
Dana Sy [Tue, 3 Apr 2018 16:20:50 +0000 (09:20 -0700)]
ZigBee: Many-to-one route options info column

Change the column info so that it will display "many-to-one route
request" if the many-to-one mask is found in the route options bitmap

Change-Id: Ia55d7bb6110d05040b7e52cc63b2f1cc592998da
Reviewed-on: https://code.wireshark.org/review/26725
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoWCCP: use proto_tree_add_ipv4_format() if ipv4 used
Yuri Chislov [Tue, 27 Mar 2018 09:24:36 +0000 (09:24 +0000)]
WCCP: use proto_tree_add_ipv4_format() if ipv4 used

Bug: 14573
Change-Id: I429477940d8e7a827a3f35630be64a7b06869d59
Reviewed-on: https://code.wireshark.org/review/26661
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agodns: check if name is root before any other check.
Dario Lombardo [Sat, 31 Mar 2018 20:25:08 +0000 (22:25 +0200)]
dns: check if name is root before any other check.

Bug: 14574
Change-Id: Ibacb6955c227a21ab813c48aad463a666fe45c40
Reviewed-on: https://code.wireshark.org/review/26695
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoDissect JSON-RPC over TCP or UDP
Michail Koreshkov [Tue, 3 Apr 2018 18:58:30 +0000 (21:58 +0300)]
Dissect JSON-RPC over TCP or UDP

Dissect protocols like OVSDB which transfer JSON over TCP or UDP

Change-Id: I7c918b6a5fbef9568fc4258fd57bad39ff2d9203
Reviewed-on: https://code.wireshark.org/review/26726
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agolemon: make some functions static.
Dario Lombardo [Wed, 4 Apr 2018 08:41:37 +0000 (10:41 +0200)]
lemon: make some functions static.

Change-Id: I41a78d6cb87223d13854ca4aad4ffdf70daecaf3
Reviewed-on: https://code.wireshark.org/review/26687
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agolemon: comment out unused OptErr function.
Dario Lombardo [Tue, 3 Apr 2018 18:58:08 +0000 (20:58 +0200)]
lemon: comment out unused OptErr function.

Change-Id: I889c2f0df721d93752c77e6b31ddaa8702ab47bf
Reviewed-on: https://code.wireshark.org/review/26703
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoradiotap: Correct the handling of MU Preamble Puncturing when unknown.
Richard Sharpe [Tue, 3 Apr 2018 01:42:07 +0000 (18:42 -0700)]
radiotap: Correct the handling of MU Preamble Puncturing when unknown.

Change-Id: I69f70686f8f3c3416d5d46020a84a8b070f17b36
Reviewed-on: https://code.wireshark.org/review/26723
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
6 years agoIf we're reading from a string, don't fclose yyin.
Guy Harris [Tue, 3 Apr 2018 01:03:30 +0000 (18:03 -0700)]
If we're reading from a string, don't fclose yyin.

yyin is initialized to stdin.  When we're reading from files, we set it
so that it points to the FILE from which we're reading, but when we're
reading from a string, we don't set it, leaving it to point to stdin.

This means that, just as the "read from the input" routine has to be set
differently when reading from a file or a string, the "close the current
input" routine has to be set differently as well.

Bug: 14577
Change-Id: Ie05880775612867e9037ace2de0cd0a0dd2fabb5
Reviewed-on: https://code.wireshark.org/review/26719
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFix a typo.
Gerald Combs [Tue, 3 Apr 2018 00:40:20 +0000 (17:40 -0700)]
Fix a typo.

Change-Id: I922f06a3d7df7fde695a6b917fb03af894f78bff
Reviewed-on: https://code.wireshark.org/review/26718
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agodns: make expand_dns_name() an internal function
Martin Kaiser [Sun, 1 Apr 2018 12:40:20 +0000 (14:40 +0200)]
dns: make expand_dns_name() an internal function

The expand_dns_name() function is not used outside of the DNS dissector
(any more?). Remove the function declaration from the public header
file, make the function internal.

Change-Id: Ibba81fa68a0dfd195ca3bbfca3eca20c39cc01f4
Reviewed-on: https://code.wireshark.org/review/26698
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoPick up some compiler-specific flags from autotools.
Guy Harris [Mon, 2 Apr 2018 20:21:39 +0000 (13:21 -0700)]
Pick up some compiler-specific flags from autotools.

Bug: 14554
Change-Id: Idf4585671ad2698bd51f65abadb1b1000ad56445
Reviewed-on: https://code.wireshark.org/review/26716
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoLPP: fix NRSRQ display
Eric Wang [Mon, 2 Apr 2018 02:50:38 +0000 (10:50 +0800)]
LPP: fix NRSRQ display

according to 3gpp 36133v1404, nrsrq value ranges from -34db to 2.5db
according to 3gpp 36355v1404, nrsrq reporting value ranges from 0 to 74

Change-Id: Ie5cc9880526ba6919785a8e355178ac08b34a1a0
Reviewed-on: https://code.wireshark.org/review/26707
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years ago2.5 → 2.9.
Gerald Combs [Mon, 2 Apr 2018 19:23:12 +0000 (12:23 -0700)]
2.5 → 2.9.

Change-Id: I9a6cd7a510f8ba5310a9cf8a2818903d4c03253f
Reviewed-on: https://code.wireshark.org/review/26712
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agodoc: minor changes in README files.
Dario Lombardo [Sat, 31 Mar 2018 10:55:44 +0000 (12:55 +0200)]
doc: minor changes in README files.

Change-Id: I5b21ade727f9c4bed6545e69d87082baafaefa2b
Reviewed-on: https://code.wireshark.org/review/26702
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoLPP: fix RSRP, NRSRP and NRSRQ inequalities
Pascal Quantin [Mon, 2 Apr 2018 06:18:34 +0000 (08:18 +0200)]
LPP: fix RSRP, NRSRP and NRSRQ inequalities

Change-Id: Idf3883b7a19bb7910e5762bc4caaad509d9a30a7
Reviewed-on: https://code.wireshark.org/review/26708
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years ago[Automatic update for 2018-04-01]
Gerald Combs [Sun, 1 Apr 2018 15:46:21 +0000 (15:46 +0000)]
[Automatic update for 2018-04-01]

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

Change-Id: I0db4c4cd78549ffca3f55a94de5279c7ad131647
Reviewed-on: https://code.wireshark.org/review/26699
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoBluetooth: Update Assigned Numbers
Michał Łabędzki [Sat, 31 Mar 2018 15:22:06 +0000 (17:22 +0200)]
Bluetooth: Update Assigned Numbers

Updated on 31st March 2018:
- UUIDs
- Company Ids
- links to Assign Numbers
- change of "Bond Management Feature" to (..) Features seems to be mistake,
  so I ignore it, but fix btatt name of this characteristic

Change-Id: If76148c70276017647f5d3de000be112de102988
Reviewed-on: https://code.wireshark.org/review/26696
Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
6 years agoQt/Bluetooth: Fix Devices lists names
Michał Łabędzki [Sat, 24 Mar 2018 16:28:13 +0000 (17:28 +0100)]
Qt/Bluetooth: Fix Devices lists names

Devices names from Extended Inquiry Response should be displayed
for BD_ADDRs provided by EIR/AD attribute BD_ADDR, but also HCI layer.

Change-Id: I042960661c29f6a8df13b2dda87e5f9533f4da09
Reviewed-on: https://code.wireshark.org/review/26697
Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
6 years agopacket-mq: Fix for SPI Verb and SPI OPEN Fields
Robert Grange [Fri, 30 Mar 2018 09:15:55 +0000 (11:15 +0200)]
packet-mq: Fix for SPI Verb and SPI OPEN Fields

Add missing SPI VERB
Improve display some Fields in SPI OPEN

Change-Id: Ibe585d80ac7e3ddf1c85c972f0dd5cd50d64598c
Reviewed-on: https://code.wireshark.org/review/26686
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoXRA: fixed bug in profile mapping
Bruno Verstuyft [Fri, 30 Mar 2018 08:55:21 +0000 (10:55 +0200)]
XRA: fixed bug in profile mapping

Change-Id: I0b01acff40569a39eb4518eaa15629c8cb1dc6a6
Reviewed-on: https://code.wireshark.org/review/26685
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>
6 years agoradiotap: Remove a redundant increment from the end of the HE-MU dissector.
Richard Sharpe [Fri, 30 Mar 2018 14:08:27 +0000 (07:08 -0700)]
radiotap: Remove a redundant increment from the end of the HE-MU dissector.

Remove an increment of the offset variable from after the last field.

Change-Id: Iee33caec4f58206e3e223390227907ae61092533
Reviewed-on: https://code.wireshark.org/review/26691
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agolemon: skip clang analyzer for more code.
Dario Lombardo [Fri, 30 Mar 2018 14:40:43 +0000 (16:40 +0200)]
lemon: skip clang analyzer for more code.

Change-Id: I3c2c0e1581c759fb4eef48008a7d905701958913
Reviewed-on: https://code.wireshark.org/review/26688
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agolemon: remove unneeded assignment.
Dario Lombardo [Fri, 30 Mar 2018 14:41:12 +0000 (16:41 +0200)]
lemon: remove unneeded assignment.

Change-Id: Id7bd4b5f7db1c9c797a2f50e7896799a0ad64532
Reviewed-on: https://code.wireshark.org/review/26690
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoSGsAP: fix decoding of Erroneous message IE
Pascal Quantin [Fri, 30 Mar 2018 12:46:55 +0000 (14:46 +0200)]
SGsAP: fix decoding of Erroneous message IE

Let's indicate the right payload length.
While we are at it, let's catch bounds errors as the erroneous payload
migth be malformed.
Change-Id: I360e8068f48e53cd5355f8c02b20d265df1fb2ff
Reviewed-on: https://code.wireshark.org/review/26689
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agolemon: remove clang scan warnings.
Dario Lombardo [Tue, 20 Mar 2018 13:18:49 +0000 (14:18 +0100)]
lemon: remove clang scan warnings.

Add assert and remove some code from scan builds.

Change-Id: I32747d1a61f183e4c918d9f50ec8337eaef47f0d
Reviewed-on: https://code.wireshark.org/review/26483
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoIEEE 802.15.4: fix decryption results based on uninitialized data
Robert Sauter [Wed, 28 Mar 2018 20:49:58 +0000 (22:49 +0200)]
IEEE 802.15.4: fix decryption results based on uninitialized data

Refactor ieee802154_set_mac_key to return the number of keys set and
only try to decrypt with the alt_key if actually provided

Bug: 14522
Change-Id: I40802dff8c08f7f82b792fb16f5f91aa3b9e20cc
Reviewed-on: https://code.wireshark.org/review/26677
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoZigBee: Do not use value_string_ext for small arrays
Kenneth Soerensen [Thu, 29 Mar 2018 17:51:37 +0000 (19:51 +0200)]
ZigBee: Do not use value_string_ext for small arrays

Change-Id: If3544b57fac913e3c447910e35fc642651ac69e1
Reviewed-on: https://code.wireshark.org/review/26681
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoradiotap: Add support for the HE-MU header.
Richard Sharpe [Fri, 30 Mar 2018 02:19:48 +0000 (19:19 -0700)]
radiotap: Add support for the HE-MU header.

This adds support for the HE-MU header as recently modified. It also
handles the unknown fields correctly, and has been subjected to some
captures as well.

Change-Id: Id0c6c3b4dd0f0a91722d0a1a2c1706270862d97e
Reviewed-on: https://code.wireshark.org/review/25479
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
6 years agoieee80211: Correct the handling of QoS Queue Size.
Richard Sharpe [Mon, 26 Feb 2018 14:37:57 +0000 (06:37 -0800)]
ieee80211: Correct the handling of QoS Queue Size.

QoS Queue Size is only applicable when To DS is true and for QoS Data,
QoS Null and QoS Data+CF-Ack frames.

Based on a reasonably careful reading of IEEE802.11-2016.

Change-Id: I16e7e7f4d0f3336e7d05c5f4f9c80179d514ec19
Reviewed-on: https://code.wireshark.org/review/26212
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
6 years agoLPPa: upgrade dissector to v14.4.0
Pascal Quantin [Thu, 29 Mar 2018 21:33:01 +0000 (23:33 +0200)]
LPPa: upgrade dissector to v14.4.0

Change-Id: Ia84124f5bd7bf7167fae5c431b69de76ca9073eb
Reviewed-on: https://code.wireshark.org/review/26684
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoNAS EPS: upgrade dissector to v15.2.0
Pascal Quantin [Thu, 29 Mar 2018 21:20:55 +0000 (23:20 +0200)]
NAS EPS: upgrade dissector to v15.2.0

Change-Id: I448934f15a18b5f6086cdf3f415dcccf2a4534d6
Reviewed-on: https://code.wireshark.org/review/26683
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago3GPP NAS: upgrade dissector to v15.2.0
Pascal Quantin [Thu, 29 Mar 2018 20:14:27 +0000 (22:14 +0200)]
3GPP NAS: upgrade dissector to v15.2.0

Change-Id: I11510356950c1eab4d77f8473f62aa6428311853
Reviewed-on: https://code.wireshark.org/review/26682
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoExtend 'HTTP Referer statistics' to sequence HTTP Redirects
Moshe Kaplan [Thu, 29 Mar 2018 02:58:29 +0000 (22:58 -0400)]
Extend 'HTTP Referer statistics' to sequence HTTP Redirects

This patch adds support for sequencing HTTP Redirects. This enables
tracking of HTTP-based redirects, which may not have a Referer header.
As such, this patch also renames 'HTTP Referer statistics' to
'HTTP Request Sequences' to better reflect the more generic
functionality.

Note that this does not fully support RFC 3986. An external library like
uriparser.github.io may be a better option for efficient, full relative
HTTP URL resolution.

A Sample PCAP to test functionality is available here:
https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=http_redirects.pcapng

A sample PCAP to demonstrate usefulness is available here:
https://www.malware-traffic-analysis.net/2015/08/31/page2.html
(examine request to hxxp://lk2gaflsgh.jgy658snfyfnvh.com/service.php)

Change-Id: I9edd1a1de86228b0dcb1df9f6f30e24379684321
Reviewed-on: https://code.wireshark.org/review/26679
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 years agozbee ZCL OTA attribute typo fix
Dana Sy [Wed, 28 Mar 2018 22:09:47 +0000 (15:09 -0700)]
zbee ZCL OTA attribute typo fix

There is a typo on the attribute name for the ZCL OTA attribute 0x0000.
Change the attribute name to match the ZCL specification document.

Change-Id: I83f42128fb3fac8c75124f375dda392d6c8bdcab
Reviewed-on: https://code.wireshark.org/review/26678
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>
6 years agoDon't bother with CMAKE_C_STANDARD.
Guy Harris [Mon, 26 Mar 2018 09:57:13 +0000 (02:57 -0700)]
Don't bother with CMAKE_C_STANDARD.

It was introduced in CMake 3.1, so, unless we require CMake 3.1 or
later, we'd have to manually try to enable C99 support on pre-3.1
releases, so we might as well just do it manually all the time - it's
not clear that CMAKE_C_STANDARD does it much better, especially give
that, for example, it wasn't until CMake 3.9 that support for enabling
C99 support in IBM XL C was added.

Change-Id: I51038b90fd3d8ab5050c5da4441765b19db9091b
Reviewed-on: https://code.wireshark.org/review/26648
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years agoDOCSIS: Making sure UCD contained in REGRSPMP does not overwrite the REGRSPMP info
Bruno Verstuyft [Wed, 28 Mar 2018 14:04:10 +0000 (16:04 +0200)]
DOCSIS: Making sure UCD contained in REGRSPMP does not overwrite the REGRSPMP info

Change-Id: I9db330ab4e9ddf7a3d61f5c993e1d05cce3130ea
Reviewed-on: https://code.wireshark.org/review/26673
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoQt: keep the extension in CaptureFile::fileName().
Dario Lombardo [Wed, 28 Mar 2018 07:11:49 +0000 (09:11 +0200)]
Qt: keep the extension in CaptureFile::fileName().

Change-Id: Iaecae7eea8398ae648bd31a0ae464242123f156b
Reviewed-on: https://code.wireshark.org/review/26551
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agolemon: Sync with latest trunk.
Anders [Wed, 28 Mar 2018 14:18:53 +0000 (16:18 +0200)]
lemon: Sync with latest trunk.

Change-Id: Iab0d64f675b482eee97b300d419ffa1e8090632e
Reviewed-on: https://code.wireshark.org/review/26676
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoKerberos: do not store empty keys
Pascal Quantin [Wed, 28 Mar 2018 11:21:20 +0000 (13:21 +0200)]
Kerberos: do not store empty keys

Bug: 14576
Change-Id: Ib52133a1b43e237f76f17a38d308407c0431d33e
Reviewed-on: https://code.wireshark.org/review/26672
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agopacket-wsp: Adding x-wap-application:lwm2m.dm support
Ivan Severin [Mon, 19 Mar 2018 18:25:33 +0000 (20:25 +0200)]
packet-wsp: Adding x-wap-application:lwm2m.dm support

Added x-wap-application:lwm2m.dm support according Open Mobile Alliance docs.
See docs: (page 141),
http://www.openmobilealliance.org/release/LightweightM2M/V1_0_2-20180209-A/OMA-TS-LightweightM2M-V1_0_2-20180209-A.pdf

Change-Id: I0026ae3f7e03b28242a3a7cb3091ba32c91c4edb
Reviewed-on: https://code.wireshark.org/review/26565
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoNano: add a heuristic dissector registration.
Roland Haenel [Tue, 27 Mar 2018 21:54:09 +0000 (23:54 +0200)]
Nano: add a heuristic dissector registration.

When operating a Nano node behind a NAT, non-standard ports are commonly
used for the protocol. The option to enable a heuristic dissector should
be helpful in this scenario.

Change-Id: I74abd8c90e9e5cebc0251662ade73f4e6e5e21bd
Reviewed-on: https://code.wireshark.org/review/26668
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agolemon: Sync with upstream, Jun 28, 2017
Anders [Wed, 28 Mar 2018 05:22:19 +0000 (07:22 +0200)]
lemon: Sync with upstream,  Jun 28, 2017

Change-Id: I4c6dbd018302fdf176e955e0e5e735a7aee22b10
Reviewed-on: https://code.wireshark.org/review/26669
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoclean up the echo dissector
Martin Kaiser [Mon, 26 Mar 2018 20:49:54 +0000 (22:49 +0200)]
clean up the echo dissector

simplify the code to distinguish between request and response
remove the if(tree) check
remove the offset variable, which is always 0
reformat the code
remove the incorrect descriptions ("echo data") for request and response
don't modify the display filter names

Change-Id: Iffe074ceef5fe2dda9e0b134a8dc4db70881d3e4
Reviewed-on: https://code.wireshark.org/review/26667
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agolemon: Align struct s_options with upstream.
Anders [Tue, 27 Mar 2018 18:44:32 +0000 (20:44 +0200)]
lemon: Align struct s_options with upstream.

Change-Id: I87ce8123a625a643a7c3d9e426f5ce103a670f2a
Reviewed-on: https://code.wireshark.org/review/26666
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agocmake: fix "cmake -E env" compatibility with older CMake
Peter Wu [Tue, 27 Mar 2018 01:30:01 +0000 (03:30 +0200)]
cmake: fix "cmake -E env" compatibility with older CMake

"cmake -E env" was added in CMake 3.1, but we currently support 2.8.12
at minimum. Add a best-effort replacement for older versions. There are
some limitations from CMake (see comments), but these should not affect
the current user (FindAsciidoctor.cmake).

Change-Id: I56c92aa9ad42fb3950dbdfd955d4ff902111e0d7
Fixes: v2.5.1rc0-76-g94a0f7c641 ("Switch from AsciiDoc to Asciidoctor.")
Reviewed-on: https://code.wireshark.org/review/26658
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agolemon: Trivial changes to make it easier to compare with upstream.
Anders [Tue, 27 Mar 2018 17:58:09 +0000 (19:58 +0200)]
lemon: Trivial changes to make it easier to compare with upstream.

Change-Id: I1bfac3d39a50b3d2093c66a77280b355e678d427
Reviewed-on: https://code.wireshark.org/review/26664
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoAdd missing symbols.
Guy Harris [Tue, 27 Mar 2018 18:40:39 +0000 (11:40 -0700)]
Add missing symbols.

Also, move some symbols to the correct location.

Change-Id: Iba2df29961ba2fd13bda069e7664dc55df50bb53
Reviewed-on: https://code.wireshark.org/review/26665
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoandroiddump: Read btsnoop header separately from rest of data
Mikael Kanstrup [Tue, 27 Mar 2018 06:38:16 +0000 (08:38 +0200)]
androiddump: Read btsnoop header separately from rest of data

The code to read and skip btsnoop header was written in a way where
it reads up to PACKET_LENGTH bytes of data, skips the header, then
move rest of data back start of buffer. So far so good. The code
then resets number of bytes used in buffer making it skip rest of
all data read.

Many times this works fine but only by luck. When there's no data
transfers first recv call will always only return the header
(sender side writes header separately right after accept).

When data transfers are ongoing first recv call will return both
header and data. Then initial data is lost but more importantly
risk parsing data with invalid offset.

Fix by reading btsnoop header separately from rest of data.

Change-Id: Ie52c33f943d8b311e0cd5638ec1a7d4840e271b8
Reviewed-on: https://code.wireshark.org/review/26659
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michal Labedzki <michal.labedzki@wireshark.org>
6 years agoDiameter: Fix some xml errors.
Anders [Tue, 27 Mar 2018 12:35:54 +0000 (14:35 +0200)]
Diameter: Fix some xml errors.

Change-Id: Id2a143d0b74c50f42356205ef5a5728bc897ec61
Reviewed-on: https://code.wireshark.org/review/26663
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoBGP path attribute AGGREGATOR (7) may be 32bits
ytti [Mon, 26 Mar 2018 09:02:19 +0000 (12:02 +0300)]
BGP path attribute AGGREGATOR (7) may be 32bits

https://www.iana.org/assignments/bgp-parameters/bgp-parameters.xhtml
https://tools.ietf.org/html/rfc4893
-------------------------------------------
   NEW BGP speakers carry AS path information expressed in terms of 4-
   octet Autonomous Systems numbers by using the existing AS_PATH
   attribute, except that each AS number in this attribute is encoded
   not as a 2-octet, but as a 4-octet entity.  The same applies to the
   AGGREGATOR attribute - NEW BGP speakers use the same attribute,
   except that the AS carried in this attribute is encoded as a 4-octet
   entity.
-------------------------------------------

Change-Id: I4ccfc2c18e8777a800211dd285550723ac0da872
Reviewed-on: https://code.wireshark.org/review/26647
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoDiameter: Add &Custom last, fixup xml a bit.
Anders [Tue, 27 Mar 2018 11:34:31 +0000 (13:34 +0200)]
Diameter: Add &Custom last, fixup xml a bit.

Change-Id: Ia2434d0f8fcf5b4d1b29e3ad1cfb5da9190438e7
Reviewed-on: https://code.wireshark.org/review/26662
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoWSUG: Fix Display Filter doc
Uli Heilmeier [Tue, 27 Mar 2018 07:50:15 +0000 (09:50 +0200)]
WSUG: Fix Display Filter doc

Bug: 14572
Change-Id: If556f6902b21f2f40c812210499c036185366a2c
Reviewed-on: https://code.wireshark.org/review/26660
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agotap: fix remaining potential memleaks with register_tap_listener
Peter Wu [Sun, 25 Mar 2018 21:24:59 +0000 (23:24 +0200)]
tap: fix remaining potential memleaks with register_tap_listener

Additionally, add an attribute to the tap function to prevent future
callers from leaking this memory.

Change-Id: Ief6af2bbc74d19153628f09d7b273e85cb2284ab
Reviewed-on: https://code.wireshark.org/review/26642
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoThere's no entity "Verizon"; there's "VerizonWireless".
Guy Harris [Tue, 27 Mar 2018 01:32:25 +0000 (18:32 -0700)]
There's no entity "Verizon"; there's "VerizonWireless".

Change-Id: I62ef4a4de33393b1367212a5bfc9fec102712490
Reviewed-on: https://code.wireshark.org/review/26657
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agorpcrdma: make sure that heuristic checks don't throw an exception
Martin Kaiser [Sun, 25 Mar 2018 12:08:51 +0000 (14:08 +0200)]
rpcrdma: make sure that heuristic checks don't throw an exception

We should not be throwing an exception while checking if the packet
really contains our protocol. Add a length check to make sure that the
initial tvb_get_ntohl() call will not fail.

Read the message type after the heuristic check.

Change-Id: I397732dbec20bcd0ab5356e8c3500fd0cb6e1434
Reviewed-on: https://code.wireshark.org/review/26634
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoDocs: Fix some cross references.
Gerald Combs [Mon, 26 Mar 2018 16:27:50 +0000 (09:27 -0700)]
Docs: Fix some cross references.

Update some cross references which were renamed in 1cd92c4961. Fixup
some capitalization while we're here.

Change-Id: Iae3227839cd34a52662a4b973c0f87e7e5a765cc
Reviewed-on: https://code.wireshark.org/review/26655
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoandroiddump: Update ps command parameter for Android Oreo
Mikael Kanstrup [Mon, 26 Mar 2018 09:22:53 +0000 (11:22 +0200)]
androiddump: Update ps command parameter for Android Oreo

ps command is used to find com.android.bluetooth process. From
Android Oreo the ps command needs -A parameter for listing all
processes.

Change-Id: I1a547a0d61175c1e194823462661ec69e711ca50
Reviewed-on: https://code.wireshark.org/review/26652
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years agoandroiddump: Fix btsnoop net port lookup
Mikael Kanstrup [Mon, 26 Mar 2018 08:41:00 +0000 (10:41 +0200)]
androiddump: Fix btsnoop net port lookup

Code assumes btsnoop net port is the first tcp socket found in
/proc/<pid>/net/tcp. If it is not the port number lookup will
fail.

Fixed by searching all open tcp sockets for a match.

Change-Id: I988fe18680600b59c595f3d619d95c72c1a6966d
Reviewed-on: https://code.wireshark.org/review/26651
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years agoandroiddump: Fix some error messages
Mikael Kanstrup [Mon, 26 Mar 2018 08:35:37 +0000 (10:35 +0200)]
androiddump: Fix some error messages

Change-Id: I1b3ad9fdafb08307a9863469f8478ecde0000acc
Reviewed-on: https://code.wireshark.org/review/26650
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoAdded Diameter AVP decode details for Override Control AVPs in the Cisco Systems...
Mike Lugo [Thu, 22 Mar 2018 20:24:56 +0000 (16:24 -0400)]
Added Diameter AVP decode details for Override Control AVPs in the Cisco Systems XML file.  Added a new file for Verizon specific AVPs via Verizon.xml.  Added calls to Verizon XML in hte dictional XML file.

Change-Id: I30e9d80e6304b1b5c79367a752e239091c6ec171
Reviewed-on: https://code.wireshark.org/review/26594
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoCMake: Add an rpm-package target.
Gerald Combs [Tue, 20 Mar 2018 23:15:33 +0000 (23:15 +0000)]
CMake: Add an rpm-package target.

Copy the current wireshark.spec.in and update it for use with CMake.
Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve
options.

The rpm-package target builds a tarball using git-export-release.sh and
therefore must be run from a git checkout. The RPM _prefix macro is set
to CMAKE_INSTALL_PREFIX, so you'll probably want to run

cmake -DCMAKE_INSTALL_PREFIX=/usr ...

Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6
Reviewed-on: https://code.wireshark.org/review/26579
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoBSSGP: Add 2 new values to 11.3.112 Redirection Indication.
AndersBroman [Mon, 26 Mar 2018 12:43:56 +0000 (14:43 +0200)]
BSSGP: Add 2 new values to 11.3.112 Redirection Indication.

Bug: 14570
Change-Id: Ia2d8323a89ed4b59f5c7167a51ea18017faf5408
Reviewed-on: https://code.wireshark.org/review/26653
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoadd support for Nano bootstrap protocol (TCP)
Roland Haenel [Thu, 15 Mar 2018 12:46:08 +0000 (13:46 +0100)]
add support for Nano bootstrap protocol (TCP)

Change-Id: Id63c70c05671ad637306809cd6254e951b6b5cd0
Reviewed-on: https://code.wireshark.org/review/26498
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years agodcerpc-pn-io (profinet): Fix Dead Store (Dead assignement/Dead increment) Warning...
Alexis La Goutte [Mon, 26 Mar 2018 11:14:14 +0000 (13:14 +0200)]
dcerpc-pn-io (profinet): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I8dd3fe09d7b5d3132814e3531314220f600746ba
Reviewed-on: https://code.wireshark.org/review/26649
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoieee80211: Add back the ability to select on PLMN total values.
Richard Sharpe [Thu, 22 Mar 2018 01:46:13 +0000 (18:46 -0700)]
ieee80211: Add back the ability to select on PLMN total values.

In previous versions of Wirkshark it was possible to filter on the PLMN
value in total because the sub-fields were not broken out. This restores
that capability for those who depended on it (WFA, I'm looking at you.)

That is, a filter like:

   wlan.fixed.anqp.3gpp_cellular_info.plmn_info == 0x206013

would work but it does not currently work. This restores that filter.

Change-Id: I2eb6eb7f47fb0246effaea0412a3d6ffcbcd61aa
Reviewed-on: https://code.wireshark.org/review/26645
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agof5ethtrailer: fix memleak and fix tap registration
Peter Wu [Sun, 25 Mar 2018 20:53:15 +0000 (22:53 +0200)]
f5ethtrailer: fix memleak and fix tap registration

On startup, not all protocols are ready. In particular, the ip, ipv6 and
tcp tap registrations failed (and the error messages were leaked). Fix
this by performing this registration when a capture file is loaded.

Change-Id: Idd0634e395d484bae67b343ea23a84d440c4f4bc
Reviewed-on: https://code.wireshark.org/review/26641
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoQt: TCP Stream Graphs dialog updates.
Gerald Combs [Wed, 21 Mar 2018 22:03:53 +0000 (15:03 -0700)]
Qt: TCP Stream Graphs dialog updates.

Add duplicate ACK ticks to Statistics → TCP Stream Graphs → Time
Sequence (tcptrace), which I missed when porting from GTK+. Add zero
window crosses while we're here.

Switch TCPStreamDialog to a subclass of GeometryStateDialog.

Add a slot and URL for the Help button and a stub entry in the User's
Guide.

Bug: 12009
Change-Id: Idf2ddb9eb33d924d65998285b5cffc234156497c
Reviewed-on: https://code.wireshark.org/review/26592
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agommdbresolve is an executable; git should ignore it.
Guy Harris [Mon, 26 Mar 2018 02:53:10 +0000 (19:53 -0700)]
mmdbresolve is an executable; git should ignore it.

Change-Id: I025c7c482182fdfa0849306f50d118d389670c83
Reviewed-on: https://code.wireshark.org/review/26646
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFix more FT_UINT64s with value_strings.
Guy Harris [Mon, 26 Mar 2018 01:19:00 +0000 (18:19 -0700)]
Fix more FT_UINT64s with value_strings.

Bug: 14565
Change-Id: I6cdd160f91637a8bed8c9b959d324ced65e5bea6
Reviewed-on: https://code.wireshark.org/review/26644
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoClean up REPORT_DISSECTOR_BUG().
Guy Harris [Sun, 25 Mar 2018 22:09:56 +0000 (15:09 -0700)]
Clean up REPORT_DISSECTOR_BUG().

Have it take a format and argument list as arguments, and have the
formatting done inside the reporting code.  That way, we're not relying
on any particular wmem scope working.

If WIRESHARK_ABORT_ON_DISSECTOR_BUG is set, try to add the message to
the crash information (currently only supported in macOS), and print it
to the standard error, before crashing.  We won't necessarily have a
usable crash dump to analyze, so we can't rely on that to find the cause
of the crash.

Ping-Bug: 14490
Change-Id: I2b39169c45c84f2ada31efa1d413bd28c140f8f4
Reviewed-on: https://code.wireshark.org/review/26643
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFix whitespace.
Guy Harris [Sun, 25 Mar 2018 20:36:31 +0000 (13:36 -0700)]
Fix whitespace.

Change-Id: I565969aa18628a635c2471da56c43cf2689c44d5
Reviewed-on: https://code.wireshark.org/review/26640
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoGive a better error message.
Guy Harris [Sun, 25 Mar 2018 20:31:48 +0000 (13:31 -0700)]
Give a better error message.

DISSECTOR_ASSERT_NOT_REACHED() doesn't say *why* the code in question
was reached; it's better to give a more explicit error message.

Change-Id: I88b930e5a90ba8692aeac6ee29fa8fda21b5067b
Reviewed-on: https://code.wireshark.org/review/26639
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoThere's no register.h file in the top-level source directory.
Guy Harris [Sun, 25 Mar 2018 20:00:12 +0000 (13:00 -0700)]
There's no register.h file in the top-level source directory.

Change-Id: I021cdd102356954a9542455b432652842c9716f7
Reviewed-on: https://code.wireshark.org/review/26638
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoREADME.dissector: update info about tvb_get_nstringz
Tadeusz Struk [Fri, 23 Mar 2018 16:07:20 +0000 (09:07 -0700)]
README.dissector: update info about tvb_get_nstringz

Update invalid description for tvb_get_nstringz() and
tvb_get_nstringz0().

Change-Id: I03483bc1a2aa5a701b44cd895b91289716ef215d
Reviewed-on: https://code.wireshark.org/review/26598
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoprotobuf: allow config of UDP ports
Martin Mathieson [Fri, 23 Mar 2018 17:23:34 +0000 (17:23 +0000)]
protobuf: allow config of UDP ports

Make it easier to check if traffic over UDP ports is
protobuf-based.

Change-Id: Ib88c4a7a6d2996f53249da6707f35e06b38c7b2d
Reviewed-on: https://code.wireshark.org/review/26625
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoieee80211: use 64bit value string for a 64bit hf variable
Martin Kaiser [Sun, 25 Mar 2018 11:44:07 +0000 (13:44 +0200)]
ieee80211: use 64bit value string for a 64bit hf variable

Using a 32bit value string triggers the assertion in
hf_try_val64_to_str().

Bug: 14560
Change-Id: Ief3f46ee60355f43d2fb5f210608fde21be8d41d
Reviewed-on: https://code.wireshark.org/review/26633
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoBluetooth HCI evt: dissect last remaining BT5 events
Allan Møller Madsen [Mon, 19 Mar 2018 21:33:12 +0000 (22:33 +0100)]
Bluetooth HCI evt: dissect last remaining BT5 events

Add dissection of events:
LE Periodic Advertising Sync Established
LE Periodic Advertising Report
LE Periodic Advertising Sync Lost
LE Advertising Set Terminated
LE Scan Request Received
LE Channel Selection Algorithm
SAM Status Change

Add missing extended LMP feature bits

Change-Id: I6aed69ff70674950507a7f4730f4136077c00357
Signed-off-by: Allan Møller Madsen <almomadk@gmail.com>
Reviewed-on: https://code.wireshark.org/review/26631
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago[Automatic update for 2018-03-25]
Gerald Combs [Sun, 25 Mar 2018 16:06:04 +0000 (16:06 +0000)]
[Automatic update for 2018-03-25]

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

Change-Id: Ie7d9f2b00222e5ed4e05b5c3fc9100ad26e65084
Reviewed-on: https://code.wireshark.org/review/26635
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoRPCRDMA: Fix 'might be clobbered' warning
Uli Heilmeier [Sun, 25 Mar 2018 10:40:49 +0000 (12:40 +0200)]
RPCRDMA: Fix 'might be clobbered' warning

Fix "might be clobbered by 'longjmp' or 'vfork' warning

Change-Id: I3c7433568c452782316e37efd9697effdf0ebe0f
Reviewed-on: https://code.wireshark.org/review/26632
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
6 years agoUpdate my email
Michał Łabędzki [Sat, 24 Mar 2018 16:18:20 +0000 (17:18 +0100)]
Update my email

Old e-mail does not exist right now, but I am still here.

Change-Id: I8436bf340e2f4a1948674a686fea32dee0fe91f6
Reviewed-on: https://code.wireshark.org/review/26627
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoBluetooth: ATT: Appearance: Add new items
Michał Łabędzki [Sat, 24 Mar 2018 16:10:55 +0000 (17:10 +0100)]
Bluetooth: ATT: Appearance: Add new items

Items:
  Personal Mobility Device
  Continuous Glucose Monitor
  Insulin Pump
  Medication Delivery

Change-Id: If0e706506164883b34550a6c6865095c4dd1e816
Reviewed-on: https://code.wireshark.org/review/26626
Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoIn some dialogs, have *no* auto-default buttons on macOS.
Guy Harris [Sun, 25 Mar 2018 02:15:14 +0000 (19:15 -0700)]
In some dialogs, have *no* auto-default buttons on macOS.

In macOS dialogs, there's a default button, which is the button that
Enter/Return activates, and that Enter/Return *always* activates,
*regardless* of what button has the input focus.  To activate the button
that has the input focus, you use the space bar.

To implement that, we need to disable auto-default on all buttons,
including the Cancel button.

Put in a comment explaining all this.

We may want to do this in all alert boxes, and possibly all dialogs with
buttons.

Change-Id: I214dd2870a9720ea705d8db39adc5b6af2003fb1
Reviewed-on: https://code.wireshark.org/review/26629
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoRPC-over-RDMA: add explicit fall through comments to please gcc 7.2.0
Pascal Quantin [Sat, 24 Mar 2018 10:42:57 +0000 (11:42 +0100)]
RPC-over-RDMA: add explicit fall through comments to please gcc 7.2.0

Change-Id: Ied55b2283da36dabd21768660f6824492cd569a1
Reviewed-on: https://code.wireshark.org/review/26624
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agowslua: Fix logging
Peter Wu [Fri, 23 Mar 2018 16:04:50 +0000 (17:04 +0100)]
wslua: Fix logging

Always display Lua messages (to match tshark), do not send them to
qDebug as they will not be visible with the default log options.

Change-Id: I660a3877355891d45881b26735596ea6dc8a8b29
Fixes: v2.5.0rc0-2037-gc9b6887d84 ("wslua: Fix logger after g6a5e90f2")
Reviewed-on: https://code.wireshark.org/review/26599
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoRPC-over-RDMA: add reassembly for reply, read and write chunks
Jorge Mora [Tue, 14 Nov 2017 21:55:14 +0000 (16:55 -0500)]
RPC-over-RDMA: add reassembly for reply, read and write chunks

The RDMA reply chunk is used for a large RPC reply which does not fit
into a single SEND operation and does not have a single large opaque,
e.g., NFS READDIR. The RPC call packet is used only to set up the RDMA
reply chunk. The whole RPC reply is transferred via RDMA writes.
Fragments are added on any RDMA write packet, RDMA_WRITE_ONLY,
RDMA_WRITE_FIRST, etc., and the reassembly is done on the reply
message. The RPC reply packet has no data (RDMA_NOMSG) but
fragments are reassembled and the whole RPC reply is dissected.

The RDMA read chunk list is used for a large RPC call which has
at least one large opaque, e.g., NFS WRITE. The RPC call packet
is used only to set up the RDMA read chunk list. It also has the
reduced message data which includes the first fragment (XDR data
up to and including the opaque length), but it could also have
fragments between each read chunk and the last fragment after
the last read chunk data. The reduced message is then broken
down into fragments and inserted into the reassembly table.
Since the RDMA read chunk list is set up in the RPC call
then do not dissect the upper layer in this case and just
label rest of packet as "Data" since the reassembly will
be done on the last read response.

The protocol gives the XDR position where each chunk must be
inserted into the XDR stream thus as long as the maximum
I/O size is known it is possible to know exactly where to
insert these fragments. This maximum I/O size is set on the
first READ_RESPONSE_FIRST or READ_RESPONSE_MIDDLE but in case
where any of these packets have not been seen then a value
of 100 is used (real value should be at least 1024) but in
this case the message numbers are not consecutive between
chunks but since the total size of all chunks is verified to
make sure there is a complete message to reassemble then all
fragments should be in the correct order.

Fragments are added on any RDMA read packet: RDMA_READ_RESPONSE_ONLY,
RDMA_READ_RESPONSE_FIRST, etc., and the reassembly is done on the
last read response. Since there could be multiple chunks and each
chunk could have multiple segments then the total size must be
checked to complete the reassembly because in this case there
will be multiple READ_RESPONSE_LAST.

The RDMA write chunk list is used for a large RPC reply which has
at least one large opaque, e.g., NFS READ. The RPC call packet is
used only to set up the RDMA write chunk list. The opaque data is
then transferred via RDMA writes and then the RPC reply packet is
sent from the server.

The RPC reply packet has the reduced message data which includes
the first fragment (XDR data up to and including the opaque length),
but it could also have fragments between each write chunk and the
last fragment after the last write chunk data. The reduced message
is then broken down into fragments and inserted into the reassembly
table. Since the RPC reply is sent after all the RDMA writes then
the fragments from these writes must be inserted in the correct
order: the first RDMA write fragment is inserted with message
number 1, since the first fragment (message number 0) will come
from the very last packet (the RPC reply with RDMA_MSG). Also,
the last packet could have fragments which must be inserted in
between chunk data, therefore message numbers from one chunk to
another are not consecutive.

In contrast with the RDMA read chunk list, the protocol does not
allow an XDR position in the RDMA write chunks, since the RPC
client knows exactly where to insert the chunk's data because
of the virtual address of the DDP (direct data placement) item.
There is no way to map a virtual address with an XDR position,
thus in order to reassemble the XDR stream a two pass approach
is used. In the first pass (visited = 0), all RDMA writes are
inserted as fragments leaving a gap in between each chunk.
Then the dissector for the upper layer is called with a flag
letting the dissector know that it is dealing with a reduced
message so all DDP enabled operations handle the opaque data
as having only the size of the opaque but not the data and
reporting back the offset from the end of the message.
Once the upper layer dissector returns, this layer now has a
list of DDP eligible item's offsets which are then translated
into XDR offsets and then the RPC reply packet is broken into
fragments and inserted in the right places as in the case for
the RDMA read chunk list. On the second pass (visited = 1),
all fragments have already been inserted into the reassembly
table so it just needs to reassembled the whole message and
then call the upper layer dissector.

RFC 8267 specifies the upper layer bindings to RPC-over-RDMA
version 1 for NFS. Since RPC-over-RDMA version 1 specifies the
XDR position for the read chunks then only the write chunk DDP
eligible items are handled in the upper layer, in this case the
NFS layer. These are the only procedures or operations eligible
for write chunks:
* The opaque data result in the NFS READ procedure or operation
* The pathname or linkdata result in the NFS READLINK procedure
  or operation

Two functions are defined to signal and report back the DDP
eligible item's offset to be used by the upper layers.
Function rpcrdma_is_reduced() is used to signal the upper layer
that it is dealing with a reduced data message and thus should
ignore DDP eligible item's opaque processing and just report
back the offset where the opaque data should be. This reporting
is done using the second function rpcrdma_insert_offset().

Reassembly is done for InfiniBand only. Reassemble fragments using
the packet sequence number (PSN) of each RDMA I/O fragment to make
sure the message is reassembled correctly when fragments are sent
out of order. Also a unique message id is used for each message so
fragments are reassembled correctly when fragments of different
messages are sent in parallel.

The reassembled message could be composed of multiple chunks
and each chunk in turn could be composed of multiple segments
in which each segment could be composed of multiple requests
and of course each request is composed of one or more fragments.
Thus in order to have all fragments for each segment belonging
to the same message, a list of segments is created and all
segments belonging to the same message are initialized with
the same message id. These segments are initialized and added
to the list on the call side on RDMA_MSG by calling
process_rdma_lists.

Bug: 13260
Change-Id: Icf57d7c46c3ba1de5d019265eb151a81d6019dfd
Reviewed-on: https://code.wireshark.org/review/24613
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agopacket-mq: Fix for Encoding problem in some MQ Struct
Robert Grange [Fri, 16 Mar 2018 19:05:21 +0000 (20:05 +0100)]
packet-mq: Fix for Encoding problem in some MQ Struct

Fix to use the MD encoding info when decoding some MQ Struct

Change-Id: I0de05efeff41df893b82ac36ad28cfa04c68b1e0
Reviewed-on: https://code.wireshark.org/review/26510
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoOID name resolv: Fix MIB/PIB path presentations
Jaap Keuter [Mon, 19 Mar 2018 21:46:49 +0000 (22:46 +0100)]
OID name resolv: Fix MIB/PIB path presentations

oids.c: Sort out libsmi init, add user paths once.
Qt, About WS: Stop memory leak of MIB/PIB paths.
GTK, About WS: Allow for 20 individual paths.
tshark, folders: init before getting paths, allow 20 individual.

Bug: 14539
Change-Id: I113ee2dd4394d553a16b256e66fd840eeeec78ef
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/26555
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoCouchbase: update opcodes and decode AUDIT_PUT as JSON
Sergey Avseyev [Tue, 20 Mar 2018 12:21:08 +0000 (15:21 +0300)]
Couchbase: update opcodes and decode AUDIT_PUT as JSON

Change-Id: I6b9e3455abbf0cbd4eb6513fc652cf2902c9eb79
Reviewed-on: https://code.wireshark.org/review/26570
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoUpdate a comment.
Guy Harris [Sat, 24 Mar 2018 04:02:46 +0000 (21:02 -0700)]
Update a comment.

Change-Id: I9a1f5ed85591202c52f26d4b3d63d8beb7578e15
Reviewed-on: https://code.wireshark.org/review/26623
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFix a comment.
Guy Harris [Sat, 24 Mar 2018 03:33:18 +0000 (20:33 -0700)]
Fix a comment.

We already *have* an exported dissector that always dissects PPP without
HDLC-like framing; the question is whether we should have one that
always dissects PPP with HDLC-like framing (with a check for the
HDLC-like framing, in case, for example, it was negotiated away), but
doesn't check for Cisco HDLC.

Change-Id: I3b3319dd29c7516220b82df626bc6ac520ea0dd9
Reviewed-on: https://code.wireshark.org/review/26622
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoHand off to the PPC-in-HDLC-like-framing dissector.
Guy Harris [Sat, 24 Mar 2018 03:28:18 +0000 (20:28 -0700)]
Hand off to the PPC-in-HDLC-like-framing dissector.

There might be HDLC-like framing inside SSTP, even if it eventually gets
negotiated away.

Bug: 14559
Change-Id: Ibc254f221f26c0da905ceff4edff7859a3fec635
Reviewed-on: https://code.wireshark.org/review/26619
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoDon't rely on "xxx *yyy[N] = {};" compiling.
Guy Harris [Sat, 24 Mar 2018 02:05:45 +0000 (19:05 -0700)]
Don't rely on "xxx *yyy[N] = {};" compiling.

At least as I read C90 "6.5.7 Initialization" and C99 "6.7.8
Initialization", there must be at least one "initializer" in an
"initializer-list", so nothing requires that the compiler accept, for
example

static const ws_mem_usage_t *memory_components[MAX_COMPONENTS] = {
};

Bug: 14556
Change-Id: Ief1dbfee504ad5ef1d984390dc2da18deba7fb90
Reviewed-on: https://code.wireshark.org/review/26616
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoInclude alloca.h if we have it.
Guy Harris [Fri, 23 Mar 2018 21:21:06 +0000 (14:21 -0700)]
Include alloca.h if we have it.

Bug: 14552
Change-Id: I799691f7f33ca56748ed4e51d7d548f37769837b
Reviewed-on: https://code.wireshark.org/review/26611
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoQt: Remove a redundant include.
Gerald Combs [Fri, 23 Mar 2018 18:49:42 +0000 (11:49 -0700)]
Qt: Remove a redundant include.

Change-Id: I0f5e4227bebc98678344b28e835e1c7b26b57502
Reviewed-on: https://code.wireshark.org/review/26607
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoQt: ensure that taps are invoked on reload/rescan
Peter Wu [Fri, 23 Mar 2018 16:54:50 +0000 (17:54 +0100)]
Qt: ensure that taps are invoked on reload/rescan

Invoke the tap draw callback immediately after reloading a capture (or
changing a display filter) rather than waiting for a timer to expire.

Change-Id: I3d1549d1a18c8e173cd29d45f31ce7586e0d70fe
Reviewed-on: https://code.wireshark.org/review/26600
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agodocs: improve Lua Listener example
Peter Wu [Fri, 23 Mar 2018 17:05:13 +0000 (18:05 +0100)]
docs: improve Lua Listener example

Ensure the dialog is populated when the dialog is opened after a capture
file has already been loaded.

Change-Id: I9ba1b4a1eb7a8b21ce7dac4a820eadf10daa9845
Reviewed-on: https://code.wireshark.org/review/26601
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>