metze/wireshark/wip.git
5 years agoprint.c: use SEP_XXX to print byte strings
Pascal Quantin [Thu, 1 Nov 2018 11:06:26 +0000 (12:06 +0100)]
print.c: use SEP_XXX to print byte strings

Bug: 15253
Change-Id: I3b294fa65c1bd4ef4184bcf2e1b56ef4f55cbb82
Reviewed-on: https://code.wireshark.org/review/30461
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoAdd RTCP Floor Control packets dissection for MCPTT based on 3GPP TS
Anders Broman [Thu, 1 Nov 2018 10:27:27 +0000 (11:27 +0100)]
Add RTCP Floor Control packets dissection for MCPTT based on 3GPP TS
24.380

Bug:15147
Change-Id: I332b2eabd3cd8fc1b88e6b0268814d858d360ca2
Reviewed-on: https://code.wireshark.org/review/30460
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agopacketlogger: Show all known types in Info column
Stig Bjørlykke [Thu, 1 Nov 2018 09:56:24 +0000 (10:56 +0100)]
packetlogger: Show all known types in Info column

Always lookup type from type_vals to show in Info column.

Change-Id: I8cb9a1e748e40d37d58be0e21d2cce395f7f8cec
Reviewed-on: https://code.wireshark.org/review/30457
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
5 years agows_pipe_close(): also close the handle after terminating process
Pascal Quantin [Thu, 1 Nov 2018 09:56:13 +0000 (10:56 +0100)]
ws_pipe_close(): also close the handle after terminating process

Change-Id: Ie19eba9706e2af1a58a6946e8af68ab90c0c8a7d
Reviewed-on: https://code.wireshark.org/review/30456
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agows_pipe_close() is now available starting from 2.6.5
Pascal Quantin [Thu, 1 Nov 2018 09:37:15 +0000 (10:37 +0100)]
ws_pipe_close() is now available starting from 2.6.5

Change-Id: I182e6227fda8402519a6bc7268f78aae7485c49a
Reviewed-on: https://code.wireshark.org/review/30454
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoUse ws_pipe_close() in one more place
Pascal Quantin [Thu, 1 Nov 2018 08:18:37 +0000 (09:18 +0100)]
Use ws_pipe_close() in one more place

Change-Id: I584df2c7ae8041a29d9941995883c232abb040d6
Reviewed-on: https://code.wireshark.org/review/30452
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoRevert "FT_BYTES: fix dissection of FT_BYTES when using SEP_SPACE and "NONE" options"
Pascal Quantin [Thu, 1 Nov 2018 07:48:25 +0000 (07:48 +0000)]
Revert "FT_BYTES: fix dissection of FT_BYTES when using SEP_SPACE and "NONE" options"

This reverts commit 0457e6041942776ecff9d4377fc0ce5a340dbb7a.

Change-Id: Id39722872efbe98648754d7543da7ae5b08f8b67
Reviewed-on: https://code.wireshark.org/review/30451
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agowsutil: introduce ws_pipe_close() helper and use it to terminate mmdbresolve
Pascal Quantin [Wed, 31 Oct 2018 16:41:13 +0000 (17:41 +0100)]
wsutil: introduce ws_pipe_close() helper and use it to terminate mmdbresolve

We were not calling TerminateProcess() to stop mmdbresolve.Exe process on
Windows.

Bug: 15248
Change-Id: Ic90cf438a8003a6fefb023b7056984681ce09b46
Reviewed-on: https://code.wireshark.org/review/30449
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agommdb: do not lock the pipe mutex recursively
Pascal Quantin [Wed, 31 Oct 2018 15:34:23 +0000 (16:34 +0100)]
mmdb: do not lock the pipe mutex recursively

According to GLib documentation, take twice the lock in the same thread
leads to undefined behavior (and could lead to deadlocks).

Change-Id: I40e02ba9d619eb1db2a04f2be54c461c817b15ff
Reviewed-on: https://code.wireshark.org/review/30446
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoFT_BYTES: fix dissection of FT_BYTES when using SEP_SPACE and "NONE" options
Jeremy Martin [Wed, 31 Oct 2018 16:18:11 +0000 (09:18 -0700)]
FT_BYTES: fix dissection of FT_BYTES when using SEP_SPACE and "NONE" options

