Commit Graph

41081 Commits

Author SHA1 Message Date
Anders Broman 4660a30bab Fix -Wpointer-sign warnings.
Change-Id: I47efaeedc42d60456e9b98b951c75086b102788f
Reviewed-on: https://code.wireshark.org/review/37788
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-08 15:26:33 +00:00
Stefan Metzmacher 48630d4742 packet-smb2: correctly dissect SMB2 TRANSFORM_HEADER Flags
In the SMB 3.1.1 dialect, this field is interpreted as the Flags field, which indicates how the SMB2 message was transformed:
    Encrypted 0x0001
    - The message is encrypted using the cipher that was negotiated for this connection.

In the SMB 3.0 and SMB 3.0.2 dialects, this field is interpreted as the EncryptionAlgorithm field,
which contains the algorithm used for encrypting the SMB2 message. This field MUST be set to one of the following values:

    SMB2_ENCRYPTION_AES128_CCM 0x0001
    - The message is encrypted using the AES128 CCM algorithm.

For dissection it's enough to expect SMB 3.1.1, as the value and the meaning
of 0x0001 is always the same (as AES128 CCM was the only possible algorithm before 3.1.1)

Change-Id: I4bd796bd1be38ed4a6481aa7bf68cb5b2e3637d2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/37785
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-07-08 10:42:08 +00:00
Anders Broman 5b91801a8d value_string: Change the bytes_string struct to avoid Wpointer-sign
Change-Id: Ie9db520f73dbbf61a6aecb37cf5ed8839f3e1052
Reviewed-on: https://code.wireshark.org/review/37770
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-08 06:43:55 +00:00
Yann Pomarède 7ed3180a29 ieee80211: add VS SGDSN type 1 message
Bug: 16680
Change-Id: Ia540d252371a045e4d1c0b0e2eb87db8fa21fc31
Reviewed-on: https://code.wireshark.org/review/37681
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-07-08 06:29:00 +00:00
Pascal Quantin 416ccd18c4 E212: allow to decode 5 digits long short IMSI used in MAP messages
Bug: 16676
Change-Id: I8ba5bce3ec3a63f3c95ebb58ffdbe54d3546a96a
Reviewed-on: https://code.wireshark.org/review/37775
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>
2020-07-08 05:11:13 +00:00
Jaap Keuter 570b9ffe7b UMTS_RLC: Rename rlc.ciphered_data expert item
Found by conflict check

Change-Id: I98e5fd7d5b894a27aa07055a6bfa6735c4e4df79
Reviewed-on: https://code.wireshark.org/review/37774
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>
2020-07-08 05:10:51 +00:00
Jaap Keuter e566c615f0 NIS+: Make true_false string differentiating
Found by conflict check

Change-Id: I51ba81592aa0779f45f26fc4a89215051245c328
Reviewed-on: https://code.wireshark.org/review/37772
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>
2020-07-08 05:10:28 +00:00
Anders Broman 1484c1e7f6 Fix Wpointer-sign warnings.
Change-Id: Ia51998293b967f363856d2b9ac92f498a9f54d76
Reviewed-on: https://code.wireshark.org/review/37769
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-07 18:42:07 +00:00
Filipe Laíns 3c37494ea6 USB HID: fix memory leak when saving report descriptors
Change-Id: I5cb5598be557823cf3b39cda30bed6febee297d3
Signed-off-by: Filipe Laíns <lains@archlinux.org>
Reviewed-on: https://code.wireshark.org/review/37561
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Tomasz Moń <desowin@gmail.com>
2020-07-07 14:46:37 +00:00
Anders Broman 2b7975db54 Fix Wpointer-sign warnings.
Change-Id: I69a266bc945441bc9351b97bd1de0af7f9be46a0
Reviewed-on: https://code.wireshark.org/review/37768
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-07 12:16:46 +00:00
Anders Broman 8a4e53cbed Fix -Wpointer-sign warnings.
Change-Id: Ide037ee1d2f9e52cb024f7335154e12ce09ac010
Reviewed-on: https://code.wireshark.org/review/37767
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-07 09:50:35 +00:00
Anders Broman dc42e2b1cb file-rbm: Fix -Wpointer-sign warnings.
Change-Id: I53e84e172e1c03849158ba6df83aa2ff9cfb3054
Reviewed-on: https://code.wireshark.org/review/37766
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-07 08:41:54 +00:00
Guy Harris 6f52f969d8 tn3270: improve on some of IBM's painful prose.
The "true" string in a struct true_false_string is used only if the bit
is set to 1, so "if set to logic 1" is redundant.  Just have the strings
say, respectively, what significance the bit being on ("set to logic 1")
has and what signficance the bit being off ("set to logic 0") has.

Use active voice.

Change-Id: If1fe7b35a0c85dcdb40ac348ca23a0ac5e3dc1da
Reviewed-on: https://code.wireshark.org/review/37753
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-07-07 06:45:19 +00:00
Filipe Laíns 86c27cc1c0 USB HID: fix parsing {logical ,phys }{min,max} in the report descriptor
Right now, for eg., a -32767/32767 min/max gets dissected as 0/1 which
is wrong.

