Build 3.2.0.

Change-Id: Idc3a1cf9baf4a3945083f55da315bea1517fab2f
Reviewed-on: https://code.wireshark.org/review/35494
Reviewed-by: Gerald Combs <gerald@wireshark.org>

macOS: More ChmodBPF signing updates.

Run osx-extras.sh before building the ChmodBPF installer package.

Change-Id: Iec3f88da86e48b5aac385369c7e68f23babc4c34
Reviewed-on: https://code.wireshark.org/review/35491
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit fd6cf89f21737cf11ab06bd5b77fb6cea4356f17)
Reviewed-on: https://code.wireshark.org/review/35493

macOS: Sign the ChmodBPF script.

Add macosx/osx-extras.sh, which can be used to sign the ChmodBPF script.

Bug: 15782
Change-Id: I9929dd6db067f8bc1097faac28ab9467f5a89a82
Reviewed-on: https://code.wireshark.org/review/35481
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 8dd407d97c89983b6d38deca5f742cde33be64fd)
Reviewed-on: https://code.wireshark.org/review/35492
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Qt: Don't crash when disabling all protocols.

Ensure that a protocol can be disabled before attempting to do so. Fixes
crash described at
https://ask.wireshark.org/question/13573/wireshark-crashes-in-the-enabled-protocols-dialog-box/

Change-Id: Ib774bb6d636e82b79c5a922272a39126da85b71d
Reviewed-on: https://code.wireshark.org/review/35489
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 5e5a87f45e652ec6c726292edd721da45101fd76)
Reviewed-on: https://code.wireshark.org/review/35490

ieee802.11: Support the latest band id values and fix MHz.

Change-Id: I4ef686f5dc9a43f94db34cab0f7fe466ef271585
Reviewed-on: https://code.wireshark.org/review/35482
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 53a6c26023342b5c288769a4f39092079816debe)
Reviewed-on: https://code.wireshark.org/review/35483
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>

MsgPack: add dissector to UDP port decode as list

Bug: 16278
Change-Id: I08082733f838364edc46c0fc8b3d1d95241c0c00
Reviewed-on: https://code.wireshark.org/review/35477
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-on: https://code.wireshark.org/review/35479
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

PROFINET: Profienergy record dissection

According to specification, missing profienergy records
and alarms are dissected.

Change-Id: I36eec046f0aff7f4b1235e50b6dc469847c1ac8d
Reviewed-on: https://code.wireshark.org/review/35389
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 12305928b2f40c12ff3f019fdbffaf5bcc21c9df)
Reviewed-on: https://code.wireshark.org/review/35475
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>

WSUG: Update the filter dialog section.

Change-Id: I394780c366afd832a1fbfcb93d6c1722edcea54c
Reviewed-on: https://code.wireshark.org/review/35442
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 7c61ab7cf25a4849efc2f46e67127b26b90b2388)
Reviewed-on: https://code.wireshark.org/review/35474
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot

FAQ: Update and remove entries.

Generalize the "missing bpf.h" entry. Remove the UCD SNMP and Fink
entries.

Change-Id: I276f2387c4bf017c7ba4f0a37cce525efd1c24ae
Reviewed-on: https://code.wireshark.org/review/35469
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 060716b8dff923616e730ec29d757bff78bf2389)
Reviewed-on: https://code.wireshark.org/review/35473
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot

TPNCP: Update tpncp.dat

Change-Id: I15d2bca76126607f395647000a042365020950f7
Reviewed-on: https://code.wireshark.org/review/35466
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit dd90a8fd6f5e0709311441f6e88209a5875bbae0)
Reviewed-on: https://code.wireshark.org/review/35471
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>

CMake: fix CMake 3.16 warning about CMP0071

Prevent a file from being processed by moc/uic as it is not needed. This
addresses a new CMake warning "Policy CMP0071 is not set: Let AUTOMOC
and AUTOUIC process GENERATED files."

Change-Id: I8ed458099cdf29472dad29168786cf16b95595fa
Reviewed-on: https://code.wireshark.org/review/35468
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 5cfd8bca953e7cd87bd9253609c63f86e6c2009b)
Reviewed-on: https://code.wireshark.org/review/35472
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

extcap: remove potential leak.

Found by clang.

Change-Id: I84359a2f7985bca8b0089200b3c37d04e06effe2
Reviewed-on: https://code.wireshark.org/review/35354
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Tomasz Moń <desowin@gmail.com>
(cherry picked from commit 1cd1e36a05bd0f14b38ce3978e3313d57b3b25d4)
Reviewed-on: https://code.wireshark.org/review/35464
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>

profiles: Try to better sync on disk config state

Profile specific column settings are split across the `preferences'
file and the `recent' file.  At any given moment the GUI column
settings held within the `preferences' file and the `recent' file
may be inconsistent with one another and with the GUI itself. These
inconsistencies occur because of when the GUI chooses to write
config changes to disk.

If Wireshark is not shutdown gracefully (for example when killed
or should crash) the column preferences saved on disk may not be
consistent between the current profile's `preferences` and `recent`
files and the most recently used profile may not be recorded within
the `recent_common' file. On restarting Wireshark these config file
inconsistencies can lead to unexpected artifacts.

Normally the column config state saved within the current profile's
`preferences' and `recent` files are made consistent when a
different profile is selected or when Wireshark is closed
gracefully.

This patch set attempts to improve the constancy of the on disk
config state with the GUI state by invoking the functions to write
the `recent' and `recent_common' files in a more timely manner.

