text2pcap: Fix IPv6 checksum

Add the length field in the IPv6 pseudo header struct and refactor the
pseudo headers initialization

Change-Id: Ie0490dfba051a1112e465aaa6d03909417b2977e
Reviewed-on: https://code.wireshark.org/review/30407
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

text2pcap: Fix -i <proto> when IPv6 (-6) is specified

When the -i <proto> option is specified the hdr_ip was always set to
TRUE which resulted in a wrong header length when the IPv6 (-6) option
is specified as well. To resolve this set hdr_ip only when -i is specified
without -4 or -6 options.

Change-Id: I21898f27ceaad603b9275ab6878ff4bd8f9586cd
Reviewed-on: https://code.wireshark.org/review/30411
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

Qt: omit initial empty line in About Dialog / Acknowledgements

Follow the logic in tools/generate_authors.pl for matching the
Acknowledgements section (which looks for a substring match instead of a
literal string.

Change-Id: I42e1553b6820af3fb2d5b9cda0fa0e6e6ca7e729
Reviewed-on: https://code.wireshark.org/review/30432
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

text2pcap: Fix IPv6 payload length

According to RFC 8200 the payload length must contain the length of the payload
without the IPv6 header's length

Change-Id: Ibeb18c243edc396eaac6d2ffde73d6c4a6fe75a0
Reviewed-on: https://code.wireshark.org/review/30406
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>

QUIC: move NCI Sequence(i) field after CID Length field (draft -15)

on NEW_CONNECTION_ID frame

Change-Id: I6bd9a158358eb5277f582b376bce2e71bd6af496
Ping-Bug: 13881
Reviewed-on: https://code.wireshark.org/review/30419
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix pluginifdemo with DISABLE_WERROR

Change-Id: I19853157ea2cbe3a28c06493a32b73913c1aad84
Reviewed-on: https://code.wireshark.org/review/30429
Reviewed-by: Anders Broman <a.broman58@gmail.com>

IEEE1609dot2: generate automatically dissector from ASN.1 description

Add basic OER support to asn2wrs.py. There is still work required as we
miss many basic functions in packet-oer.c file.

Change-Id: I3ebebdb2e9b0c90eb1dfa8885cebbb077b16f246
Reviewed-on: https://code.wireshark.org/review/30434
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

OER: fix a few typos

Change-Id: I1a872e29b5ee0706c69ce249c7741c7aab6920c0
Reviewed-on: https://code.wireshark.org/review/30433
Reviewed-by: Anders Broman <a.broman58@gmail.com>

CMake: fix broken oss-fuzz build due to the -pie option

check_function_exists (as used by FindZLIB.cmake) seems to fail with the
-pie option as well, do not try to enable it when building for oss-fuzz.

Change-Id: I7d7e0fce1972483a14ac0a91a9f144f22c5ae8a0
Fixes: v2.9.0rc0-2349-g895ad30b5a ("CMake: Fix -pie linker test")
Reviewed-on: https://code.wireshark.org/review/30431
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

macos: Prevent darkmode from appearing

Prevent dark mode from being used on newer versions of mac os x, as long as
Qt does not allow proper dark mode handling

Change-Id: Ifee14ec690331689b0a8a7486829dd129a2687b4
Reviewed-on: https://code.wireshark.org/review/30425
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>

Fix About->Acknowledgements

Add prefix and postfix "=" to satisfy text splitter to avoid empty text area.

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

to_str: Fixed incorrect order of checks in bytestring_to_str.

Issue revealed by commit 281dd22da96daa105580bf25f064ddfdc99a719d.
The commit that revealed the issue allowed bytestring_to_str to be
called when len was 0 and *ad was NULL causing a dissector bug to be reported.

Change-Id: I01c2c04154e0514dc2702b5c1c43ed5074d0ac11
Reviewed-on: https://code.wireshark.org/review/30421
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

Update couchbase dissector for new expiration format

Adding delete time to the expirtation packet

Change-Id: I1881892122182a7656bde5b93e2de969f6f1b615
Reviewed-on: https://code.wireshark.org/review/30404
Reviewed-by: Jim Walker <jim@couchbase.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

QUIC: Initial support of draft-15

Update quic_version_vals value string
and update spec URL

Ping-Bug: 13881
Change-Id: I0f8368e94792bd1c7c1cd8c2e94a1d78eac5709a
Reviewed-on: https://code.wireshark.org/review/30417
Reviewed-by: Anders Broman <a.broman58@gmail.com>

DHCP: Fix RFC 4578 erratum number.

The link to the erratum for RFC 4578 is wrong -- I probably accidentally hit
Ctrl+A in Vim insert mode and incremented it.

This trivial comments-only change corrects the erratum ID from 4625 to 4624.

Change-Id: If0495b7900ce4dbf63328a4568d04f8407012c10
Reviewed-on: https://code.wireshark.org/review/30412
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Get rid of the radiotap tap.

1) it doesn't supply any information not supplied by the new
"wlan_radio" tap and, in fact, supplies less information (including not
supplying any presence flags);