SEP_SPACE and BASE_NONE both default to colon (:).  Fix SEP_SPACE and add SEP_NONE

Bug: 15253
Change-Id: Ib5db997714414370b08ffb9458c73d4aeef6aacf
Reviewed-on: https://code.wireshark.org/review/30447
Reviewed-by: Jeremy Martin <boardermartin@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoMove condition logic to dumpcap.c
Gerald Combs [Wed, 31 Oct 2018 10:34:35 +0000 (11:34 +0100)]
Move condition logic to dumpcap.c

Move the condition logic from capture_stop_conditions.c to dumpcap.c.
Remove capture_stop_conditions.[ch] and conditions.[ch].

Switch duration values to doubles.

Change-Id: Ifa74fb13ec8fc923b0721597a6cf071d72069ea0
Reviewed-on: https://code.wireshark.org/review/30440
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoBluetooth LDAC codec dissection support
ValdikSS [Sun, 5 Aug 2018 15:16:25 +0000 (18:16 +0300)]
Bluetooth LDAC codec dissection support

Change-Id: I99550324760d71a0fde725f0d5d3a9b9de059211
Reviewed-on: https://code.wireshark.org/review/28977
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agotshark: Fix small memory leak in tap-expert
Vasil Velichkov [Tue, 30 Oct 2018 22:17:09 +0000 (00:17 +0200)]
tshark: Fix small memory leak in tap-expert

Change-Id: I9d81bda8a33c7a07118e8aff2917215c92e870f4
Reviewed-on: https://code.wireshark.org/review/30436
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoFix typo itam->item
Michał Łabędzki [Wed, 31 Oct 2018 10:40:23 +0000 (11:40 +0100)]
Fix typo itam->item

Change-Id: Ia8286b2625abb878899b5023618c7974331df939
Reviewed-on: https://code.wireshark.org/review/30443
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoMake the SNR a 32-bit field.
Guy Harris [Wed, 31 Oct 2018 16:44:06 +0000 (09:44 -0700)]
Make the SNR a 32-bit field.

The difference between two 8-bit signed values may be < -128 or > 127.

Change-Id: Ic930c65462b3d31591af2e206fb7ccbd4e509358
Reviewed-on: https://code.wireshark.org/review/30450
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoFix copy-and-pasteo.
Guy Harris [Wed, 31 Oct 2018 16:35:17 +0000 (09:35 -0700)]
Fix copy-and-pasteo.

Give the SNR field an appropriate name.

Change-Id: I4625b86dffa523da9771d9b220577182329fe27a
Reviewed-on: https://code.wireshark.org/review/30448
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agotext_import: fix wrong int type.
Dario Lombardo [Wed, 31 Oct 2018 14:38:00 +0000 (15:38 +0100)]
text_import: fix wrong int type.

Regressed in ge655b9a.

Change-Id: I5aeb9e1935bc1064797db8ac6acaa852d9a07c98
Reviewed-on: https://code.wireshark.org/review/30445
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoIEEE 1609.2: Fix up boiler plate code and prepare calling next dissector.
Anders Broman [Wed, 31 Oct 2018 13:24:31 +0000 (14:24 +0100)]
IEEE 1609.2: Fix up boiler plate code and prepare calling next dissector.

Change-Id: I9ada85a3371e91f26a563906b37790f6c66dde42
Reviewed-on: https://code.wireshark.org/review/30444
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoNTP: add request/response tracking to client, server and control packets
Pascal Quantin [Wed, 31 Oct 2018 12:48:40 +0000 (13:48 +0100)]
NTP: add request/response tracking to client, server and control packets

Bug: 14659
Change-Id: Ic7faa96765911048931d07e5ec4220ba9b713e9f
Reviewed-on: https://code.wireshark.org/review/30442
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoimport: add export_pdu dummy header feature.
Dario Lombardo [Sun, 28 Oct 2018 22:04:23 +0000 (23:04 +0100)]
import: add export_pdu dummy header feature.

When importing a file from hex dump, this change adds a way to
add a custom dummy header. It's an export_pdu header which uses
one single tag: the protocol name. This allows to call directly
a dissector without more dummy headers.

Example: it can be used to call the DNS dissector without fake
eth/ip/udp headers.

