metze/wireshark/wip.git
19 months agoextcap: Fix crash in extcap_verify_capture_filter
Stig Bjørlykke [Wed, 11 Apr 2018 07:22:13 +0000 (09:22 +0200)]
extcap: Fix crash in extcap_verify_capture_filter

This fixes a regression issue from g57fed5d1 when freeing the
arguments passed to extcap.

Change-Id: Ic4d6a129569f9e691fd2608e0229342b8b5e9783
Reviewed-on: https://code.wireshark.org/review/26870
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
19 months agoextcap: Fix whitespace issues
Stig Bjørlykke [Wed, 11 Apr 2018 07:26:51 +0000 (09:26 +0200)]
extcap: Fix whitespace issues

Change-Id: I70066077a55b094eb2e667d31190ae80c3b97b5f
Reviewed-on: https://code.wireshark.org/review/26871
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
19 months agoZigBee: MGMT Unsolicited Enh NWKUpdate dissector
Dana Sy [Tue, 10 Apr 2018 00:06:48 +0000 (17:06 -0700)]
ZigBee: MGMT Unsolicited Enh NWKUpdate dissector

Added a dissector for the mgmt_nwk_unsolicited_enhanced_update_notify
from the R22 spec (clusterID = 0x003b)

Change-Id: I5d60ef0a762f932a7f814743d1c219428c8f9e73
Reviewed-on: https://code.wireshark.org/review/26865
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>
19 months agozbee zcl: fill constant ett arrays at declaration time
Martin Kaiser [Wed, 11 Apr 2018 03:46:51 +0000 (11:46 +0800)]
zbee zcl: fill constant ett arrays at declaration time

This dissector defines a bunch of ett arrays, most of which contain a
constant list of ett entries. Fill those arrays directly when they're
declared, this is what the vast majority of other dissectors do.

Fix some whitspace things while at it.

Change-Id: Iae85e2449024ef04b2a44bd847c45515f8efc903
Reviewed-on: https://code.wireshark.org/review/26869
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>
19 months agozbee_zcl: (trivial) clean up decode_color_xy()
Martin Kaiser [Wed, 11 Apr 2018 02:08:53 +0000 (10:08 +0800)]
zbee_zcl: (trivial) clean up decode_color_xy()

remove unnecessary return statement
remove a wrong comment

Change-Id: I40afd8144178a2cccba67289d5a3120dd5719ad0
Reviewed-on: https://code.wireshark.org/review/26868
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>
19 months agopfcp: correction of length
Joakim Karlsson [Fri, 6 Apr 2018 17:05:31 +0000 (19:05 +0200)]
pfcp: correction of length

flags are uint8 but the whole list was set as uint16

Change-Id: I8726fe533253fd1339351f581e7a2fe01c0edce2
Reviewed-on: https://code.wireshark.org/review/26849
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: Matej Tkac <matej.tkac.mt@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agoNBSS: take into account snaplen when creating the TVB subset
Pascal Quantin [Tue, 10 Apr 2018 15:11:24 +0000 (17:11 +0200)]
NBSS: take into account snaplen when creating the TVB subset

Otherwise you can trigger an exception interrupting the packet dissection
when the snaplen defined is shorter than the payload length

Bug: 14598
Change-Id: Ibeb6482495ed67c7669574bdcd7c429523318428
Reviewed-on: https://code.wireshark.org/review/26858
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
19 months agoRPM: Make documentation installation optional.
Gerald Combs [Wed, 11 Apr 2018 01:57:36 +0000 (09:57 +0800)]
RPM: Make documentation installation optional.

Add a "guides" bcond so that we can make Asciidoctor and the HTML guide
installation optional.

Change-Id: I5f9e6cc59689dba7d600cc721547aed020652f00
Reviewed-on: https://code.wireshark.org/review/26867
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agoqt: capture file properties: add a splitter
Martin Kaiser [Tue, 10 Apr 2018 08:54:23 +0000 (16:54 +0800)]
qt: capture file properties: add a splitter