2) it only works for radiotap headers, not for any other forms of radio
metadata;

3) its data structure wasn't declared in a header available to any
listeners, it was defined internally to the radiotap dissector.

Change-Id: Ie84a48bbf204b8b3bb40370c17ca82d39e5df3fb
Reviewed-on: https://code.wireshark.org/review/30415
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Add a tap for the radio dissector that passes the pseudo-header.

That's what tap listeners that want radio information should use.  (If
they need additional radio information, they should expand the
pseudo-header structure and have *all* the libwiretap readers and
radio-metadata dissectors that fill in that structure fill it in - or
not mark it as present if there's nothing to fill it in with.)

Also, note that the "nav" field appears to be the duration field from
the frame header.

Change-Id: Ia09c69f6463371c880f2bddfc58760699b796049
Reviewed-on: https://code.wireshark.org/review/30414
Reviewed-by: Guy Harris <guy@alum.mit.edu>

The signal strength and noise in dB from an arbitrary reference are unsigned.

The radiotap spec says "dB antenna signal" and "dB antenna noise" are
unsigned.  Make it universally so.

Change-Id: Iea2c5360d7352ca5e84862ea338d1fc689272191
Reviewed-on: https://code.wireshark.org/review/30410
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Calculate the signal/noise ratio.

If we have signal and noise in dBm, the difference between them is the
SNR, in dB.

Bug: 15243
Change-Id: Iaa17ef9ac39e18eccb7d1f75367fde24abab0180
Reviewed-on: https://code.wireshark.org/review/30408
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Handle signal/noise in dB from an arbitrary point in the 802.11 radio dissector.

While we're at it, only set the RSSI column once - no need to do it at
the beginning and later when we're setting fields.

Change-Id: Ia729019e5e6dfbe1cdad61f1f8397b0a3a171996
Reviewed-on: https://code.wireshark.org/review/30405
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Do bounds checking on scidx arrays.

Fix up some comments while we're at it.

Bug: 15203
Change-Id: I1d8ab71f618a74bbf0625eb89eb836c48200b5dd
Reviewed-on: https://code.wireshark.org/review/30401
Reviewed-by: Guy Harris <guy@alum.mit.edu>

QT: Enable filtering entries in 'Export Objects'

Change-Id: I5e9025545f9127d1c5c6200844f9b917af975998
Reviewed-on: https://code.wireshark.org/review/28844
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

CMake: Fix -pie linker test

Fix wrong argument order on invocation of check_c_linker_flag().

Change-Id: If4b016b428983580f3fbd00433bee904db97b2a3
Reviewed-on: https://code.wireshark.org/review/30397
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>

[Automatic update for 2018-10-28]

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

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

Update plugins.example/README

Change-Id: Ib428859b75e1c196cf9fa81ebae4969bbce079f2
Reviewed-on: https://code.wireshark.org/review/30396
Reviewed-by: João Valverde <j@v6e.pt>

wsp: remove a bunch of if (tree) checks

and the comments saying that those checks are a good idea

