git.samba.org - metze/wireshark/wip.git/log

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>

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>

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>

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>

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>

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>

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>

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>

"#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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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

[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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>