Commit Graph

80796 Commits

Author SHA1 Message Date
Graham Bloice f6ad4812a2 Add SparkplugB dissector
Add a dissector for SparkplugB as a heuristic subdissector of MQTT
and which calls protobuf to dissect the messages payload.
2021-05-14 12:11:03 +01:00
Gerald Combs 2c62e2eb3f CMake: Set Qt autogen properties for Wireshark.
It looks like multi-configuration generators (notably MSBuild) need
Qt autogen properties set on the wireshark target as well as qtui. Do
so unconditionally in both cases. (We were doing so conditionally for
qtui before.)
2021-05-14 07:55:25 +00:00
Dr. Lars Völker 9a400118df UDS: Adding support for Routine ID and Data ID resolution 2021-05-14 07:39:10 +00:00
Dr. Lars Völker 771872cc7e SOME/IP-SD: Adding support for parsing into the config string
This patch splits the SOME/IP-SD configuration string according to
the specification into smaller key-value-pairs or keys. This makes
analysis involving the configuration options much easier since it
allows filtering on these elements of the configuration string.
2021-05-14 07:22:39 +00:00
Dr. Lars Völker d95b118fc5 AUTOSAR NM: Adding support for 64bit elements in user data
This patch adds suppport for 64bit elements in the user data. With
CAN-FD and Ethernet replacing traditional CANs, NM is not limited
to 8 Byte messages anymore; therefore, the limitation of uint32
elements needed to change.
2021-05-14 07:06:24 +00:00
Odysseus Yang c4b32c8f46 ETWDUMP: Update to support live capture
etwdump will read events from a live session with the params as the filter, also the params can be used as filter when reading from a etl file.
2021-05-13 21:17:09 +00:00
Pascal Quantin 40a988533f WOW: fix patch comparison in version_is_at_or_above()
As reported by Coverity in CID 1484784
2021-05-13 20:15:47 +02:00
Vadim Yanitskiy ffb0723fb3 osmo_trx: add TRXDv2 PDU dissection support 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 1ac8da5971 osmo_trx: cosmetic: re-arrange TRXD related fields 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy bcf893a3dd osmo_trx: append PDU version string to the root tree item 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 859d1c74cc osmo_trx: dissect version-specific content in sub-trees 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 7d0fa4af18 osmo_trx: separate TRXDv0/v1 Tx burst dissection function 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 36d75a9682 osmo_trx: dissect_otrxd_common_hdr() is not common anymore
The upcoming TRXDv2 brings significant changes, not only adding
new fields but also changing order and presence of those that
were considered common so far.  Let's rename this function to
reflect that it's TRXDv0/v1 specific, and call it directly
from the corresponding dissection functions.
2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 1e11273663 osmo_trx: let it warn us if there are unhandled tail octets 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 92a24506a0 osmo_trx: 'Unknown PDU version' is an error, not warning 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 8786ffb611 osmo_trx: refactor version specific handling of burst bits 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 06719b9c31 osmo_trx: dissect_otrxd_mts(): store dissection results 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy ed12e1bde1 osmo_trx: store essential PDU information in a structure 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy d7328d4e1e osmo_trx: return offset from dissect_otrxd_rx_hdr_*() 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 233c3a10d5 osmo_trx: add 'true_false_string' for NOPE.{ind,req} 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy d893ee2af4 osmo_trx: move MTS field dissector into a separate function 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 8adf9742c9 osmo_trx: update coding of the MTS field in TRXDv1 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 8ed012dc42 osmo_trx: add a macro for GMSK modulated burst length 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 6cf5ed263c osmo_trx: make the argument of format_rssi() const 2021-05-13 06:36:48 +00:00
Vadim Yanitskiy 8f827d3b99 osmo_trx: cosmetic: rename s/HDR version/PDU version/
TRXDv2 brings significant changes to the whole PDU structure, not
just the header.  Let's highlight this in the code / strings.
2021-05-13 06:36:48 +00:00
Jorge Mora 1649babef4 RPCoRDMA: fix read chunk reassembly if reply chunk is present
Use correct segment type given by the reassembly message id when
dealing with multiple chunks in the same frame.