Change-Id: Iffc649e0af4490827e722cae7f692ec4d0c245b8
Signed-off-by: Filipe Laíns <lains@archlinux.org>
Reviewed-on: https://code.wireshark.org/review/37751
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Tomasz Moń <desowin@gmail.com>
2020-07-07 06:15:04 +00:00
Filipe Laíns 2d49ab3d25 USB HID: introduce a report descriptor parser
Change-Id: Ief63059fc5009cf8eff903d14d1c4dd2f35728b6
Signed-off-by: Filipe Laíns <lains@archlinux.org>
Reviewed-on: https://code.wireshark.org/review/37559
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Tomasz Moń <desowin@gmail.com>
2020-07-07 06:14:32 +00:00
Jaap Keuter 45378647d7 TDS: Fix field abbrev for RPC name
Found by conflict check

Change-Id: Id37c53cbfb9df796c609e602c6edc0f0940bf80c
Reviewed-on: https://code.wireshark.org/review/37745
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 21:37:20 +00:00
Jaap Keuter 3bdf657706 SPOOLSS: make reserved field value presentation meaningful
Detected by conflict check

Change-Id: Ie534564085884afd6f7c9329b6ee637440533f29
Reviewed-on: https://code.wireshark.org/review/37738
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 21:36:30 +00:00
Jaap Keuter 620b8b3c71 TN5250: Fix two true_false strings so they are differentiating
Found by conflict check

Change-Id: Ic0348945b8519bc434bc5a10b5ed5951a7cdcb21
Reviewed-on: https://code.wireshark.org/review/37746
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>
2020-07-06 21:35:51 +00:00
Jaap Keuter c45aba408d BSSAP: Fix field abbrev for IMEISV IE
Found by conflict check

Change-Id: Id14d12543902d75ae54b5b3944a44b63321dc479
Reviewed-on: https://code.wireshark.org/review/37747
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 21:35:28 +00:00
Anders Broman 6a5dba8b1e file-pcapng: Try to fix -Wpointer-sign warnings.
Change-Id: I66f6e26080926f8bb0a4ac84a42963de61604194
Reviewed-on: https://code.wireshark.org/review/37743
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 20:40:32 +00:00
Gerald Combs 30f8f9656b epan: Fixup our ENABLE_CHECK_FILTER warnings.
Make sure we use g_warning to print each ENABLE_CHECK_FILTER warning.
g_warning automatically appends a newline, so there's no need for us to
do so.

Change-Id: I4ddb60f0e3e0382fb3ca6e996ad47410fe05d8be
Reviewed-on: https://code.wireshark.org/review/37748
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-07-06 18:42:07 +00:00
Martin Mathieson 4b4bbe8067 DVB-S2-BB: Add the next-header protocol types from RFC4326, section 4.4.1
Change-Id: Ieb35ffb94a0e3c2f27768cefce91e0c93619ff94
Reviewed-on: https://code.wireshark.org/review/37733
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 17:24:28 +00:00
Anders Broman 475cba7e6b mbim: Try to fix -Wpointer-sign warnings.
Change-Id: I56eccab845dae0bb903ee052130bb3ac00dba863
Reviewed-on: https://code.wireshark.org/review/37744
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 17:22:10 +00:00
Alexis La Goutte 0d7d7fe3c6 rtps-utils: fix no previous prototype for functio
packet-rtps-utils.c:85:6: warning: no previous prototype for ‘dissect_mutable_member’ [-Wmissing-prototypes]

Change-Id: Id87118f36e50db8bf4a27ca021bbceae220034d4
Reviewed-on: https://code.wireshark.org/review/37742
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 15:24:11 +00:00
Anders Broman 53b0b25661 nfapi: Try to fix -Wpointer-sign warnings.
Change-Id: I71dadf67fc2c096001af6711650261336729d5b9
Reviewed-on: https://code.wireshark.org/review/37737
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 14:54:25 +00:00
Alexis La Goutte 64b7bb05d4 http2: fix no previous prototype for functio
packet-http2.c:285:6: warning: no previous prototype for ‘decode_as_http2_populate_list’ [-Wmissing-prototypes]

Change-Id: Ife66469b7016437c1e2b6d41df99571e73159851
Reviewed-on: https://code.wireshark.org/review/37741
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 14:50:54 +00:00
Alexis La Goutte fc3a9d3328 enip: fix no previous prototype for function
packet-enip.c:1102:19: warning: no previous prototype for ‘create_connection_id_list’ [-Wmissing-prototypes]

Change-Id: I6e0caa29f5617a5688cddaa4d8001a260228294e
Reviewed-on: https://code.wireshark.org/review/37740
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 14:50:14 +00:00
Anders Broman 9c5b15a8f4 SDP: Try to fix -Wpointer-sign warnings.
Change-Id: Ia08bec34b64374fcad8c746274720e1a3ccd2689
Reviewed-on: https://code.wireshark.org/review/37739
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 14:36:11 +00:00
John Thacker 9fc054a65b Add all supported charsets to Show Packet Bytes/Follow Stream
Use the QT text codec support to add charset conversions for all character
encodings supported by QT to Show Packet Bytes and Follow Stream (Save As
will convert to UTF-8.) Note that this is dynamic and the exact list will
depend on the version of QT and if libicu support is enabled. This does
make the list of codecs pretty long, so hopefully it shows up well on all
the different QT styles.