Change-Id: I12fd6d09a131acd9bd1f0d7c4c8aefcd0d718b26
Reviewed-on: https://code.wireshark.org/review/30403
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agodebian: install required GeoIP resolver executable and manual page
Peter Wu [Wed, 31 Oct 2018 10:12:44 +0000 (11:12 +0100)]
debian: install required GeoIP resolver executable and manual page

Bug: 15230
Change-Id: I22ee65fb4de7a482544ebc9f8574d88b7b686ab4
Fixes: v2.5.1rc0-466-ga1da75c554 ("Transition from GeoIP Legacy to MaxMindDB.")
Reviewed-on: https://code.wireshark.org/review/30439
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot
5 years agoQUIC: Merge ACK and ACK_ECN frame (draft -15)
Alexis La Goutte [Sun, 28 Oct 2018 16:07:56 +0000 (17:07 +0100)]
QUIC: Merge ACK and ACK_ECN frame (draft -15)

create a draft14 (and older) frame type

Ping-Bug: 13881
Change-Id: I81cf69976b315d934be1a50a187610b2b71bcc2d
Reviewed-on: https://code.wireshark.org/review/30420
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>
5 years agoRTPS: fixed issues in the reassembly logic of DATA_FRAG
Juanjo Martin [Tue, 30 Oct 2018 19:52:53 +0000 (20:52 +0100)]
RTPS: fixed issues in the reassembly logic of DATA_FRAG

When a DATA_FRAG contains more than one fragment, the logic does
not work. This has been fixed.

Bug: 15249
Change-Id: I6a4291abee436114c6d57700dbe908af13fbb166
Reviewed-on: https://code.wireshark.org/review/30435
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoQUIC: add new Transport Parameter from draft-15
Alexis La Goutte [Sun, 28 Oct 2018 15:36:50 +0000 (16:36 +0100)]
QUIC: add new Transport Parameter from draft-15

* max_ack_delay (0x000c)
* original_connection_id (0x000d)

Change-Id: I95fb14cf337faef57525afe1ec1a2d6e79edd3c7
Ping-Bug: 13881
Reviewed-on: https://code.wireshark.org/review/30418
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>
5 years agoDOCSIS: Added Simplified Receive Channel Configuration (TLV 49.7)
Bruno Verstuyft [Tue, 30 Oct 2018 12:55:54 +0000 (13:55 +0100)]
DOCSIS: Added Simplified Receive Channel Configuration (TLV 49.7)

Change-Id: I75f5fa44eedd0525e389e334f00f3065a74be9e3
Reviewed-on: https://code.wireshark.org/review/30427
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agotext2pcap: Fix IPv6 checksum
Vasil Velichkov [Mon, 29 Oct 2018 19:52:06 +0000 (21:52 +0200)]
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>
5 years agotext2pcap: Fix -i <proto> when IPv6 (-6) is specified
Vasil Velichkov [Mon, 29 Oct 2018 22:44:16 +0000 (00:44 +0200)]
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>
5 years agoQt: omit initial empty line in About Dialog / Acknowledgements
Peter Wu [Tue, 30 Oct 2018 14:14:57 +0000 (15:14 +0100)]
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>
5 years agotext2pcap: Fix IPv6 payload length
Vasil Velichkov [Sun, 28 Oct 2018 19:46:05 +0000 (21:46 +0200)]
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>
5 years agoQUIC: move NCI Sequence(i) field after CID Length field (draft -15)
Alexis La Goutte [Sun, 28 Oct 2018 15:47:47 +0000 (16:47 +0100)]
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>
5 years agoFix pluginifdemo with DISABLE_WERROR
Michał Łabędzki [Sat, 27 Oct 2018 12:20:21 +0000 (14:20 +0200)]
Fix pluginifdemo with DISABLE_WERROR

Change-Id: I19853157ea2cbe3a28c06493a32b73913c1aad84
Reviewed-on: https://code.wireshark.org/review/30429
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoIEEE1609dot2: generate automatically dissector from ASN.1 description
Pascal Quantin [Tue, 30 Oct 2018 14:56:14 +0000 (15:56 +0100)]
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>
5 years agoOER: fix a few typos
Pascal Quantin [Tue, 30 Oct 2018 14:22:03 +0000 (15:22 +0100)]
OER: fix a few typos