Add a splitter to the capture file properties dialog. This allows for
modifying the relative sizes of the details vs comment boxes. People who
paste lots of text into the capture file comment may want a lager box
for it.

Change-Id: Id79d9f5fd7e589a2ba88aa5f16b52bb37d7c47ae
Reviewed-on: https://code.wireshark.org/review/26845
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
19 months agoZigbee: Decode the ZCL extension field sets in the scenes cluster.
Paul Zander [Tue, 10 Apr 2018 11:46:13 +0000 (13:46 +0200)]
Zigbee: Decode the ZCL extension field sets in the scenes cluster.

Change-Id: Ida564e8c292819508fd2dd0fb5b650e95356459a
Reviewed-on: https://code.wireshark.org/review/26852
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: Martin Kaiser <wireshark@kaiser.cx>
19 months agoQt: Disable collapsible children in the main window.
Gerald Combs [Tue, 10 Apr 2018 09:25:53 +0000 (17:25 +0800)]
Qt: Disable collapsible children in the main window.

Set the childrenCollapsible property to false in the main window
splitters. Set the minimum size for the packet list, proto tree, and
byte views to a small (one em), consistent, and nonzero value. Otherwise
it's easy to inadvertently end up with a hidden main window view.

Bug: 14478
Change-Id: I07a352cf2cf0375829ae2e0cb53b2a7d717dbb7d
Reviewed-on: https://code.wireshark.org/review/26847
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
19 months agoRPM: support multiple ninja executables.
Dario Lombardo [Tue, 10 Apr 2018 14:11:46 +0000 (16:11 +0200)]
RPM: support multiple ninja executables.

Support ninja and ninja-build (Centos7) so far.

Change-Id: I846a0645f24f6cfdc83bd725827d1681a5a1f174
Reviewed-on: https://code.wireshark.org/review/26856
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agoRPM: install guides when using make.
Dario Lombardo [Tue, 10 Apr 2018 16:12:08 +0000 (18:12 +0200)]
RPM: install guides when using make.

Change-Id: I89ca826f39dea3f53b94a87ccc2fbe3f9bb4a2b1
Reviewed-on: https://code.wireshark.org/review/26861
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agotools: add openSUSE asciidoctor to rpm_setup.sh.
Dario Lombardo [Tue, 10 Apr 2018 16:11:41 +0000 (18:11 +0200)]
tools: add openSUSE asciidoctor to rpm_setup.sh.

Change-Id: I939110047739ac9b7a5c6984a84351d4fdfbf556
Reviewed-on: https://code.wireshark.org/review/26860
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agoImprove the documentation of tvb_new_subset_ routines.
Guy Harris [Tue, 10 Apr 2018 18:01:11 +0000 (11:01 -0700)]
Improve the documentation of tvb_new_subset_ routines.

First mention tvbuff_new_subset_remaining(), as that's good enough for
most uses.

Then mention tvb_new_subset_length(), which is what most of the
remaining cases should use; we weren't even documenting it.

Then mention tvb_new_subset_length_caplen(); we want that to be used
only when *absolutely* necessary.

Change-Id: I57a6c202d4a68b001ddca8bd4c7e1d271eb52ef9
Reviewed-on: https://code.wireshark.org/review/26864
Reviewed-by: Guy Harris <guy@alum.mit.edu>
19 months agoRename the last argument to tvb_new_subset_length().
Guy Harris [Tue, 10 Apr 2018 17:52:32 +0000 (10:52 -0700)]
Rename the last argument to tvb_new_subset_length().

In tvb_new_subset_length_caplen(), the captured length argument is
backing_length and the reported length argument is reported_length.  The
length argument to tvb_new_subset_length() is a reported length, not a
captured length, so call it reported_length, not backing_length.

Change-Id: Ibfb30e15bdd885d3c0fd66e2b4b07c4a45327f14
Reviewed-on: https://code.wireshark.org/review/26863
Reviewed-by: Guy Harris <guy@alum.mit.edu>
19 months ago"#if 0" out some currently-unused value_strings.
Guy Harris [Tue, 10 Apr 2018 17:42:24 +0000 (10:42 -0700)]
"#if 0" out some currently-unused value_strings.

