metze/wireshark/wip.git
21 months agoNo need to display *signed* power values in hex.
Guy Harris [Sun, 8 Apr 2018 20:15:48 +0000 (13:15 -0700)]
No need to display *signed* power values in hex.

Change-Id: I8356dc3c2667a7bd55d3bb75b88f7ed758cecb72
Reviewed-on: https://code.wireshark.org/review/26807
Reviewed-by: Guy Harris <guy@alum.mit.edu>
21 months agoMax and min transmit power, in the Power Capabilities IE, are signed.
Guy Harris [Sun, 8 Apr 2018 19:51:17 +0000 (12:51 -0700)]
Max and min transmit power, in the Power Capabilities IE, are signed.

To quote IEEE Std 802.11-2016, section 9.4.2.15 "Power Capability
element":

  The Minimum Transmit Power Capability field is set to the nominal
  minimum transmit power with which the STA is capable of transmitting in
  the current channel, with a tolerance B1 5 dB.  The field is coded as a
  signed integer in units of decibels relative to 1 mW. Further
  interpretation of this field is defined in 11.8.4.

  The Maximum Transmit Power Capability field is set to the nominal
  maximum transmit power with which the STA is capable of transmitting in
  the current channel, with a tolerance B1 5 dB. The field is coded as a
  signed integer in units of decibels relative to 1 mW.  Further
  interpretation of this field is defined in 11.8.4.

Bug: 14593
Change-Id: Ibc4e4a11d71ac1894d03d33f5762a7b0d1d70085
Reviewed-on: https://code.wireshark.org/review/26804
Reviewed-by: Guy Harris <guy@alum.mit.edu>
21 months agomqtt: Add option to uncompress message when decoding
Stig Bjørlykke [Sat, 7 Apr 2018 20:35:35 +0000 (22:35 +0200)]
mqtt: Add option to uncompress message when decoding

Add support for uncompressing message data before dissecting
based on topic.

Bug: 14591
Change-Id: Ibaead205a4df791d8e903935dfd29b9b8c13ddc5
Reviewed-on: https://code.wireshark.org/review/26794
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com>
Tested-by: Petri Dish Buildbot
21 months ago[Automatic update for 2018-04-08]
Gerald Combs [Sun, 8 Apr 2018 08:15:46 +0000 (08:15 +0000)]
[Automatic update for 2018-04-08]

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

Change-Id: I85850833928dcf94e44957943c55126369c20905
Reviewed-on: https://code.wireshark.org/review/26799
Reviewed-by: Gerald Combs <gerald@wireshark.org>
21 months agoBSSMAP: Fix definition of Speech Version Indication for EFR (FR2)
Harald Welte [Wed, 21 Mar 2018 18:42:46 +0000 (19:42 +0100)]
BSSMAP: Fix definition of Speech Version Indication for EFR (FR2)

3GPP TS 48.008 Section 3.2.2.11 is quite clear on the definitions
of the "permitted speech version indication".

The Wireshark BSSMAP dissector so far got it wrong:
* 0x11 is "Full Rate Version 2" (aka GSM-EFR)
* the short version is not FR12 but FR2

Change-Id: I6835083389e465c791cea5a240ebc434f677b82c
Reviewed-on: https://code.wireshark.org/review/26790
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
21 months agoextcap: Always use byte mode in pipes
Stig Bjørlykke [Sat, 7 Apr 2018 10:56:45 +0000 (12:56 +0200)]
extcap: Always use byte mode in pipes

The original PipeMode parameter to CreateNamedPipe() was wrong but
when running gave a correct value. The changes in g00373a1f tried to fix
this parameter but this gave incorrect values.

Bug: 14532
Change-Id: Ia1e8e9ba54abfcc3bd0856fd715b7c69ee54ccfe
Reviewed-on: https://code.wireshark.org/review/26786
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
21 months agoX2AP: upgrade dissector to v15.1.0
Pascal Quantin [Sat, 7 Apr 2018 12:56:31 +0000 (14:56 +0200)]
X2AP: upgrade dissector to v15.1.0

Change-Id: I61867f0bcd8cff1d7469e3344b2fb21f5ed3bd77
Reviewed-on: https://code.wireshark.org/review/26787
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
21 months agoFindAsciidoctor: On SLES 12.2 the executable name is asciidoctor.ruby2.1
AndersBroman [Fri, 6 Apr 2018 11:23:40 +0000 (13:23 +0200)]
FindAsciidoctor: On SLES 12.2 the executable name is asciidoctor.ruby2.1