This does not yet support when multibyte characters span more than one packet
in Follow Stream, though the current code doesn't do that for UTF-8 or UTF-16
already. This is probably most useful for HTTP captures.

Bug: 16137
Change-Id: I6d5cd761a5d9d914b7a787fe8eb02b07b19642e6
Ping-Bug: 16630
Reviewed-on: https://code.wireshark.org/review/37707
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2020-07-06 14:21:41 +00:00
Anders Broman 23cb6959c1 slsk: Try to fix -Wpointer-sign warnings.
Change-Id: Ic93368c4e3481f09c09ac6fd545683418dd335bd
Reviewed-on: https://code.wireshark.org/review/37730
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 12:15:32 +00:00
Anders Broman a8d5920caf tls_utils: Try to fix -Wpointer-sign warnings.
Change-Id: Ia03499ae77dbbc840dc50ecf3ce56c399d939a6a
Reviewed-on: https://code.wireshark.org/review/37729
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 12:14:22 +00:00
Anders Broman e01795489b umts_fp: Try to fix -Wpointer-sign warnings.
Change-Id: I649556aa97c34a653109caf1d0311b856a71bc09
Reviewed-on: https://code.wireshark.org/review/37728
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 11:25:50 +00:00
Martin Mathieson d13098e235 GSM-SMS: Fix max of a range value.
value_range_string error:  Reason (gsm_sms.dis.field_st_reason) entry for "Values specific to each SC" - max(15 0xf) is less than min(16 0x10)

Change-Id: Iaa1ceee018d873b13ddc8eac9bc530ee2b37ad6e
Reviewed-on: https://code.wireshark.org/review/37727
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-07-06 10:57:46 +00:00
Martin Mathieson 77d4112bb1 DVB-S2-BB: For GSE Protocol Type, separate Next-Header and Ethertype subtypes.
For Ethertype, use etype_vals (don't know how likely types not named as
examples in specs are likely to be seen).

Fixes warnings from previous range_string that tried to cover both types, but
where "not implemented" catch-all ranges preceded and hid individual types.

** (process:24396): WARNING **: 21:24:48.760: value_range_string error:  Protocol (dvb-s2_gse.proto) hidden by earlier entry (prev="not implemented":  0 0x0 -> 255 0xff)  (this="NCR":  129 0x81 -> 129 0x81)

** (process:24396): WARNING **: 21:24:48.760: value_range_string error:  Protocol (dvb-s2_gse.proto) hidden by earlier entry (prev="not implemented":  0 0x0 -> 255 0xff)  (this="Signaling Table":  130 0x82 -> 130 0x82)

** (process:24396): WARNING **: 21:24:48.760: value_range_string error:  Protocol (dvb-s2_gse.proto) hidden by earlier entry (prev="not implemented":  2049 0x801 -> 34524 0x86dc)  (this="VLAN":  33024 0x8100 -> 33024 0x8100)

Tested with dvb-s2_bb_example.pcap (where the only Protocol Type value set is for IPv4).

Change-Id: I7c8d8669c3f3e76974db8472783284975e063c12
Reviewed-on: https://code.wireshark.org/review/37711
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 10:42:20 +00:00
Jaap Keuter df5cc85a79 GBCS: fix field abbreviation for firmware hash
Found by conflict check.

Change-Id: I95d05852ad3c8cd415e3235d3137ee3c85438817
Reviewed-on: https://code.wireshark.org/review/37725
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 10:41:12 +00:00
Martin Mathieson fa6eb07e2e UDPCP: Move link from original specification to Wayback Machine archive.
Change-Id: I2dfda0d505a8d538d1c85fe35ed16d67fdf96223
Reviewed-on: https://code.wireshark.org/review/37726
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-07-06 10:37:45 +00:00
Anders Broman b0cea2cb4c ncp2222: Try to fix -Wpointer-sign warnings.
Change-Id: I3928a137fe56387e1640b5a72e2c1c122dc54aec
Reviewed-on: https://code.wireshark.org/review/37724
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-07-06 09:07:52 +00:00
Richard Sharpe b1ec5ddff6 ieee80211: Remove duplicate and erroneous entries in the status code table.
Also, the status code 125 is duplicated. This mistake was probably
introduced from Draft P802.11Revmd_D3.0.pdf. I have commented out that
status code while I get clarification on the real value.
Change-Id: Id41e1da953a28ca6b098f6c96d6410dff04dc6d7
Reviewed-on: https://code.wireshark.org/review/37708
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-07-06 09:06:48 +00:00
Stig Bjørlykke 95c56f5b72 nordic_ble: Avoid identical true and false strings
Change field 'MIC' (nordic_ble.mic_not_relevant) to avoid using identical
true and false strings.

Change-Id: I204cc096e4af6d6000a6aa7e70e7885221fb211f
Reviewed-on: https://code.wireshark.org/review/37721
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-06 05:11:52 +00:00
Guy Harris c3802e5af1 DVB-S2-BB: update list of standards.
We refer to part 1 of ETSI TS 102 606, i.e. to ETSI TS 102 606-1.  Add
other parts if appropriate.

That ultimately ends up pointing to RFC 4326, which, in turn, mentions
two IANA registries.

Change-Id: Ief3ff36bd4c92ab6b94f07f0a6b6a3aeacb2fa12
Reviewed-on: https://code.wireshark.org/review/37716
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-07-05 20:37:36 +00:00
Guy Harris f63916425d DVB-S2-BB: update a URL.
The URL no longer works; use the Wayback Machine.