Change-Id: I1535b8ec430bbf119c6cc58464da820603454265
Reviewed-on: https://code.wireshark.org/review/26862
Reviewed-by: Guy Harris <guy@alum.mit.edu>
19 months agoAdd, and use, "fetch signed value" for lengths < 40 bits.
Guy Harris [Tue, 10 Apr 2018 06:06:47 +0000 (23:06 -0700)]
Add, and use, "fetch signed value" for lengths < 40 bits.

Add 8-bit, 16-bit, 24-bit, and 32-bit "fetch signed value" routines, and
use them rather than casting the result of the 8/16/24/32-bit "fetch
unsigned value" routines to a signed type (which, BTW, isn't sufficient
for 24-bit values, so this appears to fix a bug
in epan/dissectors/packet-zbee-zcl.c).

Use numbers rather than sizeof()s in various tvb_get_ routines.

Change-Id: I0e48a57fac9f70fe42de815c3fa915f1592548bd
Reviewed-on: https://code.wireshark.org/review/26844
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agoNR (5G) PDCP
Martin Mathieson [Thu, 5 Apr 2018 12:04:06 +0000 (13:04 +0100)]
NR (5G) PDCP

Tested with some hand-generated PDUs.

Change-Id: Ic603d0ca4578d23121e438ac2458be34e63492d2
Reviewed-on: https://code.wireshark.org/review/26755
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
19 months agogsm_ipa: remove unnecessary if (tree) checks
Martin Kaiser [Tue, 10 Apr 2018 09:06:52 +0000 (17:06 +0800)]
gsm_ipa: remove unnecessary if (tree) checks

Change-Id: I4d6bd9d296fcbd35551e3da9d60e20848865330b
Reviewed-on: https://code.wireshark.org/review/26846
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
19 months agoRRC: upgrade dissector to v15.2.0
Pascal Quantin [Tue, 10 Apr 2018 09:30:23 +0000 (11:30 +0200)]
RRC: upgrade dissector to v15.2.0

Change-Id: I874466e05bbc1ff11c286078b482de2f27eccf8b
Reviewed-on: https://code.wireshark.org/review/26851
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
19 months agoReplace lbmpdm_fetch_uintN_encoded() with tvb_get_guintN().
Guy Harris [Tue, 10 Apr 2018 10:05:20 +0000 (03:05 -0700)]
Replace lbmpdm_fetch_uintN_encoded() with tvb_get_guintN().

They do the same thing.

Change-Id: I0ff800efca9e6812ae416677023c955869bbc0cc
Reviewed-on: https://code.wireshark.org/review/26850
Reviewed-by: Guy Harris <guy@alum.mit.edu>
19 months agoPFCP: Added dissection of new IEs 123-126
Matej Tkac [Mon, 9 Apr 2018 11:55:07 +0000 (13:55 +0200)]
PFCP: Added dissection of new IEs 123-126

    In accordance with the latest spec - 3GPP TS 29.244 v15.1.0

Change-Id: I1267590dc25ec946f4a33b5813b1a00deff357c1
Reviewed-on: https://code.wireshark.org/review/26826
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agoQt: Enable Emoji & Symbols selector again
Roland Knall [Tue, 10 Apr 2018 03:00:09 +0000 (11:00 +0800)]
Qt: Enable Emoji & Symbols selector again

Enable the emoji and symbols selector again.

Change-Id: I4ceb54ef2bdc0a268f9ec1ded597fdc01f2137c2
Reviewed-on: https://code.wireshark.org/review/26839
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
19 months agoThe message length is unsigned, not signed; treat it as such.
Guy Harris [Tue, 10 Apr 2018 05:34:45 +0000 (22:34 -0700)]
The message length is unsigned, not signed; treat it as such.

Add explicit checks for values that don't fit in a gint, rather than
relying on testing for < 1 catching that case.