When an NFS WRITE is sent with a read chunk having multiple
segments and it also includes a reply chunk, using the wrong
segment type could lead to reassemble the message prematurely
on the last read response for the first read chunk segment.
The message should be reassembled in the last read response
for the last segment.
2021-05-13 05:49:23 +00:00
atul358 507bc43777 Closing issue #17217
Geneve Support for RFC 8296

This patch will extend support for multivendor packet identification as mentioned in RFC 8926.
2021-05-13 05:32:36 +00:00
Tomas Kukosa b33482f3f7 GEONW: minor format improvements
Latitude/longitude displays also original integer value
Speed has just 15bits and can be negative
2021-05-13 05:16:40 +00:00
Andreas Schultz 3cc090fc86 ErlDP: decode fun and new fun ext 2021-05-13 05:00:21 +00:00
Andreas Schultz 9dcaa32a2a ErlDP: decode small and large big integers 2021-05-13 05:00:21 +00:00
Andreas Schultz 4925447c51 ErlDP: decode float and new_float values 2021-05-13 05:00:21 +00:00
Andreas Schultz ec0ce7919d ErlDP: use proto_tree_add_item_ret_XXXX where sensible 2021-05-13 05:00:21 +00:00
Andreas Schultz f44ba07774 ErlDP: decode old message format
The old message format is still in use when talking C nodes.
2021-05-13 05:00:21 +00:00
Andreas Schultz 1fed3443af ErlDP: add decoding for BINARY_EXT 2021-05-13 05:00:21 +00:00
Andreas Schultz e673a9ba75 ErlDP: fix small int printout
SMALL_INT_EXT store *unsigned* integers. Change the printf argument
accordingly.
2021-05-13 05:00:21 +00:00
Nardi Ivan 719f5f971d tshark: fix a memory leak about display filter configuration
If the variable `dfilter' always points to malloc-ed memory, it should
be easier to avoid any leaks.
Leak:
```
Direct leak of 46 byte(s) in 1 object(s) allocated from:
    #0 0x7fadf5a67bc8 in __interceptor_malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cc:144
    #1 0x7fadd7ecbe98 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x57e98)
    #2 0x5556272dbfd5 in main /home/ivan/svnrepos/wireshark/tshark.c:1594
    #3 0x7fadd71ed0b2 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x270b2)
```
2021-05-13 04:43:49 +00:00
John Thacker 2f51b2352d HNBAP: Use specific MNC/MCC fields
Use the specifc MNC/MCC fields for the RAI, LAI, CGI in HNBAP,
continuing to use E212_NONE for all occurances of PLMNidentity.
2021-05-13 04:28:31 +00:00
John Thacker 0a0f090f74 X2AP: Use specific MCC/MNC fields
Use the specific fields for ECGI, NRCGI, and TAI, and E212_NONE
as before for all other IEs.
2021-05-12 22:52:46 -04:00
Davide Caratti b77fc703ca mptcp: add support for the 'Subflow Reset' sub-option
dissect MP_TCPRST sub-option in accordance to RFC8684 §3.6

Link: https://github.com/multipath-tcp/mptcp_net-next/issues/189
Signed-off-by: Davide Caratti <davide.caratti@gmail.com>
2021-05-12 22:06:46 +02:00
Vasil Velichkov b9e942930f maxmin_db: Fix a memory leak in maxmind_db_pop_response
The mmdb_val needs to be allocated with the same wmem allocator as the
one used for mmdb_ipv4_map and mmdb_ipv6_map hash maps.

Build with ENABLE_ASAN and run `ctest -R suite_fileformats -V`

24: Direct leak of 144 byte(s) in 2 object(s) allocated from:
24:     #0 0x55e6deb6eebf in malloc (/home/vasko/sources/wireshark/build_clang/run/tshark+0x1f1ebf)
24:     #1 0x7f708f717bb8 in g_malloc (/lib64/libglib-2.0.so.0+0x5bbb8)
24:     #2 0x7f709c0a7b3c in maxmind_db_pop_response /home/vasko/sources/wireshark/epan/maxmind_db.c:622:49
24:     #3 0x7f709c0a895f in maxmind_db_await_response /home/vasko/sources/wireshark/epan/maxmind_db.c:661:9
24:     #4 0x7f709c0a895f in maxmind_db_lookup_ipv4 /home/vasko/sources/wireshark/epan/maxmind_db.c:696:17
24:     #5 0x7f709d1a97c5 in add_geoip_info_entry /home/vasko/sources/wireshark/epan/dissectors/packet-ip.c:570:33
24:     #6 0x7f709d1a2907 in add_geoip_info /home/vasko/sources/wireshark/epan/dissectors/packet-ip.c:662:3
24:     #7 0x7f709d1a2907 in dissect_ip_v4 /home/vasko/sources/wireshark/epan/dissectors/packet-ip.c:2205:7

Fixes: v2.9.0rc0-2687-g1bab83de53 ("maxmind: Move response processing to a thread.")
2021-05-12 11:58:13 +00:00
Eugene Adell 5f8612e973 TCP: Ignore Spurious Retransmissions during reassembly
Spurious Retransmissions are now ignored during the reassembly
because their respective payloads are already computed with
previous packets. Closes #10289.
2021-05-12 06:57:26 +00:00
Pascal Quantin aee224d5a4 DRBD: disable heuristic dissector by default
It is rather weak and thus can easily trigger false positives.
While in the area, ensure that the minimu number of bytes were
captured for heuristic checks.
2021-05-12 05:27:04 +00:00
John Thacker caed4cce7d RANAP: Use RAI specific MNC/MCC fields
The RANAP ASN.1 defines a RAI as being composed of an LAI and a RAC.
(Cf. the RNSAP ASN.1, which defines a RAI as being composed of a
PLMN-Identity, a LAC, and an RAC.) Handle it so that the RAI fields
are used when dissecting a RAI, only using the LAI fields if the LAI
dissection was not called from the RAI.
2021-05-12 04:53:23 +00:00
John Thacker b66bcdfedf NGAP: Use specific MCC/MNC fields
Use the specific MCC/MNC fields in NGAP for the ECGI, NRCGI, LAI,
TAI, and 5GSTAI, using E212_NONE elsewhre. (Note that NGAP refers to
the 5GSTAI as just TAI, and the original TAI as EPS-TAI.)
2021-05-11 22:45:31 -04:00
Gtker 26c3fd23a5 packet-wow: Replace fallthrough attribute with comment
As directed during PR.
2021-05-11 20:08:32 +00:00
Gtker 39621579e8 packet-wow: Add error handling for packets
Some packets with the error field do not include any remaining fields if
the error is not SUCCESS (0).
Previously this was not handled.

Wiki reference:
https://wowdev.wiki/Packets/Login/Vanilla#Opcodes_and_Errors

The ENC_LITTLE_ENDIAN values have been changed because the pre-commit
script complained.
2021-05-11 20:08:32 +00:00
Gtker ceddf3cc77 packet-wow: Fix realmlist parsing
The original implementation had incorrect field sizes, incorrect field
orders and extra "unknown" fields.

Wiki reference:
https://wowdev.wiki/Packets/Login/Vanilla#Server_2

C++ implementation:
https://github.com/EmberEmu/Ember/blob/development/src/login/grunt/server/RealmList.h
2021-05-11 20:08:32 +00:00
Gtker c496d62a34 packet-wow: Remove unneeded enum
The enum is from the original Mangos source. It is never sent over the
wire and thus can never be seen in Wireshark.
2021-05-11 20:08:32 +00:00
Gtker 1d998afb06 packet-wow: Add reconnection proof
Wiki reference:
https://wowdev.wiki/Packets/Login/Vanilla#Reconnection_proof_packets

C++ implementation:

Client:
https://github.com/EmberEmu/Ember/blob/development/src/login/grunt/client/ReconnectProof.h

Server:
https://github.com/EmberEmu/Ember/blob/development/src/login/grunt/server/ReconnectProof.h
2021-05-11 20:08:32 +00:00
Gtker 84f785e5fc packet-wow: Add reconnect challenge packet
Reconnection uses the same client challenge packet as the initial
connection.

Wiki reference:
https://wowdev.wiki/Packets/Login/Vanilla#Reconnection_challenge_packets

C++ implementation:
Server:
https://github.com/EmberEmu/Ember/blob/development/src/login/grunt/server/ReconnectChallenge.h

Client (same as normal connection):
https://github.com/EmberEmu/Ember/blob/development/src/login/grunt/client/LoginChallenge.h
2021-05-11 20:08:32 +00:00