Fix a typo while here.

Change-Id: I2af9d9eb2dcf9cc0d422e9840aa05f4f6b1aa086
Reviewed-on: https://code.wireshark.org/review/35407
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 8fbe28b1f0b24fee1e1a27ccdb6b8f893c43f133)
Reviewed-on: https://code.wireshark.org/review/35463

pcfp: add missing Usage Report Trigger indication

Oct7, Bit 2: TEBUR

Change-Id: If3668ba53b163c692fe81163c5e895fcd38b9539
Reviewed-on: https://code.wireshark.org/review/35422
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 2629bd208168cf50205c9cb9d4d9e83043faa701)
Reviewed-on: https://code.wireshark.org/review/35458
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

PER: Add a couple of NULL checks.

Check for NULLs in a couple of places found by scan-build. Fix a typo.

Change-Id: Idde75db6031fa9f2ffa36b7fa10b37bf676e0904
Reviewed-on: https://code.wireshark.org/review/35427
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>
(cherry picked from commit dd1daa41cd7fa9dc18cfa8696a60ad1c2a424de4)
Reviewed-on: https://code.wireshark.org/review/35457
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

m3ap: Info column lost at filtering.

Remove if (tree)

Change-Id: I1bb38fd8cdea85e026837ea1dc9bcd72b7432f1e
Reviewed-on: https://code.wireshark.org/review/35430
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 8b8bf626000291c0187715196ee907c1b5265a99)
Reviewed-on: https://code.wireshark.org/review/35456
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

MPLS: fix Downstream Detailed Mapping TLV label stack dissection

The label stack is its own TLV, which adheres to the same format as
others, with a tag and length (obviously). The length to be used for
this TLV is not the remaining length of this packet, but its own length.

Bug: 16273
Change-Id: I469b55c5d78d1899d87030f3c0a15fd1afdf3f85
Reviewed-on: https://code.wireshark.org/review/35436
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 6d7e98dd2b8fe577af3985611a922f9905a1a262)
Reviewed-on: https://code.wireshark.org/review/35451

WiFi: Properly parse bitmap sections (CID-1451085)

Compressed block acks, in the form of 256 bit bitmaps, are parsed
per 64 bit section. Scanning along a section needs to be done by
indexing this section, not the full 256 bits of the complete bitmap.

Change-Id: Id0e6a7299e14be1ad68dd1cf6d736123008854ac
Reviewed-on: https://code.wireshark.org/review/35440
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 625b71bb309c3a861053b12c0a928fdce03829f9)
Reviewed-on: https://code.wireshark.org/review/35449

H265: properly index 2D array (CID 1450950)

In the expression it seems to simply have been missed this is a 2D array.
Adding the 2nd index, as elsewhere in this function.

Change-Id: I21ce5a6fa70408f84cb61bbd09e7d3aeff9c1d85
Reviewed-on: https://code.wireshark.org/review/35441
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 2f42fda6004d14bef324399a6ae0d3b672b8c99f)
Reviewed-on: https://code.wireshark.org/review/35446

WSUG+WSDG: Remove description list formatting.

Remove the last of our description list term formatting. This is better
handled using CSS. Update the filter expression dialog DL text.

Change-Id: Ib21e2ee5265c9b476d960e7d73ac99b25b646141
Reviewed-on: https://code.wireshark.org/review/35437
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 85e47d9bcd4ac23d6ad83bc71f213de21cfab73f)
Reviewed-on: https://code.wireshark.org/review/35455
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

WSUG: Update the mailing list section.

Remove some formatting and link to the list archives.

Change-Id: I45c5a24b4a6d01234aafab71dc080cf98f4e22cf
Reviewed-on: https://code.wireshark.org/review/35435
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 8939d358e259c56a461f7a3fd27642afbc36a87c)
Reviewed-on: https://code.wireshark.org/review/35454
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

[Automatic update for 2019-12-15]

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

Change-Id: Ie59e2b8daf1d16e356807361dcec760d65ac2180
Reviewed-on: https://code.wireshark.org/review/35444
Reviewed-by: Gerald Combs <gerald@wireshark.org>

RTCP/MCPT: Limit list of SSRCs (CID 1455251)

When listing the SSRCs actually count down the number of SSRCs
when adding tree items.

Change-Id: Iad81dfc2dfd8d611b20d8ad564d8dbacb4a9980f
Reviewed-on: https://code.wireshark.org/review/35438
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit 595153ca99d82392a9dd0bb62b15d54ee245c6bb)
Reviewed-on: https://code.wireshark.org/review/35439
Reviewed-by: Anders Broman <a.broman58@gmail.com>

cmdline: cleanup option string definitions

Option string composition has grown organically over time and is
depending on compilation options also. This results in somewhat complex
macro definitions and the use of the string concatenation feature of the
C compiler. This change tries to clean up some of this magic by removing
definitions of empty strings and merging of adjacent strings.

Change-Id: I968449ea9b564915bee468a0cac0e114983ceebe
Reviewed-on: https://code.wireshark.org/review/35429
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit abd83d9961d7c90896d5f941ecd97850306e3b1f)
Reviewed-on: https://code.wireshark.org/review/35434
Reviewed-by: Anders Broman <a.broman58@gmail.com>

html2text: Skip generating footnotes for self-links.

Fixes the issue described at
https://www.wireshark.org/lists/wireshark-users/201912/msg00003.html