Change-Id: I4181087e3499537da88117b710d56c6b5fe9ceaa
Reviewed-on: https://code.wireshark.org/review/26843
Reviewed-by: Guy Harris <guy@alum.mit.edu>
19 months agoGet rid of get_opaque_length() and unneeded length arguments.
Guy Harris [Tue, 10 Apr 2018 05:30:50 +0000 (22:30 -0700)]
Get rid of get_opaque_length() and unneeded length arguments.

In most calls to get_opaque_length(), the length is a constant, so just
directly fetch the length value.  In the calls in dissect_nodeid_list()
and dissect_kindid_list(), the length is an argument to the routine
making the call, and *those* arguments are, for each of the routines,
the same constant for all calls to the routine in question, so just
directly fetch the length value in those routines.

This lets us avoid checks for a valid length-of-length, so we don't need
to have the length-of-length be a signed value with -1 meaning
"invalid".  That's good, because nothing was actually *checking* for an
invalid length-of-length.

Change-Id: I58264c133977266f3214d6e4ca361f71ecc0b69a
Reviewed-on: https://code.wireshark.org/review/26842
Reviewed-by: Guy Harris <guy@alum.mit.edu>
19 months agoNb is an unsigned value; treat it as such.
Guy Harris [Tue, 10 Apr 2018 05:16:28 +0000 (22:16 -0700)]
Nb is an unsigned value; treat it as such.

Use proto_tree_add_item_ret_uint() to get its value, while we're at it.

Change-Id: I734da5f588d9a89e810490d657c09b9ad2ff08dd
Reviewed-on: https://code.wireshark.org/review/26841
Reviewed-by: Guy Harris <guy@alum.mit.edu>
19 months agomacos-setup.sh: More GTK and minimum supported version cleanups
Joerg Mayer [Tue, 10 Apr 2018 04:58:26 +0000 (06:58 +0200)]
macos-setup.sh: More GTK and minimum supported version cleanups

Change-Id: Ia2992fe65c2c16e4b42d252ba0f08266a95f4b10
Reviewed-on: https://code.wireshark.org/review/26840
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
19 months agoRevert "Don't use static GMutexes."
Anders Broman [Tue, 10 Apr 2018 02:24:46 +0000 (02:24 +0000)]
Revert "Don't use static GMutexes."

This reverts commit ba3f29b62fcb362b5385b7e35691f0c466d811fd.
Our minimum Glib level now supports this.

Change-Id: I55a783b7aaa1ebfce8f2870d0c24768029ced39e
Reviewed-on: https://code.wireshark.org/review/26838
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agoMySQL: Add initial support for command 30 (binlog dump gtid)
Daniël van Eeden [Mon, 9 Apr 2018 19:33:35 +0000 (21:33 +0200)]
MySQL: Add initial support for command 30 (binlog dump gtid)

Change-Id: I1442e401e4b5dbd07ae16bd21944bfb10f54cf53
Reviewed-on: https://code.wireshark.org/review/26833
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agoRevert "Docs: Reduce our TOC depth."
Peter Wu [Mon, 9 Apr 2018 03:08:00 +0000 (03:08 +0000)]
Revert "Docs: Reduce our TOC depth."

The Lua documentation has class names at its third level which is quite useful
to discover its documentation.

This reverts commit f5cd52c0fb8933973003e07ab130fefbdabfb4f4.

Change-Id: I2a2e82041ac46a1a9974727bbb1d5cbf6855a878
Reviewed-on: https://code.wireshark.org/review/26814
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agouser_encap: Copy all user_encap_t values
Stig Bjørlykke [Mon, 9 Apr 2018 12:34:00 +0000 (14:34 +0200)]
user_encap: Copy all user_encap_t values

Copy all values for user_encap_t in user_copy_cb() when duplicating
an entry in the DLT User table.

Change-Id: Ic695a6213e12d42b62c2a0614c7f598e57833cdf
Reviewed-on: https://code.wireshark.org/review/26827
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agoRemove const from fields in a dynamically-allocated structure.
Guy Harris [Mon, 9 Apr 2018 21:29:14 +0000 (14:29 -0700)]
Remove const from fields in a dynamically-allocated structure.

There's no need for them to be const, and that causes compiler warnings
when you try to give them a value.

