aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathis Marion <mathis.marion@silabs.com>2023-03-08 17:31:35 +0100
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2023-03-10 17:26:22 +0000
commit9f4947609e50ad15e97f876ded3fba3f27e3d256 (patch)
tree5c48e5bdcb12bbb404a66669b90a89249bd30aac
parent3cbb56010270e210f3021be11c1f5b519c6911ae (diff)
Always dissect IEEE 802.15.4 vendor command OUI
This changes the tree received by registered vendor dissectors (the OUI isn't part of the dissected tree anymore). Thankfully there are currently no dissector registered.
-rw-r--r--epan/dissectors/packet-ieee802154.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 4ec60e8803..5629161b12 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -5176,8 +5176,8 @@ dissect_ieee802154_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
case IEEE802154_CMD_VENDOR_SPECIFIC:
{
guint32 oui = tvb_get_ntoh24(tvb, 0);
- if (!dissector_try_uint_new(cmd_vendor_dissector_table, oui, tvb, pinfo, tree, FALSE, packet)) {
- proto_tree_add_item(tree, hf_ieee802154_cmd_vendor_oui, tvb, 0, 3, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_ieee802154_cmd_vendor_oui, tvb, 0, 3, ENC_BIG_ENDIAN);
+ if (!dissector_try_uint_new(cmd_vendor_dissector_table, oui, tvb_new_subset_remaining(tvb, 3), pinfo, tree, FALSE, packet)) {
call_data_dissector(tvb_new_subset_remaining(tvb, 3), pinfo, tree);
}
break;