Change-Id: I1a872e29b5ee0706c69ce249c7741c7aab6920c0
Reviewed-on: https://code.wireshark.org/review/30433
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCMake: fix broken oss-fuzz build due to the -pie option
Peter Wu [Tue, 30 Oct 2018 13:31:39 +0000 (14:31 +0100)]
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>
5 years agomacos: Prevent darkmode from appearing
Roland Knall [Tue, 30 Oct 2018 12:10:21 +0000 (13:10 +0100)]
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>
5 years agoFix About->Acknowledgements
Michał Łabędzki [Tue, 30 Oct 2018 12:57:37 +0000 (13:57 +0100)]
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>
5 years agoto_str: Fixed incorrect order of checks in bytestring_to_str.
Martin Boye Petersen [Tue, 30 Oct 2018 10:54:33 +0000 (11:54 +0100)]
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>
5 years agoUpdate couchbase dissector for new expiration format
Christopher Farman [Mon, 29 Oct 2018 14:32:33 +0000 (14:32 +0000)]
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>
5 years agoQUIC: Initial support of draft-15
Alexis La Goutte [Sun, 28 Oct 2018 15:06:10 +0000 (16:06 +0100)]
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>
5 years agoDHCP: Fix RFC 4578 erratum number.
Darius Davis [Tue, 30 Oct 2018 03:57:33 +0000 (13:57 +1000)]
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>
5 years agoGet rid of the radiotap tap.
Guy Harris [Tue, 30 Oct 2018 06:53:54 +0000 (23:53 -0700)]
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>
5 years agoAdd a tap for the radio dissector that passes the pseudo-header.
Guy Harris [Tue, 30 Oct 2018 06:05:38 +0000 (23:05 -0700)]
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>
5 years agoThe signal strength and noise in dB from an arbitrary reference are unsigned.
Guy Harris [Mon, 29 Oct 2018 22:22:38 +0000 (15:22 -0700)]
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>
5 years agoCalculate the signal/noise ratio.
Guy Harris [Mon, 29 Oct 2018 20:27:52 +0000 (13:27 -0700)]
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>
5 years agoHandle signal/noise in dB from an arbitrary point in the 802.11 radio dissector.
Guy Harris [Mon, 29 Oct 2018 18:48:38 +0000 (11:48 -0700)]
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>
5 years agoDo bounds checking on scidx arrays.
Guy Harris [Mon, 29 Oct 2018 03:24:47 +0000 (20:24 -0700)]
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>
5 years agoQT: Enable filtering entries in 'Export Objects'
Moshe Kaplan [Tue, 24 Jul 2018 22:09:20 +0000 (18:09 -0400)]
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>
5 years agoCMake: Fix -pie linker test
João Valverde [Sun, 28 Oct 2018 00:18:06 +0000 (01:18 +0100)]
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>
5 years ago[Automatic update for 2018-10-28]
Gerald Combs [Sun, 28 Oct 2018 08:28:56 +0000 (08:28 +0000)]
[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>
5 years agoUpdate plugins.example/README
João Valverde [Fri, 14 Sep 2018 02:41:21 +0000 (03:41 +0100)]
Update plugins.example/README

Change-Id: Ib428859b75e1c196cf9fa81ebae4969bbce079f2
Reviewed-on: https://code.wireshark.org/review/30396
Reviewed-by: João Valverde <j@v6e.pt>
5 years agowsp: remove a bunch of if (tree) checks
Martin Kaiser [Sat, 27 Oct 2018 16:36:34 +0000 (18:36 +0200)]
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>
5 years agoAdd aptX HD dissector support
ValdikSS [Sun, 5 Aug 2018 13:31:00 +0000 (16:31 +0300)]
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>
5 years agoIAX: Use extended 64 bit value to string matching for codecs
Tom Hughes [Fri, 26 Oct 2018 00:00:48 +0000 (01:00 +0100)]
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>
5 years agoIAX: Improve decoding of IAX2 codec details
Tom Hughes [Thu, 25 Oct 2018 17:27:20 +0000 (18:27 +0100)]
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>
5 years agoAdd support for extended 64 bit value to string matching
Tom Hughes [Thu, 25 Oct 2018 23:48:55 +0000 (00:48 +0100)]
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>
5 years agos7comm: Remove duplicate entry in event-id list
Thomas Wiens [Fri, 26 Oct 2018 18:34:01 +0000 (20:34 +0200)]
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>
5 years agoZigBee: Dissect payment control configuration attribute within SE prepayment
Martin Boye Petersen [Fri, 26 Oct 2018 12:56:29 +0000 (14:56 +0200)]
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>
5 years agocheckAPIs.pl: fix false positive in value_string.h
Peter Wu [Fri, 26 Oct 2018 13:58:04 +0000 (15:58 +0200)]
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>
5 years agoQt: fix saving exported objects after sorting columns
Moshe Kaplan [Fri, 26 Oct 2018 00:54:51 +0000 (20:54 -0400)]
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>
5 years agodocsis: Fixed reassembly for REG-REQ-MP and DBC-REQ MMMs
Andrii Vladyka [Thu, 25 Oct 2018 23:54:36 +0000 (16:54 -0700)]
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>
5 years agoDOCSIS: decoding of Mac Management Multipart field + use in OPT-RSP
Bruno Verstuyft [Wed, 24 Oct 2018 09:17:33 +0000 (11:17 +0200)]
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>
5 years agoZigBee: Add new Sub-GHz Notification flags
Kenneth Soerensen [Thu, 25 Oct 2018 12:16:26 +0000 (14:16 +0200)]
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>
5 years agoSV: Fix handling data length
Uli Heilmeier [Thu, 25 Oct 2018 09:11:10 +0000 (11:11 +0200)]
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>
5 years agoPER: Handle 0 length in dissect_per_octet_string_containing_pdu_new.
Anders Broman [Thu, 25 Oct 2018 13:28:49 +0000 (15:28 +0200)]
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>
5 years agoRTPS: Added Endpoint Discovery reassembly
Juanjo Martin [Thu, 25 Oct 2018 11:55:06 +0000 (13:55 +0200)]
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>
5 years agodissectors: Fix visibility and header installation
João Valverde [Wed, 24 Oct 2018 13:53:07 +0000 (14:53 +0100)]
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>
5 years agonas5gs: Improve dissection of Mapped EPS bearer contexts.
AndersBroman [Thu, 25 Oct 2018 11:20:58 +0000 (13:20 +0200)]
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>
5 years agorelease-notes: drop a line about APT-X renaming.
Dario Lombardo [Thu, 25 Oct 2018 06:57:01 +0000 (08:57 +0200)]
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>
5 years agoSSH: Display Host Key Type Length
Daniel Hirschberger [Wed, 24 Oct 2018 15:30:22 +0000 (17:30 +0200)]
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>
5 years agoSSH: Display padding value in outermost tree (Binary Packet)
Daniel Hirschberger [Wed, 24 Oct 2018 14:52:25 +0000 (16:52 +0200)]
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>
5 years agoRTPS: Added RTPS reassembly for DATA_FRAGs
Juanjo Martin [Sun, 21 Oct 2018 09:07:36 +0000 (11:07 +0200)]
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>
5 years agotest: make 'double' tests rely on icmp instead of ntp.
Dario Lombardo [Wed, 24 Oct 2018 12:02:27 +0000 (14:02 +0200)]
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>
5 years agoISUP: fix offset for Generic name
Uli Heilmeier [Wed, 24 Oct 2018 14:00:27 +0000 (16:00 +0200)]
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>
5 years agonas5gs: Add dissection of 9.11.4.8 Mapped EPS bearer contexts.
AndersBroman [Wed, 24 Oct 2018 13:04:26 +0000 (15:04 +0200)]
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>
5 years agonas5gs: Remove version define.
AndersBroman [Wed, 24 Oct 2018 11:04:41 +0000 (13:04 +0200)]
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>
5 years agoGSM A BSSMAP: fix Number Of MSs IE dissection
Pascal Quantin [Wed, 24 Oct 2018 10:02:15 +0000 (12:02 +0200)]
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>
5 years agoRTP.ED-137: Memleak fixed
Jirka Novak [Wed, 24 Oct 2018 05:33:20 +0000 (07:33 +0200)]
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>
5 years agowisun: fix display of Netricity LQI-IE
Robert Sauter [Tue, 23 Oct 2018 12:56:39 +0000 (14:56 +0200)]
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>
5 years agoAdd support for tzsp encapsulation type 802.11 RadioTap
zhongweisitu [Tue, 23 Oct 2018 19:24:36 +0000 (15:24 -0400)]
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>
5 years agoAPT-X is changed to aptX, this is how it's spelled on Qualcomm website.
ValdikSS [Sun, 5 Aug 2018 13:31:00 +0000 (16:31 +0300)]
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>
5 years agocemi: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Tue, 23 Oct 2018 20:10:44 +0000 (22:10 +0200)]
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>
5 years agocemi: fix copyright
Alexis La Goutte [Tue, 23 Oct 2018 20:08:24 +0000 (22:08 +0200)]
cemi: fix copyright