Change-Id: I666a03dd443dff462de0fe2e393284f3341535d0
Reviewed-on: https://code.wireshark.org/review/26834
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
19 months agoieee80211: fixes min and max power values in item text (they are signed).
Adrian Granados [Mon, 9 Apr 2018 20:21:27 +0000 (16:21 -0400)]
ieee80211: fixes min and max power values in item text (they are signed).

This change further extends the fix for bug 14593 by making sure the
values min, max values shown in the item's info text match the
item's children values.

Change-Id: Ibac39e1f21a892a02753c3cf1604ed3b14eadc52
Reviewed-on: https://code.wireshark.org/review/26832
Reviewed-by: Guy Harris <guy@alum.mit.edu>
19 months agoRemove const from fields in a dynamically-allocated structure.
Guy Harris [Mon, 9 Apr 2018 20:04:53 +0000 (13:04 -0700)]
Remove const from fields in a dynamically-allocated structure.

There's no need for them to be const, and that causes compiler warnings
when you try to give them a value.

Change-Id: Ib9bb034f3876abb7e86b6c9f41ebdd35192b5af3
Reviewed-on: https://code.wireshark.org/review/26831
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
19 months agoQt: Fix MacOSX menu entries
Roland Knall [Mon, 9 Apr 2018 09:39:49 +0000 (17:39 +0800)]
Qt: Fix MacOSX menu entries

Remove various menu items added automatically on Mac OS X. The following
menu items have been removed:

- Edit / Start Dictation
- Edit / Emoji & Symbols
- View / Enter Fullscreen Mode
- View / Show Tab Bar - Hide Tab Bar

Bug: 13366
Change-Id: I44deae7ee8ea7a43926820e4f5d0517ece246939
Reviewed-on: https://code.wireshark.org/review/26823
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
19 months agogsm_ipa: Make sure the Osmo Extended IPA stream ID type is printed
Harald Welte [Sat, 7 Apr 2018 21:29:34 +0000 (23:29 +0200)]
gsm_ipa: Make sure the Osmo Extended IPA stream ID type is printed

Currently, each tree item of the IPA sub-tree will only list the
IPA stream identifier.  However, for the osmocom-specific sub-streams,
this is always "OSMO EXT", which is not very informative.

Make sure the tree item states something like "OSMO EXT GSUP" or
"OSMO EXT MGCP" to indicate the actual payload type based on the
osmocom sub-type.

Change-Id: Ic1536574c8679de778d5b3cfc680b85284d1b503
Reviewed-on: https://code.wireshark.org/review/26795
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
19 months agoiso14443: make the payload dissector configurable
Martin Kaiser [Sat, 7 Apr 2018 19:44:45 +0000 (21:44 +0200)]
iso14443: make the payload dissector configurable

Add an iso14443.subdissector table where other protocols can register
themselves for iso14443's payload. Register iso7816 dissector in this
table.

Change-Id: Idb17ae014449443448ec4c64017531bc69d806b3
Reviewed-on: https://code.wireshark.org/review/26821
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agoiso14443: decode the bitrates in the attrib message
Martin Kaiser [Mon, 9 Apr 2018 03:35:32 +0000 (11:35 +0800)]
iso14443: decode the bitrates in the attrib message

Change-Id: I10bd77d72984fcf045a3c80e900c034393b444ae
Reviewed-on: https://code.wireshark.org/review/26822
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
19 months agoRemove GTK+ tests.
Gerald Combs [Mon, 9 Apr 2018 05:19:57 +0000 (13:19 +0800)]
Remove GTK+ tests.

Change-Id: Iba2f9c669c81cfae675ab584ad0250f69aadb987
Reviewed-on: https://code.wireshark.org/review/26819
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>
19 months agoQT: keep cursor visible after completerion select
Michail Koreshkov [Fri, 6 Apr 2018 19:01:06 +0000 (22:01 +0300)]
QT: keep cursor visible after completerion select

Before it was like this (display filter line edit "lost" focus)
After press Enter in completion pupup, line edit stop show cursor.
I was confused every time because without cursor it look like focus lost.
But in fact focus is not lost and only cursor was disappear.

