Commit Graph

77872 Commits

Author SHA1 Message Date
Pascal Quantin f94fed6010 Windows: upgrade USBPcap to 1.5.4.0
Change-Id: I1414b2f0550a8e498fbf8d688119ffc42837c0ee
Reviewed-on: https://code.wireshark.org/review/37281
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Tomasz Moń <desowin@gmail.com>
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-05-22 16:19:35 +00:00
Stefan Metzmacher 6b5e61971e packet-kerberos: use better add_new_data_source() names
It makes it easier to see what is actually decrypted.

Change-Id: I6c1378f93d32dc31cedc6d901069fa9c30438d61
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/37269
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-21 16:57:08 +00:00
Stefan Metzmacher a9634ab5a0 packet-kerberos: add dissection of PAC_DEVICE_INFO
Change-Id: I81a3d76e445fa59580f0e95e451092dc526f017d
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/37268
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-21 16:57:01 +00:00
Gerald Combs 36ca304359 dumpcap: Initialize a couple of variables.
Initialize err in capture_loop_init_output, as caught by both clang's
scan-build and Visual Studio's code analysis. Initialze err in
capture_loop_init_pcapng_output to match.

Move another variable to the code block in which it is used.

Change-Id: I0306ae6a02a02a8e1ebda89b7c574a7cae01b68f
Reviewed-on: https://code.wireshark.org/review/37274
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-05-21 15:33:05 +00:00
Peter Wu 2b9796adc6 QUIC: add new transport parameters and error codes (draft-28)
* Add new initial_source_connection_id and retry_source_connection_id
   transport parameters for authenticating connection IDs.
 * Rename original_connection_id to original_destination_connection_id.
 * Rename max_packet_size to to max_udp_payload_size.
 * Add new APPLICATION_ERROR transport error code.

Bug: 13881
Change-Id: I45c92e10a42fa8f8849b4c9f7b36b93870760173
Reviewed-on: https://code.wireshark.org/review/37262
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-05-20 12:09:25 +00:00
Guy Harris ff96e37a08 peekremote: update a comment.
Give a new URL on LiveAction's Web site; that version speaks of both
Aruba and Cisco access points together.

Change-Id: I122441531081ceebff6fb6c865da8d898209d2cf
Reviewed-on: https://code.wireshark.org/review/37267
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-20 11:28:22 +00:00
Guy Harris 1aac1aa09c peekremote: go to the Wayback Machine for a URL.
That URL is now dead - Wildpackets is now (part of) LiveAction.

Change-Id: I2dea461fa6e97034d9070cef397038bf606de98b
Reviewed-on: https://code.wireshark.org/review/37263
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-20 11:18:22 +00:00
Vivek Pandey 4ed533334c wifi-dpp: changes to cover new public action frames used in dpp v 2.0
1. Add new action frames 11-17 for DPP 2.0

Change-Id: I0f0e15eb1084d5579b95570276e00c3dd5888333
Petri-Dish: Vivek Pandey <vivek_pandey@comcast.com>
Reviewed-on: https://code.wireshark.org/review/37252
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-05-20 06:16:32 +00:00
Matthew Weant 0817970d24 IEEE802.11: Added HS2.0 ANQP Oper Class Indic Info
Added range_string for Operating Indicator Class
information to support Hotspot 2.0 ANQP messages

Bug: 16568
Change-Id: I98db7aed00703cf329d5a96d317bdf655a0f3dcd
Reviewed-on: https://code.wireshark.org/review/37245
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-05-20 06:13:18 +00:00
Matthew Weant 05c06d04cc IEEE802.11: Added Hotspot 2.0 ANQP Connection Capability Info
Adding Hotspot 2.0 ANQP Connection Capability Information
so the IP protocol and port assignments show up in the GUI
based on the Hotspot 2.0 documentation and implementation details.

Bug: 16569
Change-Id: Ic3e26e04c5d48269d59b6604b125569328c82faf
Reviewed-on: https://code.wireshark.org/review/37246
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-05-20 06:12:29 +00:00
Matthew Weant 9e52936b2b IEEE802.11: Adding ANQP Type 280 per IEEE 802.11-2016
Adding ANQP Type 280 - Network Authentication Type
Information with Timestamp per IEEE 802.11-2016 standard
and adding fields required for timestamp values.