Change-Id: Ie3fd338ab1c6b216b05eeca002545868d3474bbb
Reviewed-on: https://code.wireshark.org/review/35426
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 31414484d464b09e4f915da340bc8bbfc7ed3963)
Reviewed-on: https://code.wireshark.org/review/35431

couchbase: Fix Dead Store

Fix dead store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Icd18de17e7564b946ea177df252dffd2370ff1a0
Reviewed-on: https://code.wireshark.org/review/35408
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit e1a876cf9d25351fd679f26d68b368f249e2f4ed)
Reviewed-on: https://code.wireshark.org/review/35416

3.2.0rc2 has been released.

Change-Id: Ia2787c900ed0d76e00c36a5f399c2ce032cf7b8b
Reviewed-on: https://code.wireshark.org/review/35415
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Build 3.2.0rc2.

Change-Id: I6e48e84a4c55eef1d108e7a51cfac620c6acfb5a
Reviewed-on: https://code.wireshark.org/review/35413
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Win32: Fixup our file dialog titles.

Add a "title" argument to each of the Win32 file dialog routines, and
pass in one constructed using wsApp->windowTitleString.

Change-Id: I5ff862bd28cd16093d99ae1559ecbaca907350da
Reviewed-on: https://code.wireshark.org/review/35383
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit dc19356be2bc30f6abf8aa0dee1ef630224dd35b)
Reviewed-on: https://code.wireshark.org/review/35412

NAS 5GS: fix LADN Indication ID in Registration Request

Change-Id: I46df64d47144eb943e8feee192d9bacb137b22c5
Reviewed-on: https://code.wireshark.org/review/35410
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
(cherry picked from commit 2df91a8742f0805a4f114c4efed475350264d5b9)
Reviewed-on: https://code.wireshark.org/review/35411

CMake: Fixup a variable in FindLZ4.cmake

Set "LZ4_PDB" instead of "LZ4_pdb" in FindLZ4.cmake so that CMake 3.16
will convert "${LZ4_DLL_DIR}/${LZ4_PDB}" to the full path to the LZ4
.pdb instead of its parent directory.

This in turn ensures that we don't pass a directory as a source argument
to `cmake -E copy_if_different`, which causes it to crash.

Bug: 16271
Change-Id: Id6f37584379bd07bc929bc5cb5e80cbe60a3c77e
Reviewed-on: https://code.wireshark.org/review/35402
Reviewed-by: Anders Broman <a.broman58@gmail.com>

LNET: fix malformed packet error on RDMA Read Request

Check the number of remaining bytes before comparing the
next four bytes to the LNet magic number to find out
whether or not this is an LNet layer.
In the case for an RDMA Read Request which does not have
any payload data, the LNet dissector now gracefully will
not process this packet as an LNet layer instead of
labeling it as a malformed packet.

Bug: 16269
Change-Id: I5d6abea8b79619849e8fbc1bc6b585995736b56e
Reviewed-on: https://code.wireshark.org/review/35392
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: Jaap Keuter <jaap.keuter@xs4all.nl>
(cherry picked from commit 34cbff30e9e5cfd7df2e0bf89e4cfe3048a457df)
Reviewed-on: https://code.wireshark.org/review/35395
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>

radiotap: Detect 11ad based on the frequency.

This works around the lack of a defined radiotap field for 11ad.

Bug: 16272
Change-Id: Ia851c644aee52ff9a138a36b16015d4112b5bf92
Reviewed-on: https://code.wireshark.org/review/35401
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 63d811bb38e051a84e53ce3150f53fa6c0e5d9d3)
Reviewed-on: https://code.wireshark.org/review/35404

Windows: update c-ares 1.15.0 package

Library was regenerated using g000e963fff596d817d03f366cd49b1fd2d6ec961
to have the proper version info.

Change-Id: I33f26d70ba1ea244aa467e5121b6fb586d8ebd8a
Reviewed-on: https://code.wireshark.org/review/35398
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Reviewed-on: https://code.wireshark.org/review/35399

Revert "extcap: Pass --extcap-version if extcap supports it"

This reverts commit 677ca96c27b9cda803b3d96a748612079b74d0eb.

Change-Id: Ie05bf7b42ac710007a7774d7610fc5f2b6639bed
Reviewed-on: https://code.wireshark.org/review/35394
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

extcap: Pass --extcap-version if extcap supports it

This change makes the --extcap-version argument to be passed to the extcap
script, if it is supported. If the extcap fails with --extcap-version argument,
it is treated as legacy and will not receive the additional argument in all
subsequent runs.

Change-Id: I279aa38d9f39ed85ccb84ba2c09dd93a0492ca51
Reviewed-on: https://code.wireshark.org/review/34914
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>
(cherry picked from commit 9910d8c913d2a1874c7f98ef3bf3ad2921dd67e4)
Reviewed-on: https://code.wireshark.org/review/35386
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

btatt: check the opcode against the current data.

While here:
- some indentation fixes
- add defines for missing ATT_OPCODEs

Bug: 16258
Change-Id: I2cd8172bcff9c209bbddc4729573c008a8e81fec
Reviewed-on: https://code.wireshark.org/review/35339
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 68a7add68a725203cccf98d7d6c752a6bad866c0)
Reviewed-on: https://code.wireshark.org/review/35387
Reviewed-by: Dario Lombardo <lomato@gmail.com>

NGAP: catch NAS 5GS dissection errors

This is useful when the NAS 5GS heuristic to decode 5G-EEA0 packets does
a false detection, so as to dissect the rest of the NGAP PDU.