Change-Id: Ie2d6ee769abb76fd83df97cebdd896686dee5db9
Reviewed-on: https://code.wireshark.org/review/30395
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>

Add aptX HD dissector support

Change-Id: I12551435e828d84abac47d0d38822e93ee5adb51
Reviewed-on: https://code.wireshark.org/review/28973
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

IAX: Use extended 64 bit value to string matching for codecs

Change-Id: I23fe00594296dd29b456804043b6302bd0219884
Reviewed-on: https://code.wireshark.org/review/30394
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

IAX: Improve decoding of IAX2 codec details

This adds a number of new codecs and extends the dissector
to handle 64 bit codec masks correctly.

Change-Id: Ib9ad5d178db269ba56bbac8ef6429cca49f6fc33
Reviewed-on: https://code.wireshark.org/review/30384
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Add support for extended 64 bit value to string matching

This adds val64_string_ext to parallel value_string_ext in the
same way that val64_string parallels value_string.

Change-Id: Iadbfc49f5a4540000ed92fd0469e8d273911e97e
Reviewed-on: https://code.wireshark.org/review/30385
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

s7comm: Remove duplicate entry in event-id list

Change-Id: I68af3fec94721580d0c9e6c2cf44e45a32fa5b19
Reviewed-on: https://code.wireshark.org/review/30392
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ZigBee: Dissect payment control configuration attribute within SE prepayment

Change-Id: I3774761aa41e6f212d506d4b12e9a45cf56f0795
Reviewed-on: https://code.wireshark.org/review/30390
Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

checkAPIs.pl: fix false positive in value_string.h

check_value_string_arrays accidentally considered a part of
value_string.h as value_string definition:

    Error: epan/value_string.h                : {0, NULL} is required as the last value_string array entry: value_string array_name[]
    #define _VS_ARRAY_TYPE_NAME(array_name) const value_string array_name[]

    #define _VS_ENUM_ENTRY( name, value, string) name