Bug: 16570
Change-Id: Ifbe5d8abc40fcb543c2abaa7478d5feaae2f7945
Reviewed-on: https://code.wireshark.org/review/37247
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-05-20 06:12:10 +00:00
Jaap Keuter 87a8d9fe94 DoxyGen: remove obsolete config file
No longer needed since v2.9.0rc0-184-gad84eec866.

Change-Id: Iee9ee76a3e15b0b202254c9b94141ab2bfb7c978
Reviewed-on: https://code.wireshark.org/review/37181
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2020-05-19 23:42:15 +00:00
Anders Broman c0d04d90ca gsm_common: Update geographical_description
Change-Id: I53b24f55427af53b17233897a71cf5fd70131404
Reviewed-on: https://code.wireshark.org/review/37248
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-19 16:34:22 +00:00
Tomas Kukosa 160e247e69 ITS: fix RCSUnit subtypes decoding
IVIM decoding fixed where RSCUnit subtype with PER visible constraint is used, e.g. RSCUnit(0..1)

Change-Id: I2c15ef70ed9d89875737dd01769f6f882215276d
Reviewed-on: https://code.wireshark.org/review/37192
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-19 13:25:38 +00:00
Pascal Quantin 9d6c7f3ffb NAS 5GS: fix parsing of mapped EPS bearer contexts IE
- the DEB bit no longer exists
- the EPS parameter highlight was off by one

Change-Id: Ic2abf827a2d70babab7854f339964a6535c73c53
Reviewed-on: https://code.wireshark.org/review/37243
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-05-18 11:40:26 +00:00
Gerald Combs 238781fe91 [Automatic update for 2020-05-17]
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I48106b3648d1a699f3153210f68765604e226e8e
Reviewed-on: https://code.wireshark.org/review/37238
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-05-17 08:16:24 +00:00
Guy Harris 20094c36fb isobus: note what ISO specs cover ISObus.
Change-Id: I7b0fdd5369a29bc9fed70f95ef225da229a7279d
Reviewed-on: https://code.wireshark.org/review/37237
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-17 03:11:49 +00:00
Guy Harris e34f760f28 isobus-vt: update with information from the spec.
It's ISO 11783-6, and the spec agrees with the previous change.

Change-Id: Iac8dd83a7844c59bcc1b74cd0712bc5f38b3ae43
Reviewed-on: https://code.wireshark.org/review/37218
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-16 22:31:42 +00:00
Yoshiyuki Kurauchi e837ad57d9 PFCP: fix wrong names of some IEs
Renamed the name of IEs.
* Framed-Route, Framed-Routing, and Framed-IPv6-Route
 ("Frame" => "Framed").
* Deactication Time (Dectivation => Deactivation).

Change-Id: I12247f8b5a1edd82dd386652fdea71610208b9eb
Signed-off-by: Yoshiyuki Kurauchi <ahochauwaaaaa@gmail.com>
Reviewed-on: https://code.wireshark.org/review/37216
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Joakim Karlsson <oakimk@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-16 18:54:51 +00:00
Yoshiyuki Kurauchi bd1724aa38 PFCP: fix Ethertype IE
Fix dissection of Ethertype IE which is two-octet long but
dissected as one-octet long.

Change-Id: I141ffebb4a53195d95e8af45fa7ef69e9c7feccd
Signed-off-by: Yoshiyuki Kurauchi <ahochauwaaaaa@gmail.com>
Reviewed-on: https://code.wireshark.org/review/37213
Reviewed-by: Joakim Karlsson <oakimk@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-16 14:17:37 +00:00
Yoshiyuki Kurauchi a9b0db19c0 PFCP: fix Trace Information IE
This commit fixes wrong dissection on the following fields
in Trace Information IE.

Session Trace Depth: don't overwrite length_trigger_events.
List of Interfaces: use length_list_interfaces instead of
  length_list_trigger_events.
