From 6af6ba56119a75b77df5aba31c6f50c336501674 Mon Sep 17 00:00:00 2001 From: Robert Sauter Date: Fri, 23 Jun 2017 23:59:16 +0200 Subject: IEEE 802.15.4: Overhaul Header IE dissection Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-ieee802154.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-ieee802154.h') diff --git a/epan/dissectors/packet-ieee802154.h b/epan/dissectors/packet-ieee802154.h index 1ceb34ff2a..be2b8d51a0 100644 --- a/epan/dissectors/packet-ieee802154.h +++ b/epan/dissectors/packet-ieee802154.h @@ -227,7 +227,7 @@ typedef enum { } ieee802154_key_hash; /* Header IE Element ID */ -#define IEEE802154_HEADER_VENDOR_SPECIFIC 0x00 +#define IEEE802154_HEADER_IE_VENDOR_SPECIFIC 0x00 /* Reserved 0x01-0x19 */ #define IEEE802154_HEADER_IE_CSL 0x1a #define IEEE802154_HEADER_IE_RIT 0x1b @@ -247,8 +247,8 @@ typedef enum { /* Assigned to External Organization: 0x2a */ #define IEEE802154_HEADER_IE_DA_IE 0x2b /* Reserved 0x2c-0x7d */ -#define IEEE802154_HEADER_IE_EID_TERM1 0x7e -#define IEEE802154_HEADER_IE_EID_TERM2 0x7f +#define IEEE802154_HEADER_IE_HT1 0x7e +#define IEEE802154_HEADER_IE_HT2 0x7f /* Reserved 0x80-0xff */ /* Payload IE Group ID */ -- cgit v1.2.3