Change-Id: I609aae2335ee8171c1d54eb05cf4c184f2dc1eb0
Reviewed-on: https://code.wireshark.org/review/26775
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoZigBee: Fixed ZDP typo from nwk addr to ext addr
Dana Sy [Fri, 6 Apr 2018 17:21:19 +0000 (10:21 -0700)]
ZigBee: Fixed ZDP typo from nwk addr to ext addr

Fixed typos where Nwk Addr is used as a label to the extended address.
Changed Nwk Addr to Ext Addr where appropriate.

Change-Id: Ia7f80b07e9cbad2285810c7eb6cd31a4d25f4ff7
Reviewed-on: https://code.wireshark.org/review/26779
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoS1AP: upgrade dissector to v15.1.0
Pascal Quantin [Fri, 6 Apr 2018 21:16:50 +0000 (23:16 +0200)]
S1AP: upgrade dissector to v15.1.0

Change-Id: Ib3728a35f3635b58da2a10736799fd825c34e58b
Reviewed-on: https://code.wireshark.org/review/26782
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
21 months agoIncrease PROTO_PRE_ALLOC_HF_FIELDS_MEM.
Guy Harris [Fri, 6 Apr 2018 17:37:10 +0000 (10:37 -0700)]
Increase PROTO_PRE_ALLOC_HF_FIELDS_MEM.

Change-Id: I8d294d7ee4b37586ffe5aff982fe3a016b594c1d
Reviewed-on: https://code.wireshark.org/review/26780
Reviewed-by: Guy Harris <guy@alum.mit.edu>
21 months agoF1AP: upgrade dissector to v15.1.0
Pascal Quantin [Fri, 6 Apr 2018 16:04:14 +0000 (18:04 +0200)]
F1AP: upgrade dissector to v15.1.0

Change-Id: I82720a4d6a49f11165635e9cf76c6fbc1555188d
Reviewed-on: https://code.wireshark.org/review/26778
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
21 months agopdcp-lte: Various improvements spotted while reviewing pdcp-nr.
Martin Mathieson [Fri, 6 Apr 2018 13:58:13 +0000 (14:58 +0100)]
pdcp-lte:  Various improvements spotted while reviewing pdcp-nr.

Prune list of possible ROHC modes.
Avoid separately extracting lots of values, instead use _ret_uint variant while adding item.

Change-Id: I8d75fe670fe02f1ae6c1da34b3ac6e0a22a0b894
Reviewed-on: https://code.wireshark.org/review/26777
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
21 months agoNR RRC: upgrade dissector to v15.1.0
Pascal Quantin [Fri, 6 Apr 2018 10:26:31 +0000 (12:26 +0200)]
NR RRC: upgrade dissector to v15.1.0

Change-Id: If34d8627e8dee0e9dd7c1dc72701aec57df68853
Reviewed-on: https://code.wireshark.org/review/26774
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>
21 months agoextcap: Fix version request
Roland Knall [Fri, 6 Apr 2018 09:37:16 +0000 (11:37 +0200)]
extcap: Fix version request

The original implementation lead to multiple extcap interfaces
being loaded, as well as an error output from the default example.

This fixes both

Change-Id: Icb6fbda7bcb11ed0d14cb683ddcdabdc20a7070d
Reviewed-on: https://code.wireshark.org/review/26773
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
21 months agoFix handling of --extcap-version with an argument.
Guy Harris [Fri, 6 Apr 2018 05:05:44 +0000 (22:05 -0700)]
Fix handling of --extcap-version with an argument.

Not all versions of getopt_long() allow, for an option for which the
argument is optional, --xyzzy {value}; at least some of them, such as
the *BSD/macOS one, require --xyzzy={value}.  Make it so.

Change-Id: I856d9f253535d804c7674d209054bc6ce10ee91d
Reviewed-on: https://code.wireshark.org/review/26772
Reviewed-by: Guy Harris <guy@alum.mit.edu>
21 months agomake-version.pl: fix version with git-svn
Joakim Karlsson [Thu, 5 Apr 2018 22:27:36 +0000 (00:27 +0200)]
make-version.pl: fix version with git-svn

This will fix version if your workflow is
git -> svn -> git-svn