IP Address of Trace Collection Entity:
  * dissect as IPv4 or IPv6 depending on the length.
  * rename the field with the full name defined in spec.

Change-Id: I53537bfd61149fe42417667799c0542b98815882
Signed-off-by: Yoshiyuki Kurauchi <ahochauwaaaaa@gmail.com>
Reviewed-on: https://code.wireshark.org/review/37212
Reviewed-by: Joakim Karlsson <oakimk@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-16 14:17:24 +00:00
Martin Mathieson cf340fa0ec USB: fix redundant assignments or tests flagged by PVS-Studio
Bug: 16335
Change-Id: I19ea32fb607bf4132c1690f46dca5ed055009b84
Reviewed-on: https://code.wireshark.org/review/37211
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-05-16 11:37:06 +00:00
Pau Espin 7794527604 rlcmac: Improve COL_INFO for (E)GPRS packets
Important information to follow GPRS flows is added, and cleanup of
strings is done to follow flows if UL/DL or DATA/CTRL packets are
intersected.

Change-Id: I0f1839a71dc45a2ad9dd273f6ca00a7dfae365e0
Reviewed-on: https://code.wireshark.org/review/37197
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-05-15 16:22:42 +00:00
Joakim Karlsson 1ddd9932d8 gprscdr: Update to 3GPP TS 32.298 V16.4.1
Change-Id: I8d7d38734055e72cf1ace9a82bd3741ed9464f33
Reviewed-on: https://code.wireshark.org/review/37209
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-15 14:56:43 +00:00
Joakim Karlsson cbb12e04bf pfcp: Update to 3GPP TS 29.244 V16.3.1
Change-Id: Icf5d015cc3f4c2dd26d612b7df1393872c228271
Reviewed-on: https://code.wireshark.org/review/37207
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-15 14:31:38 +00:00
Stig Bjørlykke 454d974fe5 tls: PSK is named "Pre-Shared Key"
In TLS RFCs PSK is referred to as "Pre-Shared Key". Update preference
text to use this.

Change-Id: I13f1380bfc46c90019a3560f316008864aae6ace
Reviewed-on: https://code.wireshark.org/review/37208
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-15 14:23:48 +00:00
Vanson Lim f331b62436 NSH MD Type 2 Context TLV definition updated to conform with RFC8300.
Change-Id: Ibf5af4737d6831a8d5b057560fa9824459ec1c8a
Reviewed-on: https://code.wireshark.org/review/37198
Reviewed-by: 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-05-15 13:13:04 +00:00
Uli Heilmeier b5dc967c79 Radius: Fix NULL pointer call
Check length before calling tvb_bytes_to_str()

Bug: 16564
Change-Id: I3cfb91d5da5f6f620f8f48c55fb3837ebe70972c
Reviewed-on: https://code.wireshark.org/review/37200
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-15 07:33:35 +00:00
Andy Zhao 6078965ebe smb2: add dissector for App_Instance_Version structure in SMB2 Create Context.
Bug: 16563
Change-Id: I56c1258feeb8135936608049326bda68006e00cd
Reviewed-on: https://code.wireshark.org/review/37187
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-05-15 06:52:53 +00:00
Dylan Ulis 2342872ed4 ENIP: TCP/IP Object Updates
1. Status Attribute - Decode more bits
2. IANA Port Admin Attribute

Bug: 16443
Change-Id: Ic74226c373ba2a68d6e8d8c0e804661b778332a2
Reviewed-on: https://code.wireshark.org/review/37196
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-15 04:00:02 +00:00
Pascal Quantin 536f5b466b sharkd_session.c: fix a warning reported by gcc 10
warning: ‘%s’ directive argument is null [-Wformat-overflow=]
  544 |  fprintf(stderr, "load: filename=%s\n", tok_file);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change-Id: I583a94308ad53b461606053def17e8537eec8d65
Reviewed-on: https://code.wireshark.org/review/37195
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-05-14 19:56:39 +00:00
Pascal Quantin 4b67b72d2a SBcAP: fix update of info column
Remove the test on tree before decoding the PDU and display the message
name