Change-Id: I80223dc675d0f578dd4f1d58848bc0eea17426c8
Reviewed-on: https://code.wireshark.org/review/37712
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-07-05 20:00:37 +00:00
Martin Kaiser 79576219c9 kafka: lz4: free the composite tvb only once
Try to clean up the composite tvb handling during lz4 decompression.

If we detect an error straight away before doing any lz4 decompression, we
don't allocate a composite tvb at all. The comments in the tvb code say
explicitly that we must not call tvb_new_composite() without adding at
least one piece of data.

If we start decompressing and run into problems after creating the
composite tvb and linking it to the packet's main tvb, we must not free
the composite tvb manually. The epan library will do this for us when
dissection of the packet is finished.

While at it, make sure that we always finalize the composite tvb if we
allocated it and added data to it.

Bug: 16672
Change-Id: I3e3fb303a823640d7707277a109019fc3aad22f2
Reviewed-on: https://code.wireshark.org/review/37696
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-05 12:14:07 +00:00
Martin Kaiser 486d163470 iso14443: support larger frame sizes
Recent updates to the iso14443 specifications increased the maximum frame size
from 256 to 4096. This affects FSC, FSD and type b's max frame size.

Append the optional sizes >256 to the array of possible frame sizes.

Change-Id: I12ffb3a4bbd019dc38030de179526f7ec96b19cb
Reviewed-on: https://code.wireshark.org/review/37690
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-05 12:13:25 +00:00
Martin Kaiser 638d989567 Revert "ISO14443: Update some commands"
This reverts commit fe8744026c.

The commands that fe8744026c ("ISO14443: Update some commands") adds are
not part of iso14443. It seems that these are mifare commands.
(There's a couple of different mifare variants, not all of them support
 those commands.)

Adding the commands unconditionally breaks iso14443 dissection.
An iso14443 block with a pcb byte of 0xA2 is an R-ACK block for block
number 0. This is not a "write block".

If we want to support mifare cards, we have to detect the card type
during activation. We can then add a mifare dissector which handles the
messages after activation if we are actually talking to a mifare card...

Change-Id: I86164cc4c1618204641ae00566694d0f98871785
Reviewed-on: https://code.wireshark.org/review/37689
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-05 10:53:07 +00:00
Marko Hrastovec d626a4b7e8 Add missing CAT001 fields
- After bug 16662 was reported it was discovered that Category 001
  does not have all fields decoded, because at the beginning not
  all fields were added due to lack of sample data. Later, for
  other categories all fields were decoded, while 001 was left out.
  Missing fields for Category 001 are added now.

Change-Id: I3711004e742dbdaa7f785b110c62e420280e71a4
Reviewed-on: https://code.wireshark.org/review/37652
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-05 07:47:04 +00:00
Jaap Keuter 18421cc733 BFD: Adjust BDF echo message filter name
The field filter name and protocol name are identical, where
the field filter name has to adhere to the protocol.field format.
This is picked up by conflict check.

Change-Id: I8ea0f0845916666ac39726b16ef3d907737c38b3
Reviewed-on: https://code.wireshark.org/review/37694
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>
2020-07-05 07:46:14 +00:00
Alexis La Goutte f0490ae52a dvb-s2-table: Fix Dead Store
Fix dead store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I27580222b0d0fb93a38254eba69676e90360f1cb
Reviewed-on: https://code.wireshark.org/review/37699
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-05 07:45:06 +00:00
Guy Harris 569a768ccd ajp13: fix the type of elements of an array of pointers to hf_ values.
"int * const a[]" means "array of const pointers to (non-const) int". so
the array elements are all const; "const int *a[]" means "array of
(non-const) pointrs to const int".

Change-Id: I8f1a0fd7b0f3d06ebf4cf6b993c74cfd47a0db26
Reviewed-on: https://code.wireshark.org/review/37702
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-07-04 22:53:21 +00:00
Martin Mathieson 26b44bd823 DHCPv6: remove a redundant test.
From cppcheck:

epan/dissectors/packet-dhcpv6.c:2276:20: warning: Condition 'optlen>=4' is always true [knownConditionTrueFalse]
        if (optlen >= 4) {
                   ^
epan/dissectors/packet-dhcpv6.c:2268:20: note: Assuming that condition 'optlen<4' is not redundant
        if (optlen < 4) {
                   ^
epan/dissectors/packet-dhcpv6.c:2276:20: note: Condition 'optlen>=4' is always true
        if (optlen >= 4) {

Change-Id: Ia7e83e6712afe9756735b7bede5b58914d4f06bd
Reviewed-on: https://code.wireshark.org/review/37701
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-07-04 21:26:16 +00:00
Guy Harris f23fe3b84e amqp: fix the type of elements of an array of pointers to hf_ values.
"int * const a[]" means "array of const pointers to (non-const) int". so
the array elements are all const; "const int *a[]" means "array of
(non-const) pointrs to const int".

Make some more static data itmes const while we're at it.

Change-Id: I0bc10cce22b57d9f405f97a7facc1231aa53e668
Reviewed-on: https://code.wireshark.org/review/37700
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-07-04 21:01:23 +00:00
Gerald Combs 2340a2ebb2 DHCPv6: Fix a header field entry.
msgtype_vals_ext is an extended value string. Make sure we register it
as such.

Change-Id: Icd0b6280ee3d6df45078afb8eecd174b8bb6d6fd
Reviewed-on: https://code.wireshark.org/review/37698
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-07-04 17:33:52 +00:00
Marko Hrastovec 7975b3ae1d Typing errors for Category 011 in ASTERIX
- An error is corrected, where hf_019_010 is used instead
  of hf_011_010.
- An error is corrected for field names in 011_290_01 PSR.
- An error is corrected for field name in 011_610 Bank number.

Change-Id: I8d0bd7a3f6baad4e94b4d09538dbf1b792893491
Reviewed-on: https://code.wireshark.org/review/37692
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2020-07-04 13:40:36 +00:00
Martin Mathieson 729ddd1c9d DHCPv6: Fix compilation error.
Was introduced in https://code.wireshark.org/review/#/c/37661/

Change-Id: I57b06b11953f1a9a9dbaad006ef88810cb3f7315
Reviewed-on: https://code.wireshark.org/review/37683
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-07-04 11:46:41 +00:00
Pascal Quantin 78329eb938 NR RRC: fix dissection of MobilityFromNRCommand IEs
Change-Id: I2cd4fd2d5af359bd4a432c02284da78548416dd3
Reviewed-on: https://code.wireshark.org/review/37686
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-07-03 21:30:41 +00:00
Pascal Quantin 8174e94fe9 NR RRC: fix dissection of 5GS S1 mode to N1 mode NAS container
Change-Id: I9b33ee238b0b67c25ffa24409f36042a1b6f64fe
Reviewed-on: https://code.wireshark.org/review/37684
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-07-03 15:42:21 +00:00
Adrien Destugues f5d08e31c8 DVB-S2: show raw bbframe data when it is not dissected
Change-Id: Ibdd42d971a1ec7815fcf3467802ff2010d8c498b
Reviewed-on: https://code.wireshark.org/review/37672
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-03 10:08:52 +00:00
Adrien Destugues 73d1721db6 DVB-S2: Reassemble GSE frames.
Large data (for example big DVB-RCS2 tables) can be fragmented at the
GSE level. Reassembly is required to properly decode the data.

Change-Id: I555148e99d43e610208bd87fc64a4bc212fea4b2
Reviewed-on: https://code.wireshark.org/review/37592
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-03 09:11:46 +00:00
Didier Barvaux fb215255bb DVB-RCS2: dissect Ethernet/VLAN payload
Change-Id: Iaae5bef3650544c49a74277495ef7a930390556a
Reviewed-on: https://code.wireshark.org/review/37591
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-03 09:11:31 +00:00
Josselin VALLET 4bf4ee88f0 DVB-RCS2: Handle optional BBFrame EIP CRC 32 field
Change-Id: Ie30eddf80797beaf86a339c2e5743da4a92ec0f0
Reviewed-on: https://code.wireshark.org/review/37590
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-03 08:18:58 +00:00
Paul Chambon 0455c0f16b DVB-RCS2: Added several descriptor dissection
Change-Id: I055b43b61db98ea0ffde030431defb39aba2f630
Reviewed-on: https://code.wireshark.org/review/37589
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-03 06:37:31 +00:00
Ludovic Cintrat 7bf8a87429 DTLS: Add connection ID extension support
* Add DTLS connection ID extension based on
draft-ietf-tls-dtls-connection-id-07, excerpt:

A CID is an identifier carried in the record layer header that gives the
recipient additional information for selecting the appropriate security
association.

* Support session tracking based on connection ID, i.e. a connection ID
list is built then looked up to retrieve the session of a packet, then
the related conversation is updated with this session.

Bug: 16600
Change-Id: I050d7b5b09dad33eb39d506aca67ee839b3b7181
Reviewed-on: https://code.wireshark.org/review/37351
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-03 06:12:21 +00:00
Paul Chambon 0c5b81c641 DVB-RCS2: Added TIM, TMST, TDT and TBTP2 dissection
Change-Id: Ic53007e4237c9e5f6b3e7b1218d63f5fd9074165
Reviewed-on: https://code.wireshark.org/review/37588
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-03 05:46:27 +00:00
Cal Turney faeefc9d59 DHCPv6: fix for bogus errors. Detailed error msgs
Routine "dhcpv6_domain()" of packet-dhcpv6.c has the following
issues:
a. It is unaware of partial (relative) domain names which unlike
   FQDNs must *not* be root terminated(0); otherwise, the resolver
   interprets them as top-level domains (TLDs) such as "com." and
   "org.".
b. Malformed errors are not thrown when they should be and when
   thrown, it does so for the wrong reason.
c. No detail is provided as to the nature of a malformation.
d. The routine does not know the difference between an "empty"
   and "root-only" domain name.
Routine "dhcpv6_option():
The meanings of flags octet of the in the OPTION_CLIENT_FQDN
option sent by the client are different that those of the server.
These differences are not reflected in the display. In addition,
the description of the 'N' bit is incorrect in either case. The
sender type must be determined in order to label them correctly
and to detect conflicts among them.
These changes fully address the above issues. Six types of
domain name errors are now detected. I believe the unusually
large amount of detailed comments with RFC references and
explanations were needed in this case due to the introduction
of concepts such as partial domain names that were not
recognized as such and thus improperly handled and labelled.
The subtree option headers have been converted from "Text only"
to named fields (dhcpv6.option.type_str). Example captures are
attached to the bug report.
The msgtype global variable has been eliminatd.

Bug: 16627
Change-Id: I8d9bf1164835ece2272cc92dd0917322024422d2
Reviewed-on: https://code.wireshark.org/review/37661
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Cal Turney <cturney111@gmail.com>
2020-07-02 21:49:33 +00:00
Guy Harris b46a554ae7 Packetlogger: check for more packet types in the libwiretap heuristics.
As we're now checking the first *few* packets of the file, we must allow
*all* Packetlogger packet types when checking whether the purported
packet type is valid.

Put a note in the Packetlogger dissector so that, if anybody adds a new
packet type, they know that they have to add it to the reader code as
well.

Bug: 16670
Change-Id: Id83493f678182fd3e1b5537f4dfa295fe26dfcb1
Reviewed-on: https://code.wireshark.org/review/37675
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-07-02 21:29:23 +00:00
Michaël Bouchaud af31bff2f9 DVB-RCS: dissect signalling tables in DVB-S2 dissector
- Dissect the RCS header
- Dissect BCT, FCT, FCT2, SPT, NIT, RMT, MMT2, SCT, TIM, TBTP2, CMT
- Dissect RCS descriptors inside these tables

Change-Id: Ib6f3ec3dc0e5dce36f7480e645bffcfff6155e5f
Reviewed-on: https://code.wireshark.org/review/37587
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-02 19:05:57 +00:00
Anders Broman 656aed7d6a Try to squelch [-Wpointer-sign] warnings.
Change-Id: Ic2bdf6acde0eef222264665622f33f7513f3fc9d
Reviewed-on: https://code.wireshark.org/review/37673
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-02 17:25:10 +00:00
Alexis La Goutte 1a8b67c772 ieee80211: Fix bitmask of RNSX fields
Change-Id: I3921085cbdfef55909333fe13f5cee58a78b10c8
Reviewed-on: https://code.wireshark.org/review/37630
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-02 14:34:39 +00:00
Anders Broman 5a823dda01 opa-mad: Try to squelch [-Wpointer-sign] warnings.
Change-Id: Ib04117aaa3a2ad7071b0b51103d0effffeafacf6
Reviewed-on: https://code.wireshark.org/review/37668
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-02 13:54:38 +00:00
Anders Broman cd566f4a6a DNS: Try to squelch [-Wpointer-sign] warnings.
Change-Id: I0b857e4eb6686707d03520bf14b641f30d683db6
Reviewed-on: https://code.wireshark.org/review/37665
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-02 09:03:43 +00:00
Mališa Vučinić ff4296a1fe oscore: Small bug fixes.
- Rename Key ID Context header field.
- Account for ID Context in max info length calculation.

Change-Id: I6f61055dba74294ace275eb852e34ea6caa32627
Reviewed-on: https://code.wireshark.org/review/37642
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-02 07:18:02 +00:00
Dr. Lars Völker 916550de96 TECMP: Adding support for the TECMP protocol
The Technically Enhanced Capture Module Protocol (TECMP) allows the
transport of data recorded on different technologies (e.g. Ethernet,
CAN, LIN, FlexRay). A typical usage scenario is data recording in
vehicles, e.g. for validating and testing autonomous driving.

Bug: 16661
Change-Id: If7c08529049cc1d30d9a5640b4216eac83546800
Reviewed-on: https://code.wireshark.org/review/37610
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-02 06:20:27 +00:00
Vadim Yanitskiy 39b4d2eb3e A-bis/RSL: fix dissection of Mobile Allocation in CHANnel ACTIVation
According to 3GPP TS 48.058 (version 15.0.0), section 9.3.5,
3GPP TS 44.018 "Mobile Allocation" IE shall for compatibility
reasons be included but empty, i.e. the length shall be zero.

It does not mean that the Mobile Allocation IE should not be
decoded by Wireshark though. Some BSC implementations may still
be sending it with length greather than 0.

Let's expose de_rr_mob_all() and use it in dissect_rsl_ie_ch_id().
If the length is greather than 0, raise a protocol warning.

Change-Id: Idd0f2b3cd1e684f2c812b566fde71a1cc727c2c4
Signed-off-by: Vadim Yanitskiy <vyanitskiy@sysmocom.de>
Reviewed-on: https://code.wireshark.org/review/37575
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-02 06:18:27 +00:00
Matthew Weant e312d07367 EAP: Handling Identities with Periods
Fixing EAP WLAN identity dissection to account for
identities that contain periods. Also fixed an issue
with the identity unknown data field where it would
incorrectly calculate the number of remaining bytes
in identity messages.  In that same vein, renamed the
field from hf_eap_identity_unknown_data to
hf_eap_identity_padding as it is only null bytes appended
to the end of identity strings. Lastly, I corrected
the EAP WLAN identity MCC and MNC lookup logic.  It
wrongly assumed that NAI Realm MCC and MNCs should only
exist or dissect with permanent EAP identities which
is not the case.  The algorithm used to perform lookups
would also not resolve all MCC/MNC pairs for the MNC value.

Bug: 16524
Change-Id: I1d9955618dab0c70de9fcd88088a4390989653c7
Reviewed-on: https://code.wireshark.org/review/37250
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-02 05:05:24 +00:00
Jaap Keuter d592e475cc ASTERIX: add dissection of I001/050 and I001/060
Bug: 16667
Change-Id: Ibbaacb2df15c7924f4140414f886d7b23c2ea949
Reviewed-on: https://code.wireshark.org/review/37654
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>
2020-07-02 05:00:32 +00:00
Vadim Yanitskiy 1699e50102 GSM/RR: fix wrong field name in SI2quater dissector
Change-Id: I99e3c86268b0e800a468eca47298db488933ef9a
Signed-off-by: Vadim Yanitskiy <vyanitskiy@sysmocom.de>
Reviewed-on: https://code.wireshark.org/review/37657
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>
2020-07-02 04:58:27 +00:00
Gerald Combs bd11d5b90b wslua: Include stdint.h on Windows.
The Universal CRT supplies stdint.h, so there's no reason to define our
own types.

Change-Id: I40d4216136aaecae1dc07b0b32ac31032a74b632
Reviewed-on: https://code.wireshark.org/review/37648
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-01 20:23:22 +00:00
Stig Bjørlykke f0f2480f3c coap: Add Hop-Limit Option
Add Hop-Limit Option from RFC 8768.

Change-Id: I029cd1528f6cfdb87e8c259d2169633a72f1f418
Reviewed-on: https://code.wireshark.org/review/37640
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-07-01 18:40:02 +00:00
Jaap Keuter 65a70ffd82 ASTERIX: CAT001/210 has an extension indicator, it's not fixed
Bug: 16662
Change-Id: Ia0599ed7f5cab8efa4d644738ff5e4d2703d597b
Reviewed-on: https://code.wireshark.org/review/37635
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-07-01 18:38:36 +00:00
Pascal Quantin c41c47505c NAS 5GS: fix dissection of extended emergency number list IE
Bug: 16668
Change-Id: If936bf25d8a062b72f1b682f9cf7d47d51aa5d1e
Reviewed-on: https://code.wireshark.org/review/37644
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-07-01 18:37:06 +00:00
Anders Broman f3a835701e btsdp: Try to squelch [-Wpointer-sign] warnings.
Change-Id: Ib5d0d249b128eeb40ed8d91e2ca1f027ab1dfb64
Reviewed-on: https://code.wireshark.org/review/37634
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-01 14:50:03 +00:00
Anders Broman 217c0e65f1 NGAP: Preserve column info when NGAP is embedded in HTTP2.
Fix regression due to different dissector function called.

Change-Id: Ibf3bfc5ac1cb740e71afa89018d57808c418cdab
Reviewed-on: https://code.wireshark.org/review/37638
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-01 11:35:29 +00:00
Pascal Quantin 18d29c7023 S1AP: add dissection of inter RAT to EUTRA transparent containers
Change-Id: Ibcffda34dea8e8e4f247667222cca24b80cd32b1
Reviewed-on: https://code.wireshark.org/review/37637
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>
2020-07-01 10:56:17 +00:00
Michael Bouchaud (yoz) 50a71ea0a7 DVB-S2: Add DVB-S2x support
- New modcods
- Extended rolloff factor encoding

Change-Id: I4b5667ef286b04e95dd343c5ec7793376f4e09ad
Reviewed-on: https://code.wireshark.org/review/37586
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-01 10:44:40 +00:00
Pascal Quantin b8aec0a9f2 NGAP: decode Handover Request Acknowledge target to source RAN container
As this message does not include the Handover Type IE, let's use the
dissect_target_ng_ran_container_as preference

Change-Id: If220e22ee9cfb6ef0c794ff0f1bd6d75a0fdcf88
Reviewed-on: https://code.wireshark.org/review/37636
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>
2020-07-01 10:36:41 +00:00
Anders Broman ca41ee2aed tests: Try to squelch [-Wpointer-sign] warnings.
Change-Id: I78bba8e39c14c1f6c5b31a79e327cbaf21473a17
Reviewed-on: https://code.wireshark.org/review/37633
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-01 10:01:39 +00:00
Audric Schiltknecht 5ae50899bd DVB-S2: Add option to not dissect BBFrame contents
Since bbframes can contain ethernet packets, it is sometimes a bit
annoying to write filters handling multiple layers of ethernet/ip/...

This option allows disabling dissection of the inner packets to focus
only on the outside layers.

Change-Id: I9409d5b671b616477fe7cfcfaabe1f33f0d528c1
Reviewed-on: https://code.wireshark.org/review/37585
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-01 08:36:14 +00:00
Stig Bjørlykke 4af7888cae coap: Fix "End of Block #" indication
The M bit is used in Block1 Option in a request and in Block2 Option
in a response. Use this to determine when to prefix the block number
information with "End of".

Change-Id: I11c741b15f97f68d668d6cbec97660a6ea392dc1
Reviewed-on: https://code.wireshark.org/review/37629
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-01 08:17:54 +00:00
Anders Broman 133dbc2178 BER: Add the posibillity to do "decode as" on an UDP port.
Change-Id: I2897b32b58f154c9998316b16d24bf97ef544153
Reviewed-on: https://code.wireshark.org/review/37628
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-01 07:24:04 +00:00
Michaël Bouchaud 4b40c28a0e DVB-RCS: Dissect NCR in DVB-S2 dissector
DVB-RCS specifies an NCR (Network Clock Reference) which can be included
in the GSE stream and used to synchronize the return channel.

Change-Id: Ie9c99c8964e44245258a4a446755b2c59379088f
Reviewed-on: https://code.wireshark.org/review/37584
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-01 04:15:28 +00:00
Stig Bjørlykke 40f3c393c3 coap: Move dissection of payload before state tracking
Change-Id: Icd8bce0a12167cc3edb3cb70fad5dd696af0b796
Reviewed-on: https://code.wireshark.org/review/37623
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2020-06-30 21:09:38 +00:00
Stig Bjørlykke 90d63ba075 coap: Add items for block payload and block length
Add items for block_payload and block_length to be used for block
analysis when reassembly is not complete.

Change-Id: I969cac9a50903431c727a2fc424eca464f0167d7
Reviewed-on: https://code.wireshark.org/review/37622
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2020-06-30 21:09:21 +00:00
Jaap Keuter 47a1b736bd ASTERIX: Fix data item I002/070
I002/070 dissection is broken in two ways
- According to spec the name is "Plot Count Values"
- The bitfield for IDENT is interpreted incorrectly

Bug: 16663
Change-Id: I224a53bcecf11a3cbc98bfaa3533caf51bea21ec
Reviewed-on: https://code.wireshark.org/review/37615
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-30 14:23:34 +00:00
Martin Mathieson 570a0cb301 Set member variables in initialiser list (rather than in CTOR bodies).
Also simplify some boolean logic in packet-dcerpc.c.
All reported by cppcheck.

Change-Id: I2075f2ec10dc777ad7635da4ef056d17fc5b0be0
Reviewed-on: https://code.wireshark.org/review/37609
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-06-30 12:11:15 +00:00
Gerald Combs d70bd4489f GVCP: Fix an infinite loop.
Remove an "if(tree)" test in order to ensure that our offset always
advances.

Bug: 16029
Change-Id: I5bb38f2eccfbf3c44a06682a17aafcba9d8fa0c6
Reviewed-on: https://code.wireshark.org/review/37611
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>
2020-06-30 06:29:12 +00:00
Gerald Combs d000ff3e6c FTDI MPSSE: Replace asserts with expert items.
Replace a couple of REPORT_DISSECTOR_BUG instances with
proto_tree_add_expert_format. This should hopefully keep the fuzz
builder from complaining.

Bug: 16597
Change-Id: I0ec281bf69244f339cdcbbe49632130f17124419
Reviewed-on: https://code.wireshark.org/review/37600
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-30 06:27:53 +00:00
Zhenhua Hu 9e3671562c SMB: fix Response of SMB_COM_LOCKING_ANDX (0x24)
Pass Length=0 to proto_tree_add_item will cause get_uint_value
to throw error of 'Trying to fetch an unsigned integer with length 0'.

Change-Id: I0fb457d175b719517419291adaedef5cacc9544a
Reviewed-on: https://code.wireshark.org/review/37614
Reviewed-by: Zhenhua Hu <fattiger1102@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-30 06:27:01 +00:00
Dave Rigby 360ae8b1c0 couchbase: Fix dissect length of status!=0 values
When dissecting response values with a non-zero status, the length
calculation was incorrectly using the entire bodylen and not the
actual value_len. This is likely due to an error in adding support for
flex_frame_extras, before which bodylen == valuelen.

Change-Id: I1d622bea582abcfafc5e97881d94fd7a7db6c80a
Reviewed-on: https://code.wireshark.org/review/37598
Reviewed-by: Ben Huddleston <ben.huddleston@couchbase.com>
Reviewed-by: Jim Walker <jim@couchbase.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-06-30 04:21:34 +00:00
Guy Harris 07ece895ac RTPS: don't add an unitialized info structure to a table.
Bug: 16648
Change-Id: I03cd412db0067360570d0a0d91dc40e8b732a3b9
Reviewed-on: https://code.wireshark.org/review/37612
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-06-30 00:35:56 +00:00
Dave Rigby bc3f3b3e09 couchbase: Decode XATTRs in payload of DCP_EXPIRATION & DCP_PREPARE
Both of these opcodes can have XATTRs present in the binary
encoding. Add them to the set of opcodes for which we decode XATTRs.

Change-Id: Iee09c720dc4306b8e9c4ebb07673b2709f079a24
Reviewed-on: https://code.wireshark.org/review/37597
Reviewed-by: Ben Huddleston <ben.huddleston@couchbase.com>
Reviewed-by: Jim Walker <jim@couchbase.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-29 19:10:58 +00:00
Dave Rigby d065fe022e couchbase: Add doc_flag::CreateAsDeleted
Add support for decoding the CreateAsDeleted flag for subdocument
doc_flag.

Also add some Hello feature flags which were missing (VAttr and
Point-in-Time Recovery).

Change-Id: I7ae1b6e787ee038b5d0f1dbd416f3675eb3be697
Reviewed-on: https://code.wireshark.org/review/37593
Reviewed-by: Ben Huddleston <ben.huddleston@couchbase.com>
Reviewed-by: Jim Walker <jim@couchbase.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-29 19:10:25 +00:00