osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

ieee802154: Update 6top subie to final number 

Close: #18539
This commit is contained in:
Alexis La Goutte 2022-10-26 19:37:31 +00:00 committed by Uli Heilmeier
parent 8b34bfdb59
commit 3baf3216ac
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/dissectors/packet-ieee802154.c
View File

@ -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;
}

3
epan/dissectors/packet-ieee802154.h
View File

@ -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