Change-Id: I2e8d9000d6da4ef812bf84539c1dc32c8ae9e2a1
Reviewed-on: https://code.wireshark.org/review/37194
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-05-14 14:10:11 +00:00
Martin Mathieson d2812de8e7 Fix some more broken web links in dissector code
Change-Id: I57853e706b58fd3bb46d952fcb1f517f435fd737
Reviewed-on: https://code.wireshark.org/review/37193
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-05-14 10:03:39 +00:00
Tomas Kukosa 84e0f45640 Add radiotap.vendor dissector table for vendor namespace
Change-Id: I49f1bd88b887635b2404e15dac60a44963ff9fd7
Reviewed-on: https://code.wireshark.org/review/37188
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-05-14 06:00:31 +00:00
Martin Mathieson 5ed4f53e2b Fix a few broken web links from dissectors
Change-Id: I008a9136890354aae583aaaf9ccf9213d5efe539
Reviewed-on: https://code.wireshark.org/review/37189
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-05-13 19:42:53 +00:00
Piotr Sarna 90d1a9de43 scylla: fix tree sizes and offsets
The following sizes and offsets were incorrect:
 - negotiation frame size (negotiation header size was used)
 - response frame size (response frame header size was used)
 - request frame size (response(sic!) frame header size was used)
 - mutation subtree offset (resulting in wrong subtree size too)
 - partition key subtree offset (resulting in wrong subtree size too)

Also, negotiation/response frames were not dissected correctly if they were
shorter than request header size (28) - they are correctly handled now.
Additionally, Seastar RPC magic sequence (SSTARRPC) is explicitly
added to the negotiation tree in order to explicitly show each part
of the frame.

Change-Id: Ibc5024b329113e98a363cfeb40223d61b9473fb2
Reviewed-on: https://code.wireshark.org/review/37186
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-05-13 14:41:32 +00:00
Dylan Ulis da8c28dc67 CIP Motion: Connection Configuration Data
1. Dissect the Motion Configuration Block from the Forward Open
2. Add Motion Attributes related to #1
3. Save the first/last segment for certain segment types in an EPATH.
Behavior changes based on the values in first segments for a given type,
vs later segments.

Change-Id: Id0552a585d158041c13adfa50f4bb164cada79b7
Reviewed-on: https://code.wireshark.org/review/37168
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-13 11:01:32 +00:00
Adam Mitz 256cc1a85c RTPS: updated submessage parsing to match protocol spec
Change-Id: I1bd5103e5a7c01e0fb1a17091a27b6e5c5c2e69c
Reviewed-on: https://code.wireshark.org/review/37164
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-13 11:01:20 +00:00
Jaap Keuter e8c9b6c0dd DoxyGen: Add Wireshark icon to output
Because we can.

Change-Id: Ic6e43ccea0e556be36c7a41b4fa40d52006e309b
Reviewed-on: https://code.wireshark.org/review/37183
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-13 10:15:25 +00:00
Jaap Keuter 91a4950926 DoxyGen: Remove build dir from input
Change-Id: Ie98d555091d9c3b70aa6d72bde4ec9c8a7f7a12f
Reviewed-on: https://code.wireshark.org/review/37182
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-13 10:15:14 +00:00
Piotr Sarna 17c9a2a2a4 scylla: link requests with responses
Response packets already contained references to their original
requests. Now, the reverse link is provided as well, so the response
frame can be conveniently reached from the request.

Change-Id: I09c7e3fc08c46d14315e2bad01573c20d9a079ad
Reviewed-on: https://code.wireshark.org/review/37179
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-05-12 09:54:59 +00:00
Piotr Sarna 82fb2d1f29 scylla: fill the list of packets that do not expect responses
Two more packets do not expect a response:
 - DEFINITIONS_UPDATE
 - PAXOS_PRUNE