Change-Id: I4eaa3caf06e0ed8923795470a2def7a73438110e
Reviewed-on: https://code.wireshark.org/review/35380
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
(cherry picked from commit 6a1ba1af8dc709657d024efa7158ea59ed05b188)
Reviewed-on: https://code.wireshark.org/review/35381

TTLs are unsigned; format them with unsigned_time_secs_to_str().

Change-Id: I489c981e02b2ed0331981003777a5de54ba8221f
Reviewed-on: https://code.wireshark.org/review/35367
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 38638583c1bb075339ec9015ead04282b8cf322e)
Reviewed-on: https://code.wireshark.org/review/35368

dns: Unify display of TTL with time_secs_to_str()

Use same format for "Time to live" as for other ttl values by
appending the time_secs_to_str() output to the number of seconds.

Ping-Bug: 16263
Change-Id: Ie55bbf27bf9c44554d391b395d23c478ad401d98
Reviewed-on: https://code.wireshark.org/review/35358
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
(cherry picked from commit 803d47fd50c9f5e76cd0a43f34eb587e0f1d6804)
Reviewed-on: https://code.wireshark.org/review/35360

dns: Bring back TTL formatted with time_secs_to_str()

Display time to live as formatted by unsigned_time_secs_to_str().

This was removed in g42c52d8612 but the commit message for that change
was "Add more filterable fields around EDNS(0)", with no indication
of this change.

Bug: 16263
Change-Id: Ic21f4a4b18d15efbd770c708e37d6e0c15eee6ce
Reviewed-on: https://code.wireshark.org/review/35355
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 0820306494498722e53c361a436860b34c5bf35c)
Reviewed-on: https://code.wireshark.org/review/35356
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

Win32: Fix the Export Packet Dissections dialog title.

Change-Id: I25c40511b369ce93e1be2887488fc5389fdafd07
Reviewed-on: https://code.wireshark.org/review/35346
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>
(cherry picked from commit fe647fb08588e5d6b8a2e0e06903484379658461)
Reviewed-on: https://code.wireshark.org/review/35352

Make the TTL field unsigned, but keep warning if the high-order bit is set.

See RFC 2181, section 8 (and RFC 1035 erratum 2130, which notes that
section 3.2.1 says the TTL is signed but section 4.1.3 says it's
unsigned); RFC 2181 section 8 says "unsigned, but avoid sending values
that have the uppermost bit set, and treat values with the uppermost bit
set as a value of 0".  (STD 13 = RFC 1034, the "concepts and facilities"
DNS RFC, plus RFC 1035, the "implementation and specification" DNS RFC.)

Change-Id: I9be6ac4f190f62dafbc45d1923a95f8f21306a7d
Reviewed-on: https://code.wireshark.org/review/35343
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 8275036fda8a7a5b9d0819c0ea3e3e26ad6e45ec)
Reviewed-on: https://code.wireshark.org/review/35347
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

[Automatic update for 2019-12-08]

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

Change-Id: Iafaad0b999bc0b2cd85a8c1b9d76c395665785a2
Reviewed-on: https://code.wireshark.org/review/35349
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Release notes: This is the last branch that supports Windows 7.

Change-Id: Ibda7cca6098df4e1f13ece3eb3d6f2da2da5b8be
Reviewed-on: https://code.wireshark.org/review/35334
Reviewed-by: Gerald Combs <gerald@wireshark.org>

recent.c: cfield might be NULL

Avoid crash in GUI when using Edit Column widget.

Bug: 16245
Change-Id: Ic98be3f98144dcfa9796fadd142180e3aaf84a9e
Reviewed-on: https://code.wireshark.org/review/35301
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Craig Jackson <cejackson51@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit fd3180e98fca9c61a698381db98b86f8516dc7ab)
Reviewed-on: https://code.wireshark.org/review/35336
Petri-Dish: Gerald Combs <gerald@wireshark.org>

UDS: fix uds.rdbi.data_identifier filter length

Bug: 16256
Change-Id: Icd4b04193f9ad858859de84cf2bddc6e46c5e1a7
Reviewed-on: https://code.wireshark.org/review/35329
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
(cherry picked from commit 9689eea25f98d510423f44d33225fbcd89d77f92)
Reviewed-on: https://code.wireshark.org/review/35330

Update the release notes.

Change-Id: Idbb31cb0333afdec761bd5b43864da9fa65c0b1c
Reviewed-on: https://code.wireshark.org/review/35327
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Build 3.2.0rc1.

Change-Id: I68c57555e9569ffe884c186027dd315be65f50da
Reviewed-on: https://code.wireshark.org/review/35324
Reviewed-by: Gerald Combs <gerald@wireshark.org>

tools/debian-setup: correctly check the value of shell variables

These conditions would previously always evalute as true.

Change-Id: I7eb35f4eae417819090ba47103a266374847cbc5
Reviewed-on: https://code.wireshark.org/review/35305
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
(cherry picked from commit 9879850cc36cac3d3352ef87a6759c50e0c29c18)
Reviewed-on: https://code.wireshark.org/review/35319

tools: fix check of shell variables in other setup scripts.

Change-Id: I7423f994b2295ef8336c37fd2e53418d363a4327
Reviewed-on: https://code.wireshark.org/review/35309
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 469228a2e555d16a54dd31f73426d50f57b2ba50)
Reviewed-on: https://code.wireshark.org/review/35321

Back up to the beginning of the file if we don't have a gzip header.

If the first byte of the file is 31, and we advance to the next byte but
find it's not 139, back up to the first byte before falling through and
treating the file as uncompressed.

Add/expand some comments while we're at it.

