diff options
| author | Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp> | 2017-06-27 21:51:10 +0900 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-07-03 20:06:04 +0000 |
| commit | 1aa8ded9a3de8e6fb5b6a7b7dcca9d93bb50dcdd (patch) | |
| tree | 809458023bec6f4bf1cb33f158dd5c9361fc7220 /epan/dissectors/packet-ieee802154.h | |
| parent | b6f36e95fa2f549604c4c7a9ae72fd8eb361bf1a (diff) | |
ieee802154: support 6top protocol (6P) draft-07
- support draft-ietf-6tisch-6top-protocol-07
- replace proto_tree_add_subtree_format() to make manageable JSON output
- use constant values defined for the 1st F-Interop 6TiSCH Interop Event
Bug: 13868
Change-Id: Ifa1a20aa2e8d2c75bb0660f595de71768a20d082
Reviewed-on: https://code.wireshark.org/review/22500
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ieee802154.h')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/epan/dissectors/packet-ieee802154.h b/epan/dissectors/packet-ieee802154.h index be2b8d51a0..5d2821c6de 100644 --- a/epan/dissectors/packet-ieee802154.h +++ b/epan/dissectors/packet-ieee802154.h @@ -255,8 +255,7 @@ typedef enum { #define IEEE802154_PAYLOAD_IE_ESDU 0x0 /* Encapsulated Service Data Unit */ #define IEEE802154_PAYLOAD_IE_MLME 0x1 /* Media Access Control (MAC) subLayer Management Entity */ #define IEEE802154_PAYLOAD_IE_VENDOR 0x2 /* Vendor Specific */ - /*For the Plugtest - Paris 2016, 6top group ID took the reserved value 0x3*/ -#define IEEE802154_PAYLOAD_IE_IETF 0x3 +#define IEEE802154_PAYLOAD_IE_IETF 0x5 /* IETF IE, RFC 8137 */ /* Reserved 0x3-0xe */ #define IEEE802154_PAYLOAD_IE_GID_TERM 0xf @@ -298,7 +297,7 @@ typedef enum { /* 0x37-0x7f Reserved */ /* IETF IE - Sub IE */ -#define IEEE802154_IETF_SUBIE_6TOP 0x00 /* not formally assigned yet */ +#define IEEE802154_IETF_SUBIE_6TOP 0xC9 /* not formally assigned yet */ /* IEEE 802.15.4 cipher block size. */ #define IEEE802154_CIPHER_SIZE 16 @@ -313,23 +312,25 @@ typedef enum { #define IETF_6TOP_TYPE 0x30 #define IETF_6TOP_FLAGS_RESERVED 0xC0 #define IETF_6TOP_SEQNUM 0x0F -#define IETF_6TOP_GAB 0x30 -#define IETF_6TOP_GBA 0xC0 +#define IETF_6TOP_GEN 0xF0 /* SIXTOP CMD and RC identifiers */ #define IETF_6TOP_CMD_ADD 0x01 #define IETF_6TOP_CMD_DELETE 0x02 -#define IETF_6TOP_CMD_STATUS 0x03 -#define IETF_6TOP_CMD_LIST 0x04 -#define IETF_6TOP_CMD_CLEAR 0x05 -#define IETF_6TOP_RC_SUCCESS 0x06 -#define IETF_6TOP_RC_ERR_VER 0x07 -#define IETF_6TOP_RC_ERR_SFID 0x08 -#define IETF_6TOP_RC_ERR_GEN 0x09 -#define IETF_6TOP_RC_ERR_BUSY 0x0A -#define IETF_6TOP_RC_ERR_NORES 0x0B -#define IETF_6TOP_RC_ERR_RESET 0x0C -#define IETF_6TOP_RC_ERR 0x0D +#define IETF_6TOP_CMD_RELOCATE 0x03 +#define IETF_6TOP_CMD_COUNT 0x04 +#define IETF_6TOP_CMD_LIST 0x05 +#define IETF_6TOP_CMD_CLEAR 0x06 +#define IETF_6TOP_RC_SUCCESS 0x00 +#define IETF_6TOP_RC_ERROR 0x01 +#define IETF_6TOP_RC_EOL 0x02 +#define IETF_6TOP_RC_RESET 0x03 +#define IETF_6TOP_RC_VER_ERR 0x04 +#define IETF_6TOP_RC_SFID_ERR 0x05 +#define IETF_6TOP_RC_GEN_ERR 0x06 +#define IETF_6TOP_RC_BUSY 0x07 +#define IETF_6TOP_RC_NORES 0x08 +#define IETF_6TOP_RC_CELLLIST_ERR 0x09 /* SIXTOP Message Types */ #define IETF_6TOP_TYPE_REQUEST 0x00 |