Change-Id: I7159f1311c0884a42e0d347244bfb734465c6fb9
Reviewed-on: https://code.wireshark.org/review/37184
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
2020-05-12 08:20:33 +00:00
Uli Heilmeier 24a2d77ac4 DLEP: Additional data items
Added additional data items as defined in
* RFC 8757 Latency Range Extension
* RFC 8629 Multi-Hop Forwarding Extension
* RFC 8703 Link Identifier Extension

Change-Id: Iaf567911b20bf6e66466da5a3daba0499e2ce527
Reviewed-on: https://code.wireshark.org/review/37165
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-11 17:46:21 +00:00
Piotr Sarna fc1929e9ae scylla: add PAXOS_PRUNE verb
The verb was introduced recently as part of the paxos reconciliation
protocol.

Change-Id: I0c397a45790ff8ff3990c1906297405841b30a09
Reviewed-on: https://code.wireshark.org/review/37178
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-05-11 14:10:07 +00:00
Gerald Combs a941457d91 [Automatic update for 2020-05-10]
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: If6b68e242160198aed0de5947813d0db20c799f2
Reviewed-on: https://code.wireshark.org/review/37173
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-05-10 18:18:48 +00:00
Martin Mathieson a32298b7f6 GSM-SMS: add missing increment of offset.
Fixes bug introduced in
https://code.wireshark.org/review/#/c/37160/

Change-Id: I70620dcdf1e1354b9a377a8e755da3a7baa35f6c
Reviewed-on: https://code.wireshark.org/review/37172
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-05-09 15:19:56 +00:00
Guy Harris 366415bcc3 ARP: expand the set of ARPHRD_ definitions from both IANA and Linxu.
While we're at it, fix some typoes, and clean up the white space.

Change-Id: I32cdcb6603bcf76df26f74bd60cdaadc01b28693
Reviewed-on: https://code.wireshark.org/review/37171
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-09 12:08:54 +00:00
Martin Mathieson 569f3bd611 More PVS-Studio issues flagged by Valerii Zapodovnikov.
/opt/SourceCode/wireshark/epan/dissectors/packet-frame.c	818	warn	V547 Expression 'fi' is always true.
/opt/SourceCode/wireshark/epan/dissectors/packet-gsm_sms.c	2692	warn	V547 Expression 'length <= (offset - saved_offset)' is always false.
/opt/SourceCode/wireshark/epan/dissectors/packet-isup.c	4688	warn	V1037 Two or more case-branches perform the same actions. Check lines: 4688, 4697
/opt/SourceCode/wireshark/extcap/androiddump.c	1237	warn	V560 A part of conditional expression is always true: data_str.
/opt/SourceCode/wireshark/extcap/androiddump.c	1603	warn	V547 Expression is always true.
/opt/SourceCode/wireshark/ui/qt/models/packet_list_model.cpp	497	warn	V560 A part of conditional expression is always true: ok_r1.

For the voip_calls.c change, I preferred to initailize along with every other field, rather than set to actual value it gets set to later.

For the isobus-vt change, I could not find a spec but followed the pattern from other error bit fields.

Bug: 16335
Change-Id: Ie55082222b582f6fff4e8c7a992d863acee6cf15
Reviewed-on: https://code.wireshark.org/review/37160
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-05-09 11:34:12 +00:00
Guy Harris d795711a49 sll: se the value_string table for ARP hardware types.
Map the "Link-layer address type" value to ARP hardware types.

Change-Id: I0552bf57bf39e2daa26588181b4a9e343eb9cd6d
Reviewed-on: https://code.wireshark.org/review/37170
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-09 07:20:43 +00:00
Guy Harris 7e7db3e91c sll: add support for LINKTYPE_LINUX_SLL2.
Different header, with a different size, an additional field, and with
fields being in a different order.

Distinguish between V1 and V2 by giving the version.

That means we can no longer use the "ethertype" dissector as it stands,
because the packet type field isn't at the end of the header, right
before the payload; pull the "add the type field to the protocol tree"
functionality out of the "ethertype" dissector and leave it up to the
dissector calling it.

Change-Id: I72b8a2483c0a539919fbe5d35fd7e60bff4bf75a
Reviewed-on: https://code.wireshark.org/review/37169
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-09 03:14:50 +00:00