Bug: 16252
Change-Id: I292b51f9cc04173482a43b26b0ce73c9e7aee570
Reviewed-on: https://code.wireshark.org/review/35315
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit b2a153db5eceafbbc8fd512277deca5c36866b9f)
Reviewed-on: https://code.wireshark.org/review/35316

Qt: We show preference panes using their module names.

PreferencesDialog::setPane takes a preference module name. Fix a
comparison in PrefModuleTreeView::setPane and update some variable names
in order to make things a bit more obvious.

Modernize some related code while we're here.

Bug: 16250
Change-Id: I8f4c7e5261a219e3f32e6e9a71574d81b1852219
Reviewed-on: https://code.wireshark.org/review/35304
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 7be2d964f04d8158782719ed41f3342c7f1c126d)
Reviewed-on: https://code.wireshark.org/review/35314

ieee1905: Fix an incorrect bit usage in the Client Association Even TLV.

Bug: 16246
Change-Id: Ic5962782b8a04d3e3bc4f9e00596ecca9359841e
Reviewed-on: https://code.wireshark.org/review/35300
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit c72413ec14357375bf2a36587c1492b8c73b4dcc)
Reviewed-on: https://code.wireshark.org/review/35302
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>

NSIS: The "Sshdump" option installs Ciscodump as well.

Use consistent capitalization while we're here.

Change-Id: I0591654b0e73d33528f9cfe990a1491ce6cccc8b
Reviewed-on: https://code.wireshark.org/review/35278
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 63945535ac9232f74abe14c76024ff4c2a542137)
Reviewed-on: https://code.wireshark.org/review/35297

NR RRC: fix dissection of NAS container field

It is directly the S1 mode to N1 mode container and not a 5GS message header.

Change-Id: I5d8045065977083d3e5e59692166615afb429e41
Reviewed-on: https://code.wireshark.org/review/35285
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Reviewed-on: https://code.wireshark.org/review/35295

WSUG: Remove some old, unused images.

Change-Id: Id13d36579a62d826fab1393907c66217772ecb03
Reviewed-on: https://code.wireshark.org/review/35287
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 242632c0b780a9b0fa449ca243f6b93040b13915)
Reviewed-on: https://code.wireshark.org/review/35296

kafka: don't use an empty tvb list.

Bug: 16242
Change-Id: I1a7cfa504d46cab681c7803227102cafcda519fa
Reviewed-on: https://code.wireshark.org/review/35277
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 8dcd1e2bcd1037f6ee2f7e5ec6e853006c4f2634)
Reviewed-on: https://code.wireshark.org/review/35280
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Documentation: update (long) cmd line options

Documentation of the Tshark and dumpcap command line options between
help text, manual page and user's guide diverged over time. One aspect
of this is the implementation of more long options. This change tries to
update all documentation to be complete and in sync again.

Change-Id: Ifcc378059282e26764f15526b80753989cefb13b
Reviewed-on: https://code.wireshark.org/review/35276
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

IEEE 1609.2 dissector issue when HeaderInfo.generationLocation field is present

Bug: 16139
Change-Id: Ie5ad0025730257807b590f7ff9ac275ba27cce9e
Reviewed-on: https://code.wireshark.org/review/35266
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 7554369a798349f6c35f6f0deecffbe947f9d03a)
Reviewed-on: https://code.wireshark.org/review/35273

[Automatic update for 2019-12-01]

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

Change-Id: I51ea0b2a1daf1d25627131be6e825bd3bebe5f74
Reviewed-on: https://code.wireshark.org/review/35270
Reviewed-by: Gerald Combs <gerald@wireshark.org>

couchbase: Update dissector for latest 6.5.0 DCP snapshot marker

Decode the v1/v2.0 formats which are relevant for the upcoming
6.5.0 release.

Change-Id: Ie726f1ebd2457f6a36b096a0cd0bed9c94f713df
Reviewed-on: https://code.wireshark.org/review/35251
Reviewed-by: Ben Huddleston <ben.huddleston@couchbase.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
(cherry picked from commit d4ca6cc550e98f4a4f2f879a3572ea56792caf45)
Reviewed-on: https://code.wireshark.org/review/35262
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Add support for first frames with CAN-FD

In the case CAN-FD is used as a transport, the header of ISO15765
changes for first frames (ISO 15765-2:2015). This patch uses the
introduced `struct can_info` to access the relevant metadata of the
underlying CAN frame. Dissection is chosen accordingly.

Ressources:

* https://www.can-cia.org/fileadmin/resources/documents/proceedings/2015_hartkopp.pdf
* http://s3.eu-central-1.amazonaws.com/cancia-de/documents/proceedings/slides/hartkopp_slides_15icc.pdf
* https://github.com/linux-can/can-utils/commit/8150e21a1129c4b822d73186cd63e0e9fbf4c32d

Change-Id: I248acacab62b51659efaed400b828ac0bb9e3c55
Reviewed-on: https://code.wireshark.org/review/35247
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 6e4b8ac35b58e49f78015431e4d7bab8eb9b6028)
Reviewed-on: https://code.wireshark.org/review/35258

Change struct can_identifier to can_info

The can specific data structure `struct can_identifier` is used as
supplementary data for higher level dissectors. This patch adds more
data to this struct and renames it accordingly to `struct can_info`.

More supplementary data is needed in order to dissect iso15765
correctly, since the header format depends on details on the underlying
CAN protocol (CAN 2.0B vs CAN-FD).