Change-Id: Ic7a7bf763f6a3c0fe4463b2949794e9d6cce8064
Reviewed-on: https://code.wireshark.org/review/26770
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agodissector/ptp: use BASE_OUI for organizationId
Adam Wujek [Thu, 29 Mar 2018 09:17:58 +0000 (11:17 +0200)]
dissector/ptp: use BASE_OUI for organizationId

Bug: 14578
Change-Id: I5633a4c210da3201bb25684f276504efae9f8317
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
Reviewed-on: https://code.wireshark.org/review/26749
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agomanuf: Overwrite entry for OUI 08:00:30
Adam Wujek [Wed, 4 Apr 2018 16:39:29 +0000 (18:39 +0200)]
manuf: Overwrite entry for OUI 08:00:30

In the official file with OUIs (http://standards-oui.ieee.org/oui/oui.txt
or https://regauth.standards.ieee.org/standards-ra-web/pub/view.html)
there are 3 organizations/companies assigned to the same OUI:
-CERN
-NETWORK RESEARCH CORPORATION
-ROYAL MELBOURNE INST OF TECH

Bug: 14578
Change-Id: Iac609c88a9c7d0fa2198489e694b24668b4d023a
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
Reviewed-on: https://code.wireshark.org/review/26750
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agodissector/ptp: Add dissection of White Rabbit TLV
Adam Wujek [Tue, 29 Aug 2017 23:53:39 +0000 (01:53 +0200)]
dissector/ptp: Add dissection of White Rabbit TLV

Based on White Rabbit Specification - latest version
https://www.ohwr.org/documents/160

For more information about The White Rabbit Project:
http://cern.ch/white-rabbit

Bug: 14578
Change-Id: Ie63a1f4ad501e0fc13fbd2205e2fcf94e175a7e4
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
Reviewed-on: https://code.wireshark.org/review/23962
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoRemove some references to Qt4.
Gerald Combs [Fri, 6 Apr 2018 01:00:16 +0000 (18:00 -0700)]
Remove some references to Qt4.

Change-Id: I50f5abafb8adf18a5407427f7feb260301df45cc
Reviewed-on: https://code.wireshark.org/review/26771
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>
21 months agoQT: Copy as printable
Michail Koreshkov [Thu, 5 Apr 2018 15:38:49 +0000 (18:38 +0300)]
QT: Copy as printable

Copy all printable characters (like in GTK-based) but not only letters

Change-Id: I5e431d0c52d65c5867f4893c86b6f0eb3f535972
Reviewed-on: https://code.wireshark.org/review/26757
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>
21 months agoSIP: Fix handling of response time
Uli Heilmeier [Thu, 5 Apr 2018 19:13:26 +0000 (21:13 +0200)]
SIP: Fix handling of response time

Set p_val->request_time when we set p_val->frame_number so that
response time matches request frame.

Bug: 14551
Change-Id: I5f8dd9405b9b1eb61a1ca184b15d3fdc436546e1
Reviewed-on: https://code.wireshark.org/review/26762
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoThe CPU mode values might be function-dependent.
Guy Harris [Thu, 5 Apr 2018 20:08:29 +0000 (13:08 -0700)]
The CPU mode values might be function-dependent.

Have separate ones for function 3A and function 80.

Change-Id: I44560099de269ea809092d5bc7ad88308c9082be
Reviewed-on: https://code.wireshark.org/review/26767
Reviewed-by: Guy Harris <guy@alum.mit.edu>
21 months agoRLC-NR: fix bearerType and bearerId length
Pascal Quantin [Thu, 5 Apr 2018 20:00:58 +0000 (22:00 +0200)]
RLC-NR: fix bearerType and bearerId length

Change-Id: Ib328c9ad60f22d68c0978d77d759dec0c879d41f
Reviewed-on: https://code.wireshark.org/review/26765
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
21 months agoInterpretation of PCCC function codes depends on the command code value.
Guy Harris [Thu, 5 Apr 2018 19:57:42 +0000 (12:57 -0700)]
Interpretation of PCCC function codes depends on the command code value.

We can't have a single table to map function codes to names; we need
separate tables for different command codes.

We also can't have a single field for the function code; we need
separate fields for different command codes.

While we're at it, use proto_tree_add_item_ret_uint() to add the command
code and function code, rather than separately fetching those values.

Change-Id: Ic2646da6c6a1cae13c513874c5c003f32fce434e
Reviewed-on: https://code.wireshark.org/review/26764
Reviewed-by: Guy Harris <guy@alum.mit.edu>
21 months agoSort the PCCC_ES values, as required in a value_string_ext.
Guy Harris [Thu, 5 Apr 2018 19:26:37 +0000 (12:26 -0700)]
Sort the PCCC_ES values, as required in a value_string_ext.

Change-Id: If3f093ba19cce1a69c1540518e622e4098ba82b6
Reviewed-on: https://code.wireshark.org/review/26763
Reviewed-by: Guy Harris <guy@alum.mit.edu>
21 months agolemon: remove leaks in main().
Dario Lombardo [Sun, 1 Apr 2018 20:01:34 +0000 (22:01 +0200)]
lemon: remove leaks in main().

Change-Id: If6693d2ad87fcd1dcceb137d76d890663f83a827
Reviewed-on: https://code.wireshark.org/review/26705
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
21 months agolemon: remove leak in tplt_open().
Dario Lombardo [Sun, 1 Apr 2018 20:02:42 +0000 (22:02 +0200)]
lemon: remove leak in tplt_open().

Change-Id: I6a13c89e27797f8c8d1e187aef8923b9df0c8ee4
Reviewed-on: https://code.wireshark.org/review/26706
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
21 months agolemon: remove scan-build warning in errline().
Dario Lombardo [Sun, 1 Apr 2018 19:59:33 +0000 (21:59 +0200)]
lemon: remove scan-build warning in errline().

Warning: Argument with 'nonnull' attribute passed null.

Change-Id: Ie46733ae8663161b957acaabbaa2da539018693d
Reviewed-on: https://code.wireshark.org/review/26704
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
21 months agoQt: remove ws_buffer_start_ptr calls from clang-scan.
Dario Lombardo [Tue, 3 Apr 2018 19:34:55 +0000 (21:34 +0200)]
Qt: remove ws_buffer_start_ptr calls from clang-scan.

They are false positives.

Change-Id: I06b5c2d2f7f462143050ffd4a624f76a440d5d5a
Reviewed-on: https://code.wireshark.org/review/26729
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
21 months agorpcrdma: add check to prevent null dereference (found by clang).
Dario Lombardo [Tue, 3 Apr 2018 19:39:02 +0000 (21:39 +0200)]
rpcrdma: add check to prevent null dereference (found by clang).

Change-Id: Iff3e3a348d40e42569135179953a957f9012fd3f
Reviewed-on: https://code.wireshark.org/review/26730
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
21 months agoQt: Remove checks for version below 5.2
Roland Knall [Thu, 5 Apr 2018 13:12:39 +0000 (15:12 +0200)]
Qt: Remove checks for version below 5.2

This stops the main source from being buildable by Qt 4.x

Change-Id: I61edbae04ac2b3bf0ae8ee8e09d335083945c176
Reviewed-on: https://code.wireshark.org/review/26756
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
21 months agoDon't install PortAudio if we're not installing GTK+.
Guy Harris [Thu, 5 Apr 2018 18:48:01 +0000 (11:48 -0700)]
Don't install PortAudio if we're not installing GTK+.

Change-Id: I99bad59b34ff0688cf527ae69b5e48e4c14e7380
Reviewed-on: https://code.wireshark.org/review/26758
Reviewed-by: Guy Harris <guy@alum.mit.edu>
21 months agoglib: Require 2.32 or newer.
AndersBroman [Thu, 5 Apr 2018 06:19:30 +0000 (08:19 +0200)]
glib: Require 2.32 or newer.

Change-Id: Idaf90865d04532912a968fc2e05523aec14c4991
Reviewed-on: https://code.wireshark.org/review/26745
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoGTK Cmake: Remove the option to build the GTK UI.
AndersBroman [Thu, 5 Apr 2018 06:59:12 +0000 (08:59 +0200)]
GTK Cmake: Remove the option to build the GTK UI.

Change-Id: If702717b559a727388d83ce82c0fc2967c662ff0
Reviewed-on: https://code.wireshark.org/review/26747
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoAutotools: Remove the "with GTK" option.
AndersBroman [Thu, 5 Apr 2018 07:03:04 +0000 (09:03 +0200)]
Autotools: Remove the "with GTK" option.

Change-Id: If285b832d56b759766a041156db5e3dcde5b47ad
Reviewed-on: https://code.wireshark.org/review/26748
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoSIP: Change filter Retry-After to an FT_UINT32
AndersBroman [Thu, 5 Apr 2018 08:19:15 +0000 (10:19 +0200)]
SIP: Change filter Retry-After to an FT_UINT32

Change-Id: I745d0aa390b95d42ea9ed4ea645a157677bce948
Reviewed-on: https://code.wireshark.org/review/26753
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoextcap: Extend documentation for new features
Roland Knall [Thu, 5 Apr 2018 10:52:26 +0000 (12:52 +0200)]
extcap: Extend documentation for new features

Explain the new behavior for reload and version

Change-Id: I80d0f3338ac2e6a588964ce052ed49640155bc71
Reviewed-on: https://code.wireshark.org/review/26754
Reviewed-by: Roland Knall <rknall@gmail.com>
21 months agoextcap: Reload values on request
Roland Knall [Fri, 2 Mar 2018 14:41:00 +0000 (15:41 +0100)]
extcap: Reload values on request

Allow certaing elements to be reloaded upon request. The way
this works is, certain elements can be configured to be reloadable.

By doing so, the extcap is asked once more just for the values
list of this item, together with all already set options, and
reloads the available options depending on the response.

Only supported for selector. Radio and Multiselect will need
additional patches, also moving those parts outside of extcap_argument.cpp
might make sense before hand.

Change-Id: I2e9e3d109b334bf878835a7cc9354f468bc22dee
Reviewed-on: https://code.wireshark.org/review/26223
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
21 months agoextcap: Tell utilities the wireshark version
Roland Knall [Thu, 5 Apr 2018 08:02:27 +0000 (10:02 +0200)]
extcap: Tell utilities the wireshark version

Add an optional argument to extcap-version, which tells the utilities
the wireshark version and therefore allows them to handle different
versions differently.

If no version is provided, the utility has to assume it is dealing
with a Wireshark 2.x version (default behavior).

Change-Id: I51658300f28f503ca8050d204b73749f1a54df16
Reviewed-on: https://code.wireshark.org/review/26752
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
21 months agoQt: Require 5.2 or newer
AndersBroman [Thu, 5 Apr 2018 06:32:17 +0000 (08:32 +0200)]
Qt: Require 5.2 or newer

Change-Id: I2362e1cefa5cb806eab24bc3d9879b2e38d5b86e
Reviewed-on: https://code.wireshark.org/review/26746
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
21 months agoextcap: Add missing compatibliity function
Roland Knall [Thu, 5 Apr 2018 08:04:37 +0000 (10:04 +0200)]
extcap: Add missing compatibliity function

Otherwise the utility no longer works for Python 2.

Change-Id: Ibe2f09d26887603a971185253aeaf2521875770d
Reviewed-on: https://code.wireshark.org/review/26751
Reviewed-by: Roland Knall <rknall@gmail.com>
21 months agoTweak ws_cpuid so that Valgrind is happy.
Darius Davis [Tue, 3 Apr 2018 23:06:20 +0000 (09:06 +1000)]
Tweak ws_cpuid so that Valgrind is happy.

Valgrind considers the "cpuid" instruction to always depend on inputs from eax
and ecx, even though it's only a subset of values of eax for which ecx is
relevant.  If ecx is undefined when cpuid is executed, the outputs of cpuid
will be considered undefined.

Instead of suppressing the resulting uninitialised-value warning (the
suppression for which is now out-of-date anyway, now that
register_all_protocols is moved to a worker thread), let's simply set ecx to
zero in ws_cpuid.

Testing done: Built Wireshark on Linux amd64.  Before this change, running
   "tools/valgrind-wireshark.sh ./test/captures/dhcp.pcap" with
   valgrind-3.12.0.SVN on Debian 9.4 amd64 would yield the following Valgrind
   error:

   ==2416== Thread 2:
   ==2416== Conditional jump or move depends on uninitialised value(s)
   ==2416==    at 0xACB8B22: ws_mempbrk_sse42_compile (ws_mempbrk_sse42.c:58)
   ==2416==    by 0x74F4960: register_all_protocols_worker (register.c:37)
   ==2416==    by 0xB1403D4: g_thread_proxy (gthread.c:784)
   ==2416==    by 0xD438493: start_thread (pthread_create.c:333)
   ==2416==    by 0xB4CAACE: clone (clone.S:97)

   With the change, the above message is gone.  Inspected the disassembly of
   function ws_cpuid, and it looks sane -- just an added "xor ecx, ecx" at the
   top.

Change-Id: I2fb382309cac234c400286a6e9fac7d922912c63
Reviewed-on: https://code.wireshark.org/review/26733
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoLustre: Add barrier processing
Nathaniel Clark [Thu, 29 Mar 2018 20:24:59 +0000 (16:24 -0400)]
Lustre: Add barrier processing

In lustre 2.10 the ability to freeze/thaw the filesystem for
snapshotting was added.  This processes the new wire commands used.

Change-Id: Ie4d87b200078d2da1c983c9e8df2952c82c90d83
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-on: https://code.wireshark.org/review/26692
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoENIP-CIP-PCCC: add support for the CIP PCCC Object
Jared Rittle [Mon, 2 Apr 2018 19:28:04 +0000 (15:28 -0400)]
ENIP-CIP-PCCC: add support for the CIP PCCC Object

Support has been added to the EtherNet/IP (ENIP) CIP dissector (packet-cip.c)
to allow for the dissection of Programmable Controller Communication Commands
(PCCC). These commands are often seen in the traffic of Programmable Logic
Controllers (PLCs) communicating over the EtherNet/IP or DF1 protocols.
Dissection has been implemented directly in the packet-cip dissector,
following the structure put in place by other existing CIP classes such
as the Connection Manager.

Change-Id: Ia1e614fb7fd9fd36e79c0dac06cd5f1a9c1cea78
Reviewed-on: https://code.wireshark.org/review/26713
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoZigBee: Allow a different set of attributes for ZCL client and server
Kenneth Soerensen [Sat, 31 Mar 2018 19:23:47 +0000 (21:23 +0200)]
ZigBee: Allow a different set of attributes for ZCL client and server

Some clusters, for example the Smart Energy Metering cluster,
requires a different set of attributes for the ZCL client and
server but with overlapping IDs.

This change allows to specify a different set of attributes for
the ZCL client.

To avoid breaking existing clusters that might have client attributes
the same set of attributes are used for server and client when
zbee_zcl_init_cluster is called.

This new client attribute set is used in the Smart Energy Metering
cluster in this commit.

Change-Id: Ie25ad746dac1ccbb233ae8975ef9047d3fc6a170
Reviewed-on: https://code.wireshark.org/review/26694
Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Paul Zander <p.j.zander@lighting.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoZigBee: ZDP MGMT NWK Enhanced update notify
Dana Sy [Wed, 4 Apr 2018 18:37:53 +0000 (11:37 -0700)]
ZigBee: ZDP MGMT NWK Enhanced update notify

Added in a way to dissect the mgmt_nwk_enhanced_update_notify
(clusterID=0x8039). It still uses the same dissector as the non-enhanced
version (clusterID=0x8038) since it's payload is the same. Only difference
is the clusterID and it's name.

Change-Id: Icb3c5e895f5fbe2150325bd5e974406d18beb1c1
Reviewed-on: https://code.wireshark.org/review/26742
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months agoFixup extcap_example.py
Gerald Combs [Wed, 4 Apr 2018 18:56:06 +0000 (11:56 -0700)]
Fixup extcap_example.py

Run 2to3. Convert our payload to bytes. Switch from tab to 4-space
indentation as described in PEP8, which fixes a "TabError" message.

Change-Id: Ic20b6bc1fc1a945758c8be1bb54435f3326fb605
Reviewed-on: https://code.wireshark.org/review/26744
Reviewed-by: Gerald Combs <gerald@wireshark.org>
21 months agoextcap: Move extcap_foreach to a GList
Roland Knall [Wed, 4 Apr 2018 10:40:23 +0000 (12:40 +0200)]
extcap: Move extcap_foreach to a GList

Allow for a higher flexibility of the arguments passed to extcap_foreach

Change-Id: I19708ac9d6c2aceecd88d0f691b5155bb8027675
Reviewed-on: https://code.wireshark.org/review/26736
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
21 months agoextract_asn1_from_spec.pl: fix parsing of END tag
Pascal Quantin [Wed, 4 Apr 2018 17:51:53 +0000 (19:51 +0200)]
extract_asn1_from_spec.pl: fix parsing of END tag

Change-Id: I2eb73f74b456ffb5a9bae50e78f7edb4204912e0
Reviewed-on: https://code.wireshark.org/review/26740
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
21 months agoCMake RPM build: Try to get rid of %globals in favor of %bcond.
Anders [Wed, 4 Apr 2018 08:00:06 +0000 (10:00 +0200)]
CMake RPM build: Try to get rid of %globals in favor of %bcond.

Change-Id: I051fb722b0c4161b373f04a79288faa41a61c3cc
Reviewed-on: https://code.wireshark.org/review/26735
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>
21 months 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>