diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2022-10-26 19:37:31 +0000 |
|---|---|---|
| committer | Uli Heilmeier <uh@heilmeier.eu> | 2022-10-30 17:24:19 +0000 |
| commit | 3baf3216acca695c48ddcb77718bedbeddffda46 (patch) | |
| tree | 0584737c46194336db5e8986bb9208e28ca6cd28 /epan/dissectors | |
| parent | 8b34bfdb59ee1b13e85ab92b4f06b56f4a50730b (diff) | |
ieee802154: Update 6top subie to final number
Close: #18539
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-ieee802154.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index fdb90f0a9c..ca1b04db3d 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -1087,6 +1087,7 @@ static const value_string ieee802154_psie_names[] = { { IEEE802154_MLME_SUBIE_TMCP_SPECIFICATION, "TMCTP Specification IE" }, { IEEE802154_MLME_SUBIE_RCC_PHY_OPER_MODE, "RCC PHY Operating Mode IE" }, { IEEE802154_IETF_SUBIE_6TOP, "6top IE" }, + { IEEE802154_IETF_SUBIE_6TOP_DRAFT, "6top IE (draft)" }, { 0, NULL } }; @@ -3885,7 +3886,6 @@ dissect_ietf_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ies_tree, voi proto_tree *p_inf_elem_tree = ieee802154_create_pie_tree(tvb, ies_tree, hf_ieee802154_pie_ietf, ett_ieee802154_pie_ietf); guint offset = 2; guint pie_length = tvb_reported_length(tvb) - 2; - guint8 subie; guint8 version; guint8 type; guint8 code; @@ -3913,10 +3913,9 @@ dissect_ietf_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ies_tree, voi return pie_length + 2; } - subie = tvb_get_guint8(tvb, offset); version = tvb_get_guint8(tvb, offset + 1) & IETF_6TOP_VERSION; - if (subie != IEEE802154_IETF_SUBIE_6TOP || version != supported_6p_version) { + if (version != supported_6p_version) { return pie_length + 2; } diff --git a/epan/dissectors/packet-ieee802154.h b/epan/dissectors/packet-ieee802154.h index b755e9d4bc..100c50fd20 100644 --- a/epan/dissectors/packet-ieee802154.h +++ b/epan/dissectors/packet-ieee802154.h @@ -310,7 +310,8 @@ typedef enum { /* 0x37-0x7f Reserved */ /* IETF IE - Sub IE */ -#define IEEE802154_IETF_SUBIE_6TOP 0xC9 /* not formally assigned yet */ +#define IEEE802154_IETF_SUBIE_6TOP_DRAFT 0xC9 /* not formally assigned yet */ +#define IEEE802154_IETF_SUBIE_6TOP 0x01 /* not formally assigned yet */ /* IEEE 802.15.4 cipher block size. */ #define IEEE802154_CIPHER_SIZE 16 |