Stripping all pre-processor statements (like #define) would be one way
to solve it, but at least one function checks for the presence of a
macro, so instead forbid '#' in the regex for variable name.

Change-Id: I4f47b3a42714c5bc526b0ecd8d2fb1ab076d00a2
Fixes: v2.9.0rc0-1929-g73644b3f76 ("checkAPIs.pl: speed up check_value_string_arrays and remove_if0_code")
Reviewed-on: https://code.wireshark.org/review/30391
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

Qt: fix saving exported objects after sorting columns

Avoid assuming an export object's row number is consistent throughout,
because the row number can change if the display is filtered or sorted.
Instead, look up the index in the model with mapToSource().

Bug: 14545
Change-Id: I61099dfb4f3abc056417eb7d6ffbc7a988553dd8
Reviewed-on: https://code.wireshark.org/review/30388
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

docsis: Fixed reassembly for REG-REQ-MP and DBC-REQ MMMs

Change-Id: I4df7d7a7f0045f3ca360f683feb61f66e070ef76
Reviewed-on: https://code.wireshark.org/review/30387
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

DOCSIS: decoding of Mac Management Multipart field + use in OPT-RSP

Change-Id: I6d5feaaac703beca5c605a3f6f8915d19821033d
Reviewed-on: https://code.wireshark.org/review/30363
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ZigBee: Add new Sub-GHz Notification flags

Change-Id: I391e47c2c6cb7148d6c46d1d852ef70c84b27464
Reviewed-on: https://code.wireshark.org/review/30382
Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

SV: Fix handling data length

Read not more data than protocol length defines.

Bug: 15224
Change-Id: I90e003c231fe75686065f8c44f70b5bb1df472c9
Reviewed-on: https://code.wireshark.org/review/30377
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

PER: Handle 0 length in dissect_per_octet_string_containing_pdu_new.

Change-Id: I4f376ed661724aded2d2cd1d2a34fc7ddfec1c74
Reviewed-on: https://code.wireshark.org/review/30380
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

RTPS: Added Endpoint Discovery reassembly

Added reassembly of the Endpoint Discovery Data and added the
writer id to the fragment_add_check() function as the data to be
used to identify fragments belonging to the same packet.

Also changed the order of the modification of the INFO column for
Discovery fragments (first add status, then the [Reassembled] tag).

Change-Id: I1e830a07cecbfffe8a8fa9514e54d2e0aefb59c1
Reviewed-on: https://code.wireshark.org/review/30379
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

dissectors: Fix visibility and header installation

Registration definitions for built-in dissectors are internal to
libwireshark.

Change-Id: Icd7065731459848bd6aabe721ae1da6d2e7ced34
Reviewed-on: https://code.wireshark.org/review/30371
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

nas5gs: Improve dissection of Mapped EPS bearer contexts.

Change-Id: I7be662efbf2f634f8974cd080c3f38705a74d1a0
Reviewed-on: https://code.wireshark.org/review/30378
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

release-notes: drop a line about APT-X renaming.

Was missing in 53089029c1.

Change-Id: I76150bf1783c85436ee6c0e38cce7b597f0e850c
Reviewed-on: https://code.wireshark.org/review/30376
Reviewed-by: Anders Broman <a.broman58@gmail.com>

SSH: Display Host Key Type Length

Currently the type length of the host key is parsed but not displayed.
This commit fixes that.

Change-Id: I3db149129609c3ec5cd24e1031c35481ce3d2f81
Reviewed-on: https://code.wireshark.org/review/30375
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

SSH: Display padding value in outermost tree (Binary Packet)

The SSH dissector currently displays the padding as a member of the
Key Exchange Tree.
According to the RFC, the padding is a member of the 'Binary Packet'.
This commit adjusts the display accordingly.

Change-Id: I24ea2b44b8b7253bbdf61057cb7f0b845d6e7f74
Reviewed-on: https://code.wireshark.org/review/30372
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

RTPS: Added RTPS reassembly for DATA_FRAGs

The RTPS dissector now reassembles and shows the full sample
when it has been fragmented into several DATA_FRAG submessages.

There is a boolean preference to enable this feature (disabled
by default due to the potential memory consumption it can cause).

Change-Id: I394c042acdd54953ad6a082b385a5b94c9097cd5
Bug: 15227
Reviewed-on: https://code.wireshark.org/review/30297
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

test: make 'double' tests rely on icmp instead of ntp.

'double' tests have been disabled in aa03833 due to format change
in ntp fields.

Change-Id: Id3ab0a736c164bb7fdfed7b5da8856b512308978
Reviewed-on: https://code.wireshark.org/review/30366
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ISUP: fix offset for Generic name

Adding the name to the tree at the same offset (1) where we read it.

Bug: 15236
Change-Id: Iefe1a74d7f4d547a049e0b82dca51964e48fa9b7
Reviewed-on: https://code.wireshark.org/review/30370
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

nas5gs: Add dissection of 9.11.4.8 Mapped EPS bearer contexts.

Change-Id: Ifee5a49434f930df7e4910a3e96387c6fefdf35c
Reviewed-on: https://code.wireshark.org/review/30369
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

nas5gs: Remove version define.

Change-Id: I729a4a3040a81250e3f76ea5bab7b36ed5ebb2fe
Reviewed-on: https://code.wireshark.org/review/30365
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

GSM A BSSMAP: fix Number Of MSs IE dissection

This IE is of TV type, not TLV type, so there is no length check to
perform.

Bug: 15237
Change-Id: Iafee6e43984d70cd046452687518b9cad5d30957
Reviewed-on: https://code.wireshark.org/review/30364
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

RTP.ED-137: Memleak fixed

Memleak found by bug 15231 fixed. Two branches in time processing merged together as they had same content.

Bug: 15231
Change-Id: I6396210a19e3af30f3c0f6c00ab6266e086bd4c3
Reviewed-on: https://code.wireshark.org/review/30362
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

wisun: fix display of Netricity LQI-IE

The LQI is defined as a unit-less index derived from the SNR.

Change-Id: I40627b34130a93fa0464cd478ab50cd487c59e22
Reviewed-on: https://code.wireshark.org/review/30348
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Add support for tzsp encapsulation type 802.11 RadioTap

Change-Id: I93c96be373976954e0993fa21ffed1d62f90007c
Reviewed-on: https://code.wireshark.org/review/30359
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

APT-X is changed to aptX, this is how it's spelled on Qualcomm website.

Change-Id: I8fcec0762936f57e6d5ffc7dc1a0f0537a1aec73
Reviewed-on: https://code.wireshark.org/review/30315
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michal Labedzki <michal.labedzki@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

cemi: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I30b48c9452ac1d996de2d018c4708dd181b39556
Reviewed-on: https://code.wireshark.org/review/30357
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

cemi: fix copyright

Ethereal -> Wireshark

Change-Id: I2a1630c79b86238a67f440c9c0997e3648291147
Reviewed-on: https://code.wireshark.org/review/30356
Reviewed-by: Anders Broman <a.broman58@gmail.com>

cemi: fix no previous prototype for ‘proto_register_cemi/proto_reg_handoff_cemi’ [-Wmissing-prototypes]

Change-Id: Ib1d0a97f0226d97de4d0683446c3dbba47a6b0c4
Reviewed-on: https://code.wireshark.org/review/30355
Reviewed-by: Anders Broman <a.broman58@gmail.com>

DHCPv6: Added CableLabs Option 61 for "CCAP-CORES"

Added additional TLV5 options (45-62) for Modem Capabilities Encoding from CL-SP-CANN-I18-180509.

Bug: 15234
Change-Id: Id481f04af9f988687a5e01448e946493cb269064
Reviewed-on: https://code.wireshark.org/review/30353
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

DOCSIS: Status event TLVs are subTLVs of the Status Event TLV

Change-Id: Iaad33b82ff538961d6c9e793a2a7e4b7677568e5
Reviewed-on: https://code.wireshark.org/review/30343
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Update some ACI values

Change-Id: I25631fe63209023cf016e078b40d34bbafc02cb3
Reviewed-on: https://code.wireshark.org/review/30354
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

pfcp: more correction in User ID IE

corrected wrong flag bits

Change-Id: I3ecb76f26c2bde1997012ab6c452775c0adf796c
Reviewed-on: https://code.wireshark.org/review/30349
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

M2AP: upgrade dissector to v15.0.0

Change-Id: Id38154dff1abb5ce2c45337b95a76887a26c1970
Reviewed-on: https://code.wireshark.org/review/30345
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

PFCP: Change decoding to be more readable

Change-Id: I6c1e67a58826b26f5eaf2e58ed33a5ae7ec212d7
Reviewed-on: https://code.wireshark.org/review/30125
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

MAC NR: put conditions on HarqId and PUCCH report type display

Both are only applicable for unicast transmissions, and the latter is
only meaningful for UL-SCH

Change-Id: If8a512b02964ec1be63a3901bd8c84082325659e
Reviewed-on: https://code.wireshark.org/review/30342
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

MAC NR: fix (for real) mac-nr.harqid field definition

Change-Id: I6f0218a215701750070920cf40e85209b07e1972
Reviewed-on: https://code.wireshark.org/review/30340
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

LBMPDM: fix heap-buffer-overflow (write) in dissect_segment_ofstable

id_list and ofs_list contain offsets read directly from the packet.
While the field type is FT_UINT32, it is somehow interpreted as signed
number. This means that ofs_table->offset_list[id_list[idx]]=... could
in fact result in an arbitrary write before "ofs_table->offset_list" due
to id_list[idx] being negative.

Another way for id_list[idx] to remain negative (-1) is for the loop to
terminate before all "field_count" elements are set. Thus, remove the
"datalen_remaining >= L_LBMPDM_OFFSET_ENTRY_T" check, if the offset is
invalid the proto_tree_add_item accessors will throw an exception.

Fixes the crash in the linked bug. Regression tested against the 8
capture files from bug 9718, its dissection results are still the same.

Bug: 15132
Change-Id: If5d2f11ee47578acb80bc43ba7ed16adb27e0c02
Fixes: v1.11.3-rc1-2270-g2f4ca9c8d9 ("Initial checkin of LBM aka 29West dissectors. See Bug 9718.")
Reviewed-on: https://code.wireshark.org/review/30300
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

dcm: Generate packet-dcm.h from DICOM standard in DocBook format

This change adds a python (3) script that generates the file packet-dcm.h from
the DocBook sources of the DICOM standard. They can either be present in the
current directory where the script is run, otherwise the current version is
downloaded from the DICOM standard official website.

Change-Id: Ibc0d88e52a5960b48624f729a67a0effbb7c1005
Reviewed-on: https://code.wireshark.org/review/30338
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

dcm: Move some DICOM tables from packet-dcm.c to packet-dcm.h

This is in preparation for generating the tables automatically from the DocBook version
of the DICOM standard. In this commit, there are no changes to the actual contents
of the tables, to facilitate reviewing the actual changes that results from the update.

Change-Id: I3b11597277537901e5804bb246d5f3777bb463d9
Reviewed-on: https://code.wireshark.org/review/30337
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

MAC NR: fix mac-nr.harqid field definition

Change-Id: Ibfab6275439d78874070fcbd87c267956b628b56
Reviewed-on: https://code.wireshark.org/review/30339
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

debian-setup: install GLib development headers

Previously installed as transitive dependency of libgtk2.0-dev.
Installed as transitive dependency of libjson-glib-dev since
v2.9.0rc0-201-g511c2e166a, but this is an optional package.

Change-Id: Id4b8523b2d614d273fdb71e91878d4d1a4518572
Fixes: v2.9.0rc0-310-gf23a934492 ("Don't install autotools or GTK+, but do install CMake.")
Reviewed-on: https://code.wireshark.org/review/30336
Reviewed-by: Anders Broman <a.broman58@gmail.com>

MAC-NR: Add harq-id to the struct and context

Change-Id: Id5c68dc2a4a334a27590d1ee417f9f30c81a3d7e
Reviewed-on: https://code.wireshark.org/review/30335
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

RLC-NR: set pdcp_nr_handle in handoff function

Change-Id: Ic4bddd5f004420de996d282a73bfe66ada05e804
Reviewed-on: https://code.wireshark.org/review/30334
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

No need for the debugging output.

The chmods seem to be working.

Change-Id: I0f85a1428de511497597a3fd304c700ea1a1f846
Reviewed-on: https://code.wireshark.org/review/30331
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Fix quoting.

Change-Id: I3a0a8c661b1fec2ea4475eb9fe1d5c8a8ed7bbb5
Reviewed-on: https://code.wireshark.org/review/30328
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Make the chmod verbose.

For some reason it's *not* taking away write permission; make it verbose
to try to debug that.

Change-Id: I180309953d36798d2da3a74959cdd934adc5a4a3
Reviewed-on: https://code.wireshark.org/review/30325
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Don't unload the XQuartzFixer job if it doesn't exist.

But *do* get rid of the pre-launchd XQuartzFixer startup item; it's
probably not there, but we might as well leave things as clean as we
can.

Change-Id: Icfdbe6c0d022cde8cf30bd3c79fbf77896e6fe98
Reviewed-on: https://code.wireshark.org/review/30322
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Add TSDNS (TeamSpeak 3 DNS) dissector

Change-Id: I1f828df1735bd10ef8849d208e10ea1339ba37e2
Reviewed-on: https://code.wireshark.org/review/26403
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Add ability to disable autocomplete suggestions for filter controls.

Add a preference (enabled by default) that can enable/disable the ability for Wireshark to autocomplete display and capture filter controls.

Bug: 14368
Change-Id: Ib2b688bb75c4465dab14a6a635a870d7e5c4fe80
Reviewed-on: https://code.wireshark.org/review/30320
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ntp: change root delay and dispersion to integer for fixed precision.

dfilter/group_double tests have been removed and need to be replaced by leveraging
another protocol.

Bug: 15049
Change-Id: I354a27a5217336ee5c9b1d021a2d3226e3532eec
Reviewed-on: https://code.wireshark.org/review/29035
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

More permission fixes.

Take away group write permission for stuff under
/Library/Application Support/Wireshark.  For some reason, it's getting
set; it's not necessary.

Change-Id: I4280a635e0c171cf5ad17cb91fe20d746c2daf79
Reviewed-on: https://code.wireshark.org/review/30317
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Test C compiler flags with check_c_compiler_flag(), not check_c_linker_flag().

Change-Id: If56a6acf9935838232d6ee86e331361fb076369b
Reviewed-on: https://code.wireshark.org/review/30316
Reviewed-by: Guy Harris <guy@alum.mit.edu>

WNSRP: Add WNSRP definitions to SRP

WNSRP packets are the same as SRP packets, just with a different Command Code.

Change-Id: I41e0ab4cbe90497fd7fb4142b119edb79c1477df
Reviewed-on: https://code.wireshark.org/review/30205
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Qt: fix assertion failure when redissecting with a debug build of Qt

Opening the Follow TCP Stream dialog triggers redissection and ended up
triggering a "first <= rowCount(parent)" assertion failure. Fix the
first and end arguments to reflect the actual number of displayed rows.

Bug: 15014
Change-Id: Ic07834948a133bea752e45751ebe8be2da98a35e
Reviewed-on: https://code.wireshark.org/review/30302
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

ldap: reflect the actual asn1 dissector to the C version.

Fix the build with newer gcc versions:

./epan/dissectors/packet-ldap.c
./asn1/ldap/ldap.cnf: In function ‘dissect_ldap_AttributeValue’:
./asn1/ldap/ldap.cnf:453:11: error: variable ‘len’ set but not used [-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors
ninja: build stopped: subcommand failed.

Change-Id: Id3a5369b4ca29f6989ab7b0bd652d72c239164a5
Reviewed-on: https://code.wireshark.org/review/30313
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

appveyor: comment out artifacts upload due to size too large.

Change-Id: I9f4bb3f32fcac39f0d087cbd5e5397306d8800e1
Reviewed-on: https://code.wireshark.org/review/30268
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>

Get rid of a launchd daemon we no longer need.

Change-Id: Ic287d6d8a84876da10ca600ef3899b40c8f5663e
Reviewed-on: https://code.wireshark.org/review/30310
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Fix ownership and permissions on /Library/Application Support/Wireshark.

Bug: 14335
Change-Id: I657b024554e1eff01544b7726a7eec74c8da8be1
Reviewed-on: https://code.wireshark.org/review/30307
Reviewed-by: Guy Harris <guy@alum.mit.edu>

opcua: add missing opcua_nested_count decrement

Nest testing was added in I5f6da3a3e269f6db1b690b77470ddf60045bcedd as
a reaction to CVE-2018-12086. In this changed there was only nest
increment without decrement.

Bug: 15226
Change-Id: I178fad4be1106c8da23351220c95c85274bddc30
Reviewed-on: https://code.wireshark.org/review/30285
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

Don't give launchd daemon plists execute permission.

They don't need it; read permission suffices.

While we're at it, rename a variable to indicate that it's the path to
the plist for ChmodBPF, not the path to the executable for ChmodBPF.

Change-Id: Ib7537e26ae3f4477c4110759049a8cd7d2f09cf6
Reviewed-on: https://code.wireshark.org/review/30303
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Dumpcap: Swap bytes only for pcap sources.

Instead of trying to byte swap all of pcapng's block types, refuse
to handle pcapng sources that have a different byte order.

Rename cap_pipe_adjust_header to cap_pipe_adjust_pcap_header.

Change-Id: I2615da57ba9d3fc365c631dc191f7767a284d460
Reviewed-on: https://code.wireshark.org/review/30235
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: James Ko <jim.list@hotmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

fuzz: Fix assertion failed: (fuzz_handle != NULL) for fuzzshark_ip

If no dissector is defined, the macro should not be defined either.

Change-Id: If9c24d2b223e93f1d42f8a7444fd019aad4c5c1d
Fixes: v2.9.0rc0-2266-g7e88bb5e53 ("fuzzshark: integrate oss-fuzz targets in CMake")
Reviewed-on: https://code.wireshark.org/review/30299
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

lemon: fix GCC/Clang warnings pre CMake 3.11, silence VSCA warnings

The COMPILE_OPTIONS source file property was introduced with CMake 3.11,
disable warnings via a target property instead (available since 2.8.12).

Disable some VS Code Analysis warnings. These flags seem to be accepted
since VS2015, so they can be added unconditionally.

Change-Id: Idfbf154caf8c1168f1f871a640a25b816a2cfab8
Fixes: v2.9.0rc0-2274-g7ce9081fdc ("lemon: sync with upstream (2018-09-08)")
Reviewed-on: https://code.wireshark.org/review/30298
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

tap-follow: fix memory leak

Register the follow_free as a finish callback.

Call the tap's finish callback in free_tap_listener which is called from
both remove_tap_listener and tap_cleanup.

Describe the finish callback in README.tapping

Change-Id: Ie79ce8f39b0ca6d84810d2e3307dcff38b18d3ac
Reviewed-on: https://code.wireshark.org/review/29309
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

Supporting Zebra API version 6 used in FRRouting version 6

Change-Id: Ie6983e0aaf06e89e903eab6f9ac5a833c72d33d4
Reviewed-on: https://code.wireshark.org/review/30283
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

[Automatic update for 2018-10-21]

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

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

Add tvb_ascii_isprint API

This allows dissectors to check if a portion of the tvb is an ascii string while hiding the use of tvb_get_ptr.

Change-Id: Iaec7559dcfdefb8a5ae23e099ced45e90e611f8f
Reviewed-on: https://code.wireshark.org/review/30291
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

lemon: sync with upstream (2018-09-08)

Changes:
- Drop the old basename modification that was present in the Wireshark
  version of lemon.c. Use a new option available since 2018-04-20
  ("Add the -dDIRECTORY command-line option to LEMON.")
- Redo the static analyzer warning fixes, identifying the root causes
  and adding assertions instead of hiding code with __clang_analyzer__.
- Ignore compiler warnings instead of adding config.h, _U_, extra const
  keywords, unsigned/signed changes, etc.
- Remove lemon.html, it is out-of-date and external links are available.

In order to make future updates easier, document the exact steps that
were followed to create the lemon.c and lempar.c files. Future changes
SHOULD follow the same process.

My process to reach this updated lemon version:
1. Identify previous sync. Found v2.5.2rc0-147-g653af0f6d0 ("lemon: Sync
   with latest trunk.") which seems based on sqlite commit 2b3d584ffe.
2. Check successive Wireshark patches. Identified many non-functional
   changes to silence compiler warnings and static analyzer issues.
   Found one feature (basename) that can be replaced with upstream -d.
3. Write minimal patches and document changes.

Upstream typos and coding style issues (other than trailing whitespace)
were deliberately not fixed to remain as close as possible to upstream.

Change-Id: I606f46dede86e34520f962a9e7163912392aad57
Reviewed-on: https://code.wireshark.org/review/30290
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

lemon: fix memleak in ReportTable

Building without -DENABLE_ASAN=1 but with -fsanitize=address (as is done
by oss-fuzz) still triggers a memleak report. Closer inspection revealed
that two other members were leaked.

Change-Id: I3d022ac50c554891a73b9380b7879c1a60c3c798
Reviewed-on: https://code.wireshark.org/review/30289
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

checkAPIs: check ett variable registrations.

Using unregistered etts leads to an abort so check for them in checkAPIs.
This does slow down checkAPIs by about 15% but it seems a reasonable cost
for the benefit.

Note that finding ett registration blocks was fairly inaccurate so we
just check for whether ett variable addresses are used - on the assumption
that if someone's using the address they're probably using it to register
the ett.

Change-Id: Ifbac75c4a8a0fdb27d9c9d1584a2de791bfbc118
Reviewed-on: https://code.wireshark.org/review/30293
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>