Commit Graph

81912 Commits

Author SHA1 Message Date
Evan Huus 6caf24e966 tvblist: explicitly scope memory
Allocate the root node in the same pool as the list itself, and make
that pool explicit so we can pass the pinfo scope instead of using the
global packet pool.
2021-09-08 01:37:07 +00:00
Pascal Quantin 530ee0b365 Windows: upgrade Npcap to 1.55 2021-09-07 23:18:19 +02:00
Pascal Quantin 98faf05b6b file_wrappers.c: use LZ4 if the library is 1.7.3 or later 2021-09-07 21:40:44 +02:00
Evan Huus a97e34a1c1 oids: remove global scopes from debug code
It can all just use NULL scope anyway.
2021-09-07 17:39:22 +00:00
Evan Huus 8a4242fb76 proto: prefer memory from tree over global pool
In methods where we're guaranteed to have a non-null tree, prefer memory
from that tree's scoped pool rather than the global packet pool.
2021-09-07 17:22:47 +00:00
Evan Huus 36f9bb412b dvb_chartbl: remove wmem_packet_scope
Short-circuit on a null tree, so that we can reliably use
PNODE_POOL(tree) for a memory pool instead of the global packet scope.
2021-09-07 17:06:08 +00:00
John Thacker d5a3824f54 IEEE1722 AVTP: Support UDP/IP Encapsulation
Fix support for IEEE 1722-2016 Annex J IP Encapsulation.
Dissect extra 4-octet encapsulation_sequence_num field that
is present when carried on UDP/IP. Perform rudimentary sequence
analysis with it. Fix #17389.
2021-09-07 14:06:52 +00:00
Triton Circonflexe 22768e218c Thrift: Allow partial definition of sub-dissectors
When written by hand, it’s difficult to have a fully functional
subdissector for a given command if the structures in it contain at lot
of fields and/or numerous level of sub-structures, making the definition
of all sub-structures mandatory before we have all sub-structures fully
defined before we can dissect anything.

This patch makes it easy not to defined some structure fields and let
the generic Thrift dissector handle them.

If you care only about some fields for your analysis or you have some
obsolete fields that may appear in your captures due to old client but
are no longer defined in the .thrift files, you can still write the sub-
dissector for your protocol just by omitting the obsolete field.

For example:

static const thrift_member_t tcustom_data[] = {
    { &hf_tcustom_data_id, 1, TRUE, DE_THRIFT_T_I64, TMFILL },
    { &hf_tcustom_data_name, 2, TRUE, DE_THRIFT_T_BINARY, TMUTF8 },
    { &hf_tcustom_data_content, 3, TRUE, DE_THRIFT_T_STRUCT, &ett_tcustom_resource, { .members = tcustom_resource } },
    { NULL, 0, FALSE, DE_THRIFT_T_STOP, TMFILL }
};

could become:

static const thrift_member_t tcustom_data[] = {
    { &hf_tcustom_data_id, 1, TRUE, DE_THRIFT_T_I64, TMFILL },
    { &hf_tcustom_data_name, 2, TRUE, DE_THRIFT_T_BINARY, TMUTF8 },
    { NULL, 3, TRUE, DE_THRIFT_T_GENERIC, TMFILL },
    { NULL, 0, FALSE, DE_THRIFT_T_STOP, TMFILL }
};

and avoid the need to define the extremely complex "resource" struct.