Now cursor is not disappear

Change-Id: I56979a1a774b6fb0b8b8be8239c01f5034c42fc8
Reviewed-on: https://code.wireshark.org/review/26781
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
19 months agoRemove GTK-related stuff from macos-setup.sh
Joerg Mayer [Mon, 9 Apr 2018 05:03:07 +0000 (07:03 +0200)]
Remove GTK-related stuff from macos-setup.sh

Change-Id: Iaf6298a5f810c9fa0c2a3c31cce50af8856d8d14
Reviewed-on: https://code.wireshark.org/review/26818
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
19 months agoDocs: Remove a bunch of GTK+ references.
Gerald Combs [Mon, 9 Apr 2018 04:11:26 +0000 (12:11 +0800)]
Docs: Remove a bunch of GTK+ references.

Change-Id: Icab98813d0b81a7337562e9857429d4bb98dc44c
Reviewed-on: https://code.wireshark.org/review/26817
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
19 months agoAutotools: More Qt4 removal.
Gerald Combs [Mon, 9 Apr 2018 01:52:04 +0000 (09:52 +0800)]
Autotools: More Qt4 removal.

Change-Id: I6609160530d2e2f0ca47c324de48aa659c253bcf
Reviewed-on: https://code.wireshark.org/review/26812
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
19 months agomain window: don't keep a dangling freeze_focus_ pointer
Martin Kaiser [Sat, 31 Mar 2018 17:03:10 +0000 (19:03 +0200)]
main window: don't keep a dangling freeze_focus_ pointer

Without this fix, Wireshark crashes when the user presses Ctrl-D or
selects Edit / Ignore Packet and the current focus is somewhere on the
bytes view.

To ignore a packet, we protect the actual ignore operation by calling
main window's freeze and thaw methods. We save a pointer freeze_focus_,
pointing to the widget that has the focus, and restore the focus during
thaw.

This causes a crash if the focused widget is part of ByteViewTab.
Ignoring the packet causes a redissection, the ByteViewTab and its
children are cleared. freeze_focus_ remains non-NULL but doesn't point
to a valid QWdiget any more. Calling freeze_focus_->setFocus() crashes.

Fix this by using a QPointer<QWdiget> for freeze_focus_. The pointer is
then reset to NULL when the QWdiget that it points to goes out of scope.

Change-Id: Icc1f71a9de971284c628b7815a7fc1a5cc0d5fe2
Reviewed-on: https://code.wireshark.org/review/26693
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Roland Knall <rknall@gmail.com>
19 months agoCMake: More Qt4 removal.
Gerald Combs [Sat, 7 Apr 2018 10:58:17 +0000 (18:58 +0800)]
CMake: More Qt4 removal.

Remove some Qt major version checks. Remove the ENABLE_QT5 option.

Change-Id: I891bc90956a2ea2cd5a7c50c56d9fcbfc963d6c2
Reviewed-on: https://code.wireshark.org/review/26785
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
19 months agoMark some fields as being in units of dBm.
Guy Harris [Sun, 8 Apr 2018 23:09:10 +0000 (16:09 -0700)]
Mark some fields as being in units of dBm.

Fix some formats to print unsigned values with %u while we're at it.

Change-Id: If4a8793c77d4fbff0dd19f17e31cd18107db02ba
Reviewed-on: https://code.wireshark.org/review/26810
Reviewed-by: Guy Harris <guy@alum.mit.edu>
19 months agows_pipe: Zero an array.
Gerald Combs [Sat, 7 Apr 2018 05:36:31 +0000 (13:36 +0800)]
ws_pipe: Zero an array.

Make sure we zero-initialize pipeinsts, otherwise ConnectNamedPipe will
have indeterminate behavior according to the MSDN documentation for the
OVERLAPPED structure.

Change-Id: I38d9680cf01b0a8f9e566a85a7a330f6c0aa9a48
Ping-Bug: 14532
Reviewed-on: https://code.wireshark.org/review/26784
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>
19 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>
19 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>
19 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
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>
19 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>