Ethereal -> Wireshark

Change-Id: I2a1630c79b86238a67f440c9c0997e3648291147
Reviewed-on: https://code.wireshark.org/review/30356
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agocemi: fix no previous prototype for ‘proto_register_cemi/proto_reg_handoff_cemi’...
Alexis La Goutte [Tue, 23 Oct 2018 20:07:31 +0000 (22:07 +0200)]
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>
5 years agoDHCPv6: Added CableLabs Option 61 for "CCAP-CORES"
Jeffrey Forhan [Tue, 23 Oct 2018 16:47:36 +0000 (12:47 -0400)]
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>
5 years agoDOCSIS: Status event TLVs are subTLVs of the Status Event TLV
Bruno Verstuyft [Tue, 23 Oct 2018 09:22:07 +0000 (11:22 +0200)]
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>
5 years agoUpdate some ACI values
Joerg Mayer [Tue, 23 Oct 2018 15:30:26 +0000 (17:30 +0200)]
Update some ACI values

Change-Id: I25631fe63209023cf016e078b40d34bbafc02cb3
Reviewed-on: https://code.wireshark.org/review/30354
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
5 years agopfcp: more correction in User ID IE
Joakim Karlsson [Tue, 23 Oct 2018 12:59:30 +0000 (14:59 +0200)]
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>
5 years agoM2AP: upgrade dissector to v15.0.0
Pascal Quantin [Tue, 23 Oct 2018 09:56:23 +0000 (11:56 +0200)]
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>
5 years agoPFCP: Change decoding to be more readable
Michal Slavka [Fri, 12 Oct 2018 06:36:21 +0000 (08:36 +0200)]
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>
5 years agoMAC NR: put conditions on HarqId and PUCCH report type display
Pascal Quantin [Tue, 23 Oct 2018 08:37:25 +0000 (10:37 +0200)]
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>
5 years agoMAC NR: fix (for real) mac-nr.harqid field definition
Pascal Quantin [Tue, 23 Oct 2018 05:03:39 +0000 (07:03 +0200)]
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>
5 years agoLBMPDM: fix heap-buffer-overflow (write) in dissect_segment_ofstable
Peter Wu [Sun, 21 Oct 2018 13:10:57 +0000 (15:10 +0200)]
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>
5 years agodcm: Generate packet-dcm.h from DICOM standard in DocBook format
Rickard Holmberg [Mon, 22 Oct 2018 15:58:35 +0000 (17:58 +0200)]
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>
5 years agodcm: Move some DICOM tables from packet-dcm.c to packet-dcm.h
Rickard Holmberg [Mon, 22 Oct 2018 15:50:42 +0000 (17:50 +0200)]
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>
5 years agoMAC NR: fix mac-nr.harqid field definition
Pascal Quantin [Mon, 22 Oct 2018 21:50:59 +0000 (23:50 +0200)]
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>
5 years agodebian-setup: install GLib development headers
Peter Wu [Mon, 22 Oct 2018 12:43:43 +0000 (14:43 +0200)]
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>
5 years agoMAC-NR: Add harq-id to the struct and context
Martin Mathieson [Mon, 22 Oct 2018 09:43:03 +0000 (10:43 +0100)]
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>
5 years agoRLC-NR: set pdcp_nr_handle in handoff function
Martin Mathieson [Mon, 22 Oct 2018 09:34:47 +0000 (10:34 +0100)]
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>
5 years agoNo need for the debugging output.
Guy Harris [Mon, 22 Oct 2018 09:07:09 +0000 (02:07 -0700)]
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>
5 years agoFix quoting.
Guy Harris [Mon, 22 Oct 2018 07:35:29 +0000 (00:35 -0700)]
Fix quoting.

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