Commit Graph

90510 Commits

Author SHA1 Message Date
Patrik Thunström 8f49a831cf ptp: Corrected data type for cumulativeScaledRateOffset.
Aligning the data type with the 802.1AS specs the data type is
now INT32 instead of UINT32.
Also added a generated field where the scale and offset is removed
to easier interpret the actual accumulated rate ratio.
2024-02-22 23:19:59 +00:00
Martin Mathieson c72fc5b163 Fix some spelling errors 2024-02-22 20:28:19 +00:00
John Thacker b5ffe3deac QUIC: Handle early 1-RTT data from server
For our test in check_dcid_on_coalesced_packet, check the *last*
QUIC packet in the frame so far, not the first packet in the
frame.

Only create the quic_packet structure after checking for a coalesced
packet, so that the last QUIC packet in the frame is the previous
one, not the current one.

What happens if 0-RTT packets are lost and resent?  There's an
alternative suggestion featuring checking if the ciphers are
initialized on the first pass that might work too, but if we
did that, what happens if the server Handshake is fragmented,
reassembled, and the server sent some "0.5-RTT" data after the
last fragment but then had to resend a different Handshake fragment
later? We'd still get some 1-RTT data before the handshake was done.

Fix #19665 while still not upsetting #19503.
2024-02-22 19:20:28 +00:00
John Thacker 00c938b7a9 OSITP: Pass ED-TPDU to subdissectors
Fix #7393
2024-02-22 09:49:55 -05:00
Jaap Keuter ff23d579de SNMP: Add support for RFC 5343
Add identification of the 'local engine' format.
2024-02-22 04:54:44 +00:00
marmonier_c 25487eceef feat(#19647): decode Datum enum and Ver field
Use RFC 6225 (obsoletes RFC 3825)
2024-02-22 04:52:56 +00:00
marmonier_c 1703eea653 feat(#19647): decode resolution fields 2024-02-22 04:52:56 +00:00
marmonier_c f501c57fc3 feat(#19647): check longitude and latitude max value 2024-02-22 04:52:56 +00:00
marmonier_c 5e9e75537a fix(#19647): correction of fractional calculations
Altitude dissector added
2024-02-22 04:52:56 +00:00
Anders Broman ac9ff53c7a LUA: Pickup LUA 5.3 or 5.4 if available and use it. 2024-02-22 04:48:23 +00:00
Gerald Combs 8b0e90d62e AllJoyn: Add recursion checks 2024-02-22 00:27:48 +00:00
Gerald Combs 34c90f7a3d 6LoWPAN: Add recursion checks 2024-02-21 14:36:18 -08:00
John Thacker 302eb58770 GTP: Fix filtering of UL/DL items
The uplink and downlink bit rate items, and the maximum SDU size,
are contained in a single octet but added to the tree using
proto_tree_add_uint_format[_value] after multiplying by various factors,
so the values don't actually fit in a FT_UINT8. The fields need
to be large enough to fit the largest value added after transformation.

The filter engine won't allow filters for values outside the field
range, e.g.

$ ./run/dftest -s 'gtp.qos_max_sdu_size == 1500'
Filter:
 gtp.qos_max_sdu_size == 1500

Error: "1500" too big for this field, maximum 255.
  gtp.qos_max_sdu_size == 1500
                          ^~~~

After:

$ ./run/dftest -s 'gtp.qos_max_sdu_size == 1500'
Filter:
 gtp.qos_max_sdu_size == 1500

Syntax tree:
 0 TEST_ANY_EQ:
   1 FIELD(gtp.qos_max_sdu_size <FT_UINT16>)
   1 FVALUE(1500 <FT_UINT16>)

Instructions:
 0000 READ_TREE        gtp.qos_max_sdu_size -> R0
 0001 IF_FALSE_GOTO    3
 0002 ANY_EQ           R0 == 1500
 0003 RETURN
2024-02-21 21:07:22 +00:00
Anders Broman f9e052b88e LUA: Make it compile with LUA 5.4 2024-02-21 21:06:00 +00:00
Anders Broman 926344c16c LUA bitop: Convery our lua_bitop.c to work with 5.3 and 5.4
The code is written by Andrew Engelbrecht and found here:
https://github.com/LuaJIT/LuaJIT/issues/384
2024-02-21 21:01:34 +00:00
Gerald Combs 282bd19e88 TN5250: Add a recursion check 2024-02-21 20:27:07 +00:00
Gerald Combs f8af3cd410 Add Clang-Tidy suppressions to various dissectors
Add NOLINTNEXTLINE suppressions for some existing recursion checks.
2024-02-21 11:41:01 -08:00
Gerald Combs 7183ac40da MONGO: Add a recursion check 2024-02-21 11:09:13 -08:00
John Thacker 722816c68e dfilter: Handle 64-bit extended value strings
Allow matching against 64-bit extended value strings the same
way as other value strings.

The IAX2 sample capture on the Wiki is a good test of this. Previously
the matches operator would never match, and comparison operators we not
allowed.

Before:

$ ./run/dftest -s 'iax2.voice.codec == "GSM compression"'
Filter:
 iax2.voice.codec == "GSM compression"

Error: "GSM compression" cannot be found among the possible values for iax2.voice.codec.
  iax2.voice.codec == "GSM compression"
                      ^~~~~~~~~~~~~~~~~

After:

$ ./run/dftest -s 'iax2.voice.codec == "GSM compression"'
Filter:
 iax2.voice.codec == "GSM compression"

Syntax tree:
 0 TEST_ANY_EQ:
   1 FIELD(iax2.voice.codec <FT_UINT64>)
   1 FVALUE(2 <FT_UINT64>)

Instructions:
 0000 READ_TREE        iax2.voice.codec -> R0
 0001 IF_FALSE_GOTO    3
 0002 ANY_EQ           R0 == 2
 0003 RETURN
2024-02-21 09:25:14 -05:00
winprotocolwireshark 2f6833b5f7 SMB2: Update reserved field and add new dissection
Added dissection for FSCTL_REFS_STREAM_SNAPSHOT_MANAGEMENT Request
Add FileFullEaInformation flags
Update SMB2 lock response field unknown to reserved.
Update flush request/response reserved fields.
2024-02-21 12:47:06 +01:00
John Thacker fea3d36a7b extcap: Allow starting from extcap config
Rework the changes from 428f222853
a little bit to restore the ability to start a capture from
the extcap options dialog.

When the the dialog is opened for configuration, present both the
Save and the Start button. Continue to only have Start when the
dialog was spawned because the user wanted to start a capture
but a mandatory parameter was not configured.

Use the default QDialogButtonBox "Discard/Close without Saving"
button when closing the dialog without saving the user input
for new preferences.

Fix #19199
2024-02-21 08:02:15 +00:00
John Thacker 942d7f4b41 R-GOOSE: Strengthen heuristic for CLTP on UDP
Reduce false positives of the CLTP on UDP dissector (RFC 1240)
by looking at the parameters as well and also ruling out length
indicator zero.
See https://ask.wireshark.org/question/31455/i-see-a-malformed-packet-in-wireshark-from-a-google-ip-address-on-port-2400-using-r-goose-protocol-what-could-this-be/

RFC 1240 was rendered Historic by RFC 2556, which noted that
"at this time there do not seem to be any implementations" and
recommended TPKT (ISO on TCP) instead.

However, R-GOOSE does use RFC 1240. In practice, it seems like
R-GOOSE uses the IANA registered port for ISO-TSAP, 102, just like
TPKT does on TCP. Perhaps we should register the dissector to that
port instead of a heuristic dissector if someone can confirm that.

Move the dissector from goose to ositp. This doesn't cause any
preference issues because heuristic dissectors are saved in the
preference file by name and the name won't change.
2024-02-21 07:59:55 +00:00
John Thacker 339d6d4aba text2pcap: Set encapsulation to WIRESHARK_UPPER_PDU with -P
The documentation, both man page and help, claims that text2pcap
automatically sets the encapsulation to WIRESHARK_UPPER_PDU if
-P is given. Make the behavior match the documentation.
2024-02-20 23:01:04 -05:00
Darius Davis c99e37131b TPNCP: Fix two potential array overruns.
The TPNCP dissector depends upon a resource file, tpncp.dat, being loaded
during initialization.  If a non-default tpncp.dat was used, the TPNCP
dissector could potentially perform some operations beyond the bounds of a
fixed-size array while loading tpncp.dat.

If a non-default tpncp.dat was used and an attempt was made to dissect
malformed TPNCP traffic, the TPNCP dissector could potentially perform a read
beyond the end of an array.

This change adds explicit bounds-checks to eliminate these possible OOB
accesses.

There is zero chance of this being triggered in a default unmodified
installation of Wireshark: Loading of the tpncp.dat file is conditional on a
preference setting which defaults to FALSE, and even if it is configured to
TRUE, the included tpncp.dat does not trigger either of these OOB operations.
It still seems worthwhile to make the parser and dissector generally more
robust.
2024-02-21 12:45:19 +10:00
Gerald Combs b8c6c9e1a8 5co-rap: Add a Clang-Tidy suppression 2024-02-20 17:15:14 -08:00
Gerald Combs d7b15ff6d1 RBM: Add a recursion check
Fix

```
wireshark/epan/dissectors/file-rbm.c:196:13: warning: function 'dissect_rbm_array' is within a recursive call chain [misc-no-recursion]
  196 | static void dissect_rbm_array(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, gchar** value_str)
      |             ^
wireshark/epan/dissectors/file-rbm.c:410:13: note: example recursive call chain, starting from function 'dissect_rbm_object'
  410 | static void dissect_rbm_object(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ptree, guint* offset, gchar** type, gchar** value)
      |             ^
wireshark/epan/dissectors/file-rbm.c:439:4: note: Frame #1: function 'dissect_rbm_object' calls function 'dissect_rbm_string' here:
  439 |                         dissect_rbm_string(tvb, pinfo, tree, offset, &value_local);
      |                         ^
wireshark/epan/dissectors/file-rbm.c:325:2: note: Frame #2: function 'dissect_rbm_string' calls function 'dissect_rbm_object' here:
  325 |         dissect_rbm_object(tvb, pinfo, tree, offset, NULL, NULL);
      |         ^
wireshark/epan/dissectors/file-rbm.c:325:2: note: ... which was the starting point of the recursive call chain; there may be other cycles
wireshark/epan/dissectors/file-rbm.c:222:13: warning: function 'dissect_rbm_hash' is within a recursive call chain [misc-no-recursion]
  222 | static void dissect_rbm_hash(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, gchar** value_str)
      |             ^
wireshark/epan/dissectors/file-rbm.c:321:13: warning: function 'dissect_rbm_string' is within a recursive call chain [misc-no-recursion]
  321 | static void dissect_rbm_string(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, gchar** value)
      |             ^
wireshark/epan/dissectors/file-rbm.c:329:13: warning: function 'dissect_rbm_regex' is within a recursive call chain [misc-no-recursion]
  329 | static void dissect_rbm_regex(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, gchar** value)
      |             ^
wireshark/epan/dissectors/file-rbm.c:344:13: warning: function 'dissect_rbm_userclass' is within a recursive call chain [misc-no-recursion]
  344 | static void dissect_rbm_userclass(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, gchar** value)
      |             ^
wireshark/epan/dissectors/file-rbm.c:355:13: warning: function 'dissect_rbm_variable' is within a recursive call chain [misc-no-recursion]
  355 | static void dissect_rbm_variable(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, gchar** value_str)
      |             ^
wireshark/epan/dissectors/file-rbm.c:368:13: warning: function 'dissect_rbm_struct' is within a recursive call chain [misc-no-recursion]
  368 | static void dissect_rbm_struct(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, gchar** value)
      |             ^
wireshark/epan/dissectors/file-rbm.c:374:13: warning: function 'dissect_rbm_drb' is within a recursive call chain [misc-no-recursion]
  374 | static void dissect_rbm_drb(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset)
      |             ^
wireshark/epan/dissectors/file-rbm.c:383:13: warning: function 'dissect_rbm_rubyobject' is within a recursive call chain [misc-no-recursion]
  383 | static void dissect_rbm_rubyobject(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset)
      |             ^
wireshark/epan/dissectors/file-rbm.c:400:13: warning: function 'dissect_rbm_extended' is within a recursive call chain [misc-no-recursion]
  400 | static void dissect_rbm_extended(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset)
      |             ^
wireshark/epan/dissectors/file-rbm.c:410:13: warning: function 'dissect_rbm_object' is within a recursive call chain [misc-no-recursion]
  410 | static void dissect_rbm_object(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ptree, guint* offset, gchar** type, gchar** value)
      |             ^
wireshark/epan/dissectors/file-rbm.c:535:6: warning: function 'dissect_rbm_inline' is within a recursive call chain [misc-no-recursion]
  535 | void dissect_rbm_inline(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, gchar** type, gchar** value)
      |      ^
```
2024-02-21 01:05:15 +00:00
Gerald Combs bb73b87bc7 MP4: Add Clang-Tidy suppressions 2024-02-21 01:03:17 +00:00
Gerald Combs 46c652102f JPEG: Add a recursion check
Fix

```
/builds/wireshark/wireshark/epan/dissectors/file-jpeg.c:773:1: warning: function 'process_tiff_ifd_chain' is within a recursive call chain [misc-no-recursion]
  773 | process_tiff_ifd_chain(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
      | ^
/builds/wireshark/wireshark/epan/dissectors/file-jpeg.c:773:1: note: example recursive call chain, starting from function 'process_tiff_ifd_chain'
/builds/wireshark/wireshark/epan/dissectors/file-jpeg.c:896:37: note: Frame #1: function 'process_tiff_ifd_chain' calls function 'process_tiff_ifd_chain' here:
  896 |                                     process_tiff_ifd_chain(tree, tvb, pinfo, encoding,
      |                                     ^
/builds/wireshark/wireshark/epan/dissectors/file-jpeg.c:896:37: note: ... which was the starting point of the recursive call chain; there may be other cycles
```
2024-02-21 01:00:29 +00:00
Triton Circonflexe ff93425a66 Thrift: Add support for raw sub-dissectors
- Move all basic dissect_thrift_t_<type> implementations into
  dissect_thrift_raw_<type> that takes an additional dissector_t
  parameter.
- All dissect_thrift_t_<type> just calls dissect_thrift_raw_<type>
  with a NULL raw dissector.
- When the dissector_t parameter is set, create a sub-tvbuff_t pointing
  to the raw content of the simple type (integral or binary).
- There are 2 specific cases within the TCompactProtocol part:
  1. For booleans, the sub-dissector is responsible for using only the
     least significant bit as the boolean value. The most obvious use
     of the boolean raw sub-dissector is the use of a true_false_string.
  2. For varint, we manufacture a tvbuff_t containing the big-endian
     value of the right size to be the same as TBinaryProtocol.
- Allow the raw sub-dissector to push the responsibility back to the
  generic dissector using thrift_opt_t.use_std_dissector = TRUE.
  A common use case for that is a specific dissection for some values
  only in a key/value map (configuration keys).
- Add a public dissect_thrift_t_raw_data() function that takes a type
  for dispatch as well as the dissector_t.
2024-02-21 01:00:12 +00:00
John Thacker e911f8ec9d stats tree: Update plugins for new path separator
Update the pinfo stats tree plugin and the F5 trailer for
the new stats tree path separator

Follow up to 53638f9ccf
2024-02-21 00:23:47 +00:00
Martin Mathieson 57c19da670 ISIS-LSP: fix masks for attach set of flags 2024-02-21 00:09:26 +00:00
Gerald Combs 4176fb8f15 BLF: Fix the build 2024-02-20 15:06:15 -08:00
Gerald Combs 3b2c961eeb BLF: Add a recursion check
Fix

```
wireshark/epan/dissectors/file-blf.c:498:1: warning: function 'dissect_blf_lobj' is within a recursive call chain [misc-no-recursion]
  498 | dissect_blf_lobj(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset_orig) {
      | ^
wireshark/epan/dissectors/file-blf.c:886:1: note: example recursive call chain, starting from function 'dissect_blf_next_object'
  886 | dissect_blf_next_object(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) {
      | ^
wireshark/epan/dissectors/file-blf.c:893:32: note: Frame #1: function 'dissect_blf_next_object' calls function 'dissect_blf_lobj' here:
  893 |             int bytes_parsed = dissect_blf_lobj(tvb, pinfo, tree, offset);
      |                                ^
wireshark/epan/dissectors/file-blf.c:580:27: note: Frame #2: function 'dissect_blf_lobj' calls function 'dissect_blf_next_object' here:
  580 |                     tmp = dissect_blf_next_object(sub_tvb, pinfo, subtree, offset_sub);
      |                           ^
wireshark/epan/dissectors/file-blf.c:580:27: note: ... which was the starting point of the recursive call chain; there may be other cycles
wireshark/epan/dissectors/file-blf.c:886:1: warning: function 'dissect_blf_next_object' is within a recursive call chain [misc-no-recursion]
  886 | dissect_blf_next_object(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) {
      | ^
```
2024-02-20 22:34:26 +00:00
Gerald Combs f3e1d98434 Clang-Tidy: Fixup some suppressions
Use directory-level suppressions where needed.
2024-02-20 22:32:53 +00:00
Martin Mathieson 55798da218 PLDM: Fix coverity warning about version printing 2024-02-20 21:41:09 +00:00
Jonathan Lennox 6f79b432dc Annotate short names of VP9 fields in field names.
These match the names used for the filters, which are otherwise non-obvious.
2024-02-20 21:21:49 +00:00
Gerald Combs 16d85df6f4 ISIS LSP: Add a recursion check
Fix

```
wireshark/epan/dissectors/packet-isis-lsp.c:3431:1: warning: function 'dissect_sub_clv_tlv_22_22_23_141_222_223' is within a recursive call chain [misc-no-recursion]
 3431 | dissect_sub_clv_tlv_22_22_23_141_222_223(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree,
      | ^
wireshark/epan/dissectors/packet-isis-lsp.c:3431:1: note: example recursive call chain, starting from function 'dissect_sub_clv_tlv_22_22_23_141_222_223'
wireshark/epan/dissectors/packet-isis-lsp.c:3541:21: note: Frame #1: function 'dissect_sub_clv_tlv_22_22_23_141_222_223' calls function 'dissect_sub_clv_tlv_22_22_23_141_222_223' here:
 3541 |                     dissect_sub_clv_tlv_22_22_23_141_222_223(tvb, pinfo, subtree, local_offset, local_len);
      |                     ^
wireshark/epan/dissectors/packet-isis-lsp.c:3541:21: note: ... which was the starting point of the recursive call chain; there may be other cycles
```

Add Clang-Tidy suppressions as well.
2024-02-20 11:16:22 -08:00
Gerald Combs 45f9dae43c GIOP: Add a recursion check
Add Clang-Tidy suppressions as well.
2024-02-20 18:21:29 +00:00
Gerald Combs 6c52cdf959 ENRP: Add a recursion check
Add Clang-Tidy suppressions as well.
2024-02-20 09:46:42 -08:00
Aaron Turner fed4751087 add missing field for Roon Discovery 2024-02-20 16:50:09 +00:00
John Thacker 4300f713b1 prefs: Always write main prefs file
If writing a separate extcap preferences file fails, always write the
main preference file.

If there's a directory of the same name as a module, silently ignore it.

Followup to !14436
2024-02-20 10:34:02 -05:00
John Thacker 70157523b7 wsutil: Only copy configuration files that are regular files
If someone manually puts a directory, or a FIFO, or something
else (block device?) in a configuration directory with the same
name as a preference file, don't try to copy it and just silently
ignore it.
2024-02-20 09:50:58 -05:00
Darius Davis 8bdc10c6ca Telnet: Include a packet summary in Info column. 2024-02-20 12:58:11 +00:00
Alexis La Goutte aa64b079a4 x509sat: fix type of organizationIdentifier 2024-02-20 11:57:35 +00:00
Martin Mathieson 11350a714a Couchbase: fix link to memcache text protocol 2024-02-20 09:58:04 +00:00
Martin Mathieson 7426e8c3b0 PLDM: rework the way the version string is generated 2024-02-20 09:46:21 +00:00
Gerald Combs 028f423f4e CBOR: Update our recursion checks 2024-02-20 04:07:50 +00:00
Gerald Combs aa10123bf0 BACapp: Update our recursion checks 2024-02-20 03:31:06 +00:00
Gerald Combs 5f0672d749 Add initial Clang-Tidy configuration files and a CI check
Add an initial Clang-Tidy configuration file which checks for recursion
and various clang analyzer issues.

Run Clang-Tidy in the "Clang + Code Checks" merge request job.

Add NOLINT suppressions where needed in wsutil, epan, and lemon.
2024-02-19 19:00:52 -08:00
John Thacker 9a67fac86f prefs: Backwards and forwards compability for hiding columns
Continue to write the format-based hidden preference for now.
Read both preferences; if the index-based preference is read, use it.
If not, fall back to the format-based preference.

Followup to 41930060b0
2024-02-19 21:07:44 +00:00