In this case, the structured data would be dissected by the generic
dissector while keeping the possibility for the user to filter on the
resource id or name.
2021-09-07 11:36:00 +02:00
David Fort aae500d32b add RDP multi-transport dissector
This patch adds decoding of RDP multi-transport according to MS-RDPEMT, transported
on top of RDP UDP.
2021-09-07 08:13:57 +00:00
David Fort 8a1649c5a5 rdpudp: dissect the RDP UDP protocol
This patch adds a dissector to analyze the RDP UDP protocol according
to MS-RDPEUDP and MS-RDPEUDP2.
2021-09-07 08:13:57 +00:00
David Fort a3eafc6a5b rdp: parses heartbeat messages
This patch adds parsing for Heartbeat packets and also fixes the ett that was used
for this tree.
2021-09-07 08:13:57 +00:00
Alexis La Goutte 1bf1a1ea7c sequence_dialog(Qt): Fix Called C++ object is null 2021-09-07 06:00:28 +00:00
Alexis La Goutte 3eb15f04ad sharkd_session: Fix Branch condition evaluate to a garbage value
sharkd_session.c:3307:18: warning: Branch condition evaluates to a garbage value [core.uninitialized.Branch]
2021-09-07 05:56:36 +00:00
Alexis La Goutte 5fc6549178 pcapng: Fix Branch condition evaluate to a garbage value
wblock->internal is not initialized on pcapng_read_custom_block function
pcapng.c:3747:9: warning: Branch condition evaluates to a garbage value [core.uninitialized.Branch]
2021-09-07 05:56:36 +00:00
Florian Bezold fece6e0440 SOME/IP: Adding dissection support for SOME/IP over TLS
This patch adds support to SOME/IP to be dissected on top of DTLS. This
can be used via the Decode As feature of Wireshark.

This extends the existing support for DTLS.
2021-09-06 15:42:43 +00:00
Anders Broman 1095faf9d8 Diameter: Update Verizon and Cisco AVPs from MR !3731 2021-09-06 14:28:07 +00:00
John Thacker f6e0589f89 MP2T: Expert info, counter drop is PI_SEQUENCE, not MALFORMED 2021-09-06 09:16:58 +00:00
Triton Circonflexe c30e111ceb Thrift: Improve error reporting
Add an expert info for more protocol issues:
- Thrift protocol exceptions.
- Thrift application exceptions.
- Negative field id that are now prohibited in new interfaces.
- Out-of-order field ids (not prohibited but unusual).
2021-09-06 08:46:03 +00:00
Joakim Karlsson 4eeb091eca Diameter: Update some 3GPP AVS to OctetStringOrUTF8 2021-09-06 10:14:00 +02:00
Alexis La Goutte a5494200c6 tiff: Fix Dead Store found by Clang Analyzer
file-tiff.c:794:5: warning: Value stored to 'offset' is never read [deadcode.DeadStores]
2021-09-06 04:21:15 +00:00
Alexis La Goutte 90a060c339 autosar-nm: Fix Dead Store found by Clang Analyzer
packet-autosar-nm.c:572:7: warning: Value stored to 'offset' is never read [deadcode.DeadStores]
2021-09-06 04:21:15 +00:00
Alexis La Goutte a39fcee57a catapult-dct2000: Fix Dead Store found by Clang Analyzer
packet-catapult-dct2000.c:2826:21: warning: Value stored to 'sub_dissector_result' is never read [deadcode.DeadStores]
2021-09-06 04:21:15 +00:00
Alexis La Goutte 7644d6cc4a dvb-s2-bb: Fix Dead Store found by Clang Analyzer
packet-dvb-s2-bb.c:1902:17: warning: Value stored to 'next_tvb' is never read [deadcode.DeadStores]
2021-09-06 04:21:15 +00:00
Alexis La Goutte 104242836b erldp: Fix Dead Store found by Clang Analyzer
packet-erldp.c:403:13: warning: Although the value stored to 'buf_ptr' is used in the enclosing expression, the value is never actually read from 'buf_ptr' [deadcode.DeadStores]
packet-erldp.c:922:9: warning: Value stored to 'offset' is never read [deadcode.DeadStores]
packet-erldp.c:928:7: warning: Value stored to 'offset' is never read [deadcode.DeadStores]
2021-09-06 04:21:15 +00:00
Alexis La Goutte 34c094a6e9 iso15765: Fix Dead Store Found by Clang Analyzer
packet-iso15765.c:534:13: warning: Value stored to 'pci' is never read [deadcode.DeadStores]
2021-09-06 04:21:15 +00:00
Alexis La Goutte c58400a2ed json: Fix Dead Store found by Clang Analyzer
packet-json.c:365:7: warning: Value stored to 'is_valid_unicode_character' is never read [deadcode.DeadStores]
packet-json.c:371:7: warning: Value stored to 'is_valid_unicode_character' is never read [deadcode.DeadStores]
packet-json.c:383:8: warning: Value stored to 'is_valid_unicode_character' is never read [deadcode.DeadStores]
packet-json.c:389:8: warning: Value stored to 'is_valid_unicode_character' is never read [deadcode.DeadStores]
2021-09-06 04:21:14 +00:00
Alexis La Goutte b007d13f57 oran: Fix Dead Store found by Clang Analyzer
packet-oran.c:1073:25: warning: Value stored to 'offset' is never read [deadcode.DeadStores]
2021-09-06 04:21:14 +00:00
Alexis La Goutte 3d0017ec9f rdp: Fix Dead Store found by Clang Analyzer
packet-rdp.c:1600:3: warning: Value stored to 'offset' is never read [deadcode.DeadStores]
packet-rdp.c:1614:3: warning: Value stored to 'offset' is never read [deadcode.DeadStores]
2021-09-06 04:21:14 +00:00
Alexis La Goutte 9b4263fa3c thrift: Fix Dead Store Found by Clang Analyzer
packet-thrift.c:1382:17: warning: Value stored to 'len_pi' is never read [deadcode.DeadStores]
packet-thrift.c:1388:9: warning: Value stored to 'len_pi' is never read [deadcode.DeadStores]
2021-09-06 04:21:14 +00:00
Alexis La Goutte 39da486c7d proto: fix Dead Store found by Clang Analyzer
proto.c:6480:19: warning: Although the value stored to 'hf_str_val' is used in the enclosing expression, the value is never actually read from 'hf_str_val' [deadcode.DeadStores]
proto.c:6524:19: warning: Although the value stored to 'hf_str_val' is used in the enclosing expression, the value is never actually read from 'hf_str_val' [deadcode.DeadStores]
2021-09-06 04:21:14 +00:00
Alexis La Goutte 4a55281078 dpauxmon(extcap): Fix Dead Store found by Clang Analyzer
dpauxmon.c:290:7: warning: Although the value stored to 'err' is used in the enclosing expression, the value is never actually read from 'err' [deadcode.DeadStores]
dpauxmon.c:432:7: warning: Although the value stored to 'err' is used in the enclosing expression, the value is never actually read from 'err' [deadcode.DeadStores]
dpauxmon.c:437:7: warning: Although the value stored to 'err' is used in the enclosing expression, the value is never actually read from 'err' [deadcode.DeadStores]
dpauxmon.c:443:7: warning: Although the value stored to 'err' is used in the enclosing expression, the value is never actually read from 'err' [deadcode.DeadStores]
2021-09-06 04:21:14 +00:00
Alexis La Goutte 7740e9ae27 pcapng(wiretap): Fix Dead Store found by Clang Analyzer
pcapng.c:2675:5: warning: Value stored to 'opt_cont_buf_len' is never read [deadcode.DeadStores]
2021-09-06 04:21:14 +00:00
Alexis La Goutte 203e082a50 nettrace_3gpp (wiretap): Fix Dead Store found by Clang Analyzer
nettrace_3gpp_32_423.c:256:2: warning: Value stored to 'prev_pos' is never read [deadcode.DeadStores]
nettrace_3gpp_32_423.c:295:2: warning: Value stored to 'next_msg_pos' is never read [deadcode.DeadStores]
nettrace_3gpp_32_423.c:487:4: warning: Value stored to 'port_type_defined' is never read [deadcode.DeadStores]
2021-09-06 04:21:14 +00:00
Alexis La Goutte d940352da7 gitlab-ci: enhance cppcheck
display on CI build, the text output (and not xml)
store all cppcheck output files on cppcheck folder

(you need to launch cppcheck twice for generate txt and xml)
2021-09-06 04:04:46 +00:00
Alexis La Goutte da6ef0a3f0 extreme-exeh: fix conflict
'exeh.unknown17' exists multiple times with incompatible types: FT_BOOLEAN and FT_UINT8
2021-09-06 03:47:56 +00:00
Alexis La Goutte 95b63d04d9 dcerpc_spoolss: fix display filter name
found by conflict check
 'spoolss.driverversion' exists multiple times with incompatible types: FT_UINT64 and FT_UINT32
2021-09-06 03:47:56 +00:00
Alexis La Goutte ea6267d12b ncsi: Fix typo (on display name)
found by conflict tools
 'ncsi.mlx.gama.st' exists multiple times with incompatible types: FT_ETHER and FT_UINT8
2021-09-06 03:47:55 +00:00
Gerald Combs 197911dea1 [Automatic update for 2021-09-05]
Update manuf, services enterprise numbers, translations, and other items.
2021-09-05 18:53:03 +00:00
kor 61e1e69218 diameter: add 3GPP 29.234 V11.2.0 (2013-06)
Added new AVP from 3GPP 29.234
2021-09-05 08:12:14 +00:00
Alexis La Goutte 3403e37d47 gitlab-ci: Add artifact for check hf conflict 2021-09-05 07:49:29 +00:00
Ramin Moussavi 03a07e4f1b fix two display issues with remote interfaces window 2021-09-05 07:47:52 +00:00
Uli Heilmeier 86d5606be3 IEEE 802.15.4: Add PAN ID when flag is set
According to IEEE 802.15.4-2020 Section 7.3.5.1 Destination PAN ID field is
present when PAN ID Present bit is set. Therefore we should check for the bit.

Fixes: wireshark/wireshark#17496
2021-09-04 11:17:08 +02:00
Moshe Kaplan 8ef6f04f5a Qt: Debounce Preferences -> Advanced menu : Avoid leaking memory
Free the QTimer in the PreferencesDialog's destructor to
avoid leaking memory.
2021-09-04 07:47:34 +00:00
Chuck Craft eb83421c96 NSIS: expand title area for long program names that wrap
Release candidates (rc blah blah hash) or if WIRESHARK_VERSION_EXTRA
is set for the build, are wrapped/clipped to be unreadable.
2021-09-04 06:19:42 +00:00
Martin Mathieson fb02f423b1 Some spelling fixes 2021-09-03 22:45:06 +00:00
Graham Bloice 436eab0d77 SparkplugB: Fix handling of malformed message
Make the dissector more defensive when handling a message with
a malformed topic string

Fixes #17566
2021-09-03 17:57:07 +01:00
Alexis La Goutte 738670df7e woww: Fix conflict
Typo on display name filter (copy/paste ?)
2021-09-03 13:41:13 +00:00
Martin Mathieson 571c0c9580 ORAN FH CUS: Fix section 6 summary 2021-09-03 10:45:35 +01:00
Taisuke Sasaki b4ef378e5e BGP: Fix BGP-LS TLV offset of IGP TE Metric (RFC8571) 2021-09-03 05:51:39 +00:00
Natale Patriciello 57376bdf3e RTCP: Fix padding dissection in transport feedback
The transport feedback definition, from
(https://datatracker.ietf.org/doc/html/draft-holmer-rmcat-transport-wide-cc-extensions-01#section-3.1)
has the third bit as the padding bit (as any RTCP feedback message). However,
the transport feedback dissector was consuming the padding (if present),
leaving the outer RTCP dissector with a padding bit set, but no padding to
analyze/show. That resulted in a "Malformed packet" error.

With this patch, any padding that is consumed in the transport feedback
dissection clears the outer padding bit set, leaving the RTCP dissector happy.
2021-09-03 05:36:23 +00:00