Change-Id: Id068cf38453f98b67a5ec470a22e7013548c5a14
Reviewed-on: https://code.wireshark.org/review/35246
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 40eece98f8e6bc9a0a8f0961e43e95f538322aec)
Reviewed-on: https://code.wireshark.org/review/35256

TLS: support Facebook's TLS 1.3 draft 23 and 26 versions

Verified with fizz-tls13-draft-23-26-rfc8446-dsb.pcapng from the bug.
Decryption of early data, handshake and application data for almost all
versions (draft 23, draft 26, RFC 8446) is working. Only early data
decryption for draft 23 fails because the draft version is not yet set
during trial decryption before the Server Hello is received. That is
such a rare case however, do not bother fixing that.

Bug: 16175
Change-Id: Ie9046bf3f04c40b9c8fa2128f06844d2e7bd3e6d
Reviewed-on: https://code.wireshark.org/review/35245
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit 7c3ae2b5ab0b9f4c683c3dc8b520ed3c0cd99726)
Reviewed-on: https://code.wireshark.org/review/35252
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

WireGuard: fix MAC1 computation for non-zero reserved case

Peer identification failed because the MAC1 value did not check out.
Fix the computation in case the reserved bytes are overwritten after the
original protocol has run.

Change-Id: I4be65806bed96d7236103ebb369c1affcadebd5f
Reviewed-on: https://code.wireshark.org/review/35219
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit 12d72be15b90cc76f7709fd944682224257ec236)
Reviewed-on: https://code.wireshark.org/review/35244
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

WireGuard: support Decode As and non-zero reserved bytes

Recognize Cloudflare Warp traffic which may use non-zero bytes for load
balancing purposes. This is an extension of the WireGuard protocol, it
is not understood by official implementations which require the reserved
bytes field to be zero.

Change-Id: Iff789b538ab8477d8b5014302569264823d92358
Reviewed-on: https://code.wireshark.org/review/35215
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 69201185adfc0359abe08f6ed6befbea93c63f94)
Reviewed-on: https://code.wireshark.org/review/35243
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

Qt: focus the correct field when switching packets

Instead of just visually marking a field after switching packets, make
sure that it is also focused such that arrow up/down keys select the
expected fields instead of the root node (the Frame layer).

Change-Id: Ic16462198fb2189496f0cceeb5a5e885673636d2
Reviewed-on: https://code.wireshark.org/review/35236
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
(cherry picked from commit b1b4cd40d5587b48f1bbc86160684dd8f28ab86f)
Reviewed-on: https://code.wireshark.org/review/35241
Petri-Dish: Roland Knall <rknall@gmail.com>

Annnnnd fix another typo.

Change-Id: Ida3a64adf6507f00f18cb78a1635dad34893a621
Reviewed-on: https://code.wireshark.org/review/35231
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 15faccd2e4077b3449a9b487cc008cb74e991d37)
Reviewed-on: https://code.wireshark.org/review/35235

Add short descriptions of the PHYs other than the legacy PHYs.

Put short descriptions after the amendment name, in parentheses.

Fix a typo in the 802.11d entry while we're at it.

Change-Id: I87d84678f30abe40c4b130cf0a9355bb5da99df4
Reviewed-on: https://code.wireshark.org/review/35229
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit e9b58b1d406ace9e427d1b6e836a8f5de1b736d7)
Reviewed-on: https://code.wireshark.org/review/35234

Add entries for 802.11ad and 802.11ah PHY values.

Change-Id: Ib8c2f196af2bba32004a66a7b2414b493023edbb
Reviewed-on: https://code.wireshark.org/review/35228
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit ac5c03e21a765cee6694d042f9c5d85d77be3963)
Reviewed-on: https://code.wireshark.org/review/35233

Add more support for the 802.11ax PHY.

Set it as the PHY type if we see the HE field in a radiotap header, and
report that PHY type as "802.11ax" in the generic radio metadata
dissector.

Change-Id: I181d2717d82bdca73e04b6111b2483ca099d48bb
Ping-Bug: 13207
Reviewed-on: https://code.wireshark.org/review/35227
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 473900d102244dc83e81c1335ac456e54525ebfe)
Reviewed-on: https://code.wireshark.org/review/35232

NGAP: dissect other variant of N2 SM Information (as found in 3GPP 29.502)

Change-Id: Ic928a8e06a685c8eea1c036fea1bbab46e9cdb11
Reviewed-on: https://code.wireshark.org/review/35218
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
(cherry picked from commit 9a647c6ed56982bc8e09fd836987f66f3748c599)
Reviewed-on: https://code.wireshark.org/review/35220

Qt: fix packet selection when modifiers are pressed

When the Conversation Shortcut (Ctrl-1) was pressed, the current packet
suddenly became deselected. Similarly for Go to First Packet (Ctrl-Home)
and Go To Next Packet (Ctrl-.).

Changing the selection mode to ExtendedSelection has as side-effect that
setCurrentIndex is affected by modifiers such as Ctrl and Shift. Since
Ctrl acts as a toggle, the current selection becomes empty and no
packets are selected. Fix this by explicitly requesting the selection to
be replaced.

Tested as follows:

 1. wireshark -r test/captures/dhcp.pcap
 2. Select packet 3.
 3. Press Ctrl-1, Ctrl-2. (Colors change, the packet remains selected.)
 4. Press Ctrl-Home, Ctrl-Down, Ctrl-.
 5. Observe that the packet details list is populated.

Change-Id: I17f00e7fbc6e63ad52b6a0543fd850b473e506a2
Fixes: v3.1.1rc0-762-gb3f240dbf8 ("Qt: Multiselection in PacketList")
Reviewed-on: https://code.wireshark.org/review/35203
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Roland Knall <rknall@gmail.com>
(cherry picked from commit 076334a70c553b9e535f85958b1039cdb231cee2)
Reviewed-on: https://code.wireshark.org/review/35217

Qt: Show all column types in context menu

Show all column types in the column context menu to improve usability
even more when show/hide columns. This is a follow-up to the improvement
to show custom column field names.

Change-Id: I0838c7ae6eec59960a0a70b485c372855e242dc0
Reviewed-on: https://code.wireshark.org/review/35206
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
(cherry picked from commit 6433e124745fe22a599dfb73ef727a8cfe876d66)
Reviewed-on: https://code.wireshark.org/review/35214

Qt: prevent inline completion from happening for filters

Commit v3.1.0rc0-1170-ga854811c4a replaced the deprecated
`setAutoCompletion(false)` call by `setCompleter(0)`. However, the
former has as side-effect that it prevents setLineEdit from creating a
custom completer. setCompleter on the other hand had no effect since
there was no existing completer.

To fix the issue, remove the completer after it is set by setLineEdit.
This has no effect on the completer from CaptureFilterEdit and
DisplayFilterEdit instances since they override the completer from
QLineEdit. To avoid any confusion, SyntaxLineEdit::setCompleter (and
completer) should probably be renamed, these are not used by QComboBox
since it is not marked as virtual method.

Bug: 16132
Change-Id: Iad619122eddb43eb4963347982bf65dacd29629b
Fixes: v3.1.0rc0-1170-ga854811c4a ("Qt: fix more more Qt 5.13 deprecation warnings")
Reviewed-on: https://code.wireshark.org/review/35198
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Roland Knall <rknall@gmail.com>
(cherry picked from commit 40897b0234748757434c6c7acbf4e1f8de082181)
Reviewed-on: https://code.wireshark.org/review/35213

Qt: fix crash on Next/Previous Packet in Conversation without selection

Protect against a NULL edt pointer. That can occur when the packet
details view is empty, e.g. when no packet is selected.

Bug: 16228
Change-Id: Ie9621db4b84b504e4d9cee2add5004df2e383970
Reviewed-on: https://code.wireshark.org/review/35204
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
(cherry picked from commit c9bb676118caade49e2f9365910a76cbc0a5f343)
Reviewed-on: https://code.wireshark.org/review/35209
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

ISAKMP: fix dissection of SA TEK payload for non IP address

Bug: 16229
Change-Id: I09220be32251b72ca5ef0475ce35b291ce3635c9
Reviewed-on: https://code.wireshark.org/review/35207
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
(cherry picked from commit dededba8ddbc4558795ee217b22014741e413e64)
Reviewed-on: https://code.wireshark.org/review/35208

Qt: fix display filter completion with few recent entries

If 1) the recent filters menu has less than 10 entries and 2) the cursor
position is not at the end of the filter, then completion would fail.
Additionally, pressing Enter on filters with syntax errors would also
end up being saved, unintentionally.

Fix these by disabling automatic addition of entries by Qt.

Change-Id: I612c6cb8f317beb5459919b5c65b837db6150d07
Reviewed-on: https://code.wireshark.org/review/35150
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
(cherry picked from commit d15d8527736343f0dc40f969944744b5d4c0125d)
Reviewed-on: https://code.wireshark.org/review/35196

[Automatic update for 2019-11-24]

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

Change-Id: I6d00116a1b36e6fd1414c502934a1e8e7b3aae82
Reviewed-on: https://code.wireshark.org/review/35193
Reviewed-by: Gerald Combs <gerald@wireshark.org>

docs: fix up MS toolchain references

Updated the toolchain references to VS 2019,
removing mentions of 2015 & 2017.

Bug: 16211
Change-Id: Ic1607ac2c2713a5d324d40319c4e1be5365eb6f7
Reviewed-on: https://code.wireshark.org/review/35180
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit b22a63d025ca6f33e6aa0cbc0a80a9478efde65d)
Reviewed-on: https://code.wireshark.org/review/35186

rtp_analysis_dialog.cpp: save any supported codec as .au

Change improves Wireshark ability to save rtp streams. It allows a user
to save any supported codec with 8 kHz rate. In real, it means G.711 and
G.729 for now.
There is no hardcoded codec limitation during save anymore. If code detects
unsupported codec or rate during save, it replaces samples with silence and
reports it. Therefore any added codec in future will be supported.

Note to RTP saving:
RTP streams (there can be up to two of them for save) can contain multiple
codecs in each direction - some of it can be supported and some
unsupported. What should be exported then?
Till my patch save do not run and a user received nothing even part of stream
was OK/encoded with supported codec.
Therefore I managed the code to start with export and do its best.
Unknown codec/part is replaced with silence and user is warned after
export. Therefore a user will get:
a) audio - when all codecs are supported (no warning)
b) mix audio/silence - when some codecs are supported (warning)
c) only silence - when no codec is supported (warning)

BTW same output user sees/gets in RTP player for years.

Change-Id: Id938d419f5841af46d2d2d3ddfaf1ec9a0235bcc
Reviewed-on: https://code.wireshark.org/review/35105
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-on: https://code.wireshark.org/review/35183
Reviewed-by: Anders Broman <a.broman58@gmail.com>

print: remove assert in get_field_data().

The check in the caller suggests this function can fail. The
assert should not be necessary, then.

Bug: 16218
Change-Id: Ic2186f3c51751db61436719bbf5bce609d364d40
Reviewed-on: https://code.wireshark.org/review/35162
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 986fec7f3ba9db9b60fe209fb5d41ba5d291cde5)
Reviewed-on: https://code.wireshark.org/review/35173
Reviewed-by: Pascal Quantin <pascal@wireshark.org>

NAS 5GS: fix for control plane service request identification

Change-Id: I1f2b6acd1bcaed003d021b110aafb2256bb7e62d
Reviewed-on: https://code.wireshark.org/review/35171
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
(cherry picked from commit ecb90a4e25ac9aad866c76a9d65839dc27c77519)
Reviewed-on: https://code.wireshark.org/review/35172

Qt: Remove a duplicate variable.

WiresharkDialog defines cap_file_, so there's no need to define it in
TrafficTableDialog.

Change-Id: I71e50da152de619fea71382400820990a05febc1
Reviewed-on: https://code.wireshark.org/review/35169
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 48725641c9029735d25ff4073894e1ee533e247c)
Reviewed-on: https://code.wireshark.org/review/35170

Initialize master-3.2.

Change-Id: I436c6f55c2094d3474d5a82389985a972504fde8
Reviewed-on: https://code.wireshark.org/review/35166
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Release notes: Update the new protocol list.

Update the new protocol list and clarify our Qt versions.

Change-Id: If4d5e591b4419cc3171616825201375fdc5401aa
Reviewed-on: https://code.wireshark.org/review/35165
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Qt: Display selected rows in overlay bar

Indicate all selected rows in the overlay bar for the PacketList

Change-Id: Icddf8607b59bde12701a7e7983df6acbf26e0d23
Reviewed-on: https://code.wireshark.org/review/35161
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>

Qt: Speed up selection handling

Improve the speed for selection checks in PacketList and MainWindow

Change-Id: Ic3a413624463a798b5d13102965f75c7b1347b5f
Reviewed-on: https://code.wireshark.org/review/35160
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>

Qt: Include Column Headings with Edit -> Copy -> Plain Text / CSV

Bug: 16215
Change-Id: Ie59aa354be055831055a294724f8d7b800d35d90
Reviewed-on: https://code.wireshark.org/review/35153
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>

PROFINET: Fix related to redundancy and PNIOStatus

According to specification, redundancy bit values in
packet-pn-rt.c are swapped. Moreover, endpoint type
was changed by Change 30821 and became ENDPOINT_NONE.
It has caused an error since related conversation can
not be found with its endpoint (ENDPOINT_UDP). Finally,
it is detected that when PNIOStatus is error, dissection
still continues but there is no data to dissect. This
defect is also fixed by this commit. (This change also
includes one fix for dead store.)

Change-Id: I09a07fd0027c4485ba84651e969b3de9d0012b5c
Reviewed-on: https://code.wireshark.org/review/35158
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>

Update to DICOM Edition 2019e

Change-Id: I680446e40acecc0ed6aefe29930f343375832796
Reviewed-on: https://code.wireshark.org/review/35152
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Tomasz Moń <desowin@gmail.com>

GSMTAP: fix empty INFO column for PTCCH/D messages

Change-Id: I3abc627ee0e88cc276511af66b33bda990fe5624
Reviewed-on: https://code.wireshark.org/review/35157
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>

GSMTAP: also consider PTCCH/D as a broadcast channel

Change-Id: Ie4cf6e5a00aa2a699e979f0ebd52f7dce084c8f4
Reviewed-on: https://code.wireshark.org/review/35156
Reviewed-by: Pascal Quantin <pascal@wireshark.org>

GSMTAP: use col_set_str() instead of col_append_str()

Change-Id: I1489239ba6f0f687d933e94e811e916300fe7089
Reviewed-on: https://code.wireshark.org/review/35155
Reviewed-by: Pascal Quantin <pascal@wireshark.org>

GSMTAP: drop _U_ attribute from arguments of handle_tetra()

Change-Id: I00abb41f513c7afcf95c8ed9a1fcdb64f3f14aa4
Reviewed-on: https://code.wireshark.org/review/35154
Reviewed-by: Pascal Quantin <pascal@wireshark.org>

ReleaseNotes: Add info about "Expressions"

They no longer reside to the right of the display filter toolbar, but
have been moved to Analyze->Display Filter Expressions... as well as
the context menu of the display filter edit

Change-Id: I5afb87a483838204be33f5b8b965643c2c95e306
Reviewed-on: https://code.wireshark.org/review/35151
Reviewed-by: Roland Knall <rknall@gmail.com>

docbook: Add USB 2.0 Link Layer to release notes

Change-Id: Ifb87e70b89f63fc633660924b730b73156872580
Reviewed-on: https://code.wireshark.org/review/35139
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

NSIS: Don't run Wireshark from the installer.

Remove the option to run Wireshark from the NSIS installer. As noted in
bug 16195, this runs Wireshark as Administrator which is something we
recommend against.

Bug: 16195
Change-Id: I0692262a611d72d9e9f9c2131ce71cc62b4737b1
Reviewed-on: https://code.wireshark.org/review/35143
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Remove "..." from end of Edit > Copy > As XXX menu items.

"..." at the end of a menu item means "this pops up a dialog, asking you
for more information so it can do XXX"; those items just copy without
asking the user anything.

Change-Id: I8bc42a468d4c5605a27ae3414ecabd30ea97d87e
Reviewed-on: https://code.wireshark.org/review/35148
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>