diff options
| author | Yasuyuki Tanaka <yatch@isl.rdc.toshiba.co.jp> | 2016-11-14 23:47:51 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-11-22 14:22:42 +0000 |
| commit | 0f36cf62b705a25c8b932d9bd2725f4d83248f2e (patch) | |
| tree | 2d9a60ff8cfc0970ac2aa7d496bd74ae3d56d8b7 /epan/dissectors/packet-ieee802154.h | |
| parent | 3e1828e35188e1987554b50ed2451de90398b5af (diff) | |
ieee802154: support 6top protocol (6P) draft-03
- support draft-ietf-6tisch-6top-protocol-03
- rename variables and constants to reflect the protocol hierarchy
- show 6P specific information in the "Protocol" and "Info" column
- cleanup
Bug: 13136
Change-Id: I83ca8a55d59225e0cce64f3463100b3750a58b8f
Reviewed-on: https://code.wireshark.org/review/18824
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ieee802154.h')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.h | 50 |
1 files changed, 35 insertions, 15 deletions
diff --git a/epan/dissectors/packet-ieee802154.h b/epan/dissectors/packet-ieee802154.h index eab1ef57cd..442b2f8f8e 100644 --- a/epan/dissectors/packet-ieee802154.h +++ b/epan/dissectors/packet-ieee802154.h @@ -242,7 +242,7 @@ typedef enum { #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_IANA_6TOPGROUPID 0x3 +#define IEEE802154_PAYLOAD_IE_IETF 0x3 /* Reserved 0x3-0xe */ #define IEEE802154_PAYLOAD_IE_GID_TERM 0xf @@ -283,6 +283,9 @@ typedef enum { #define IEEE802154_MLME_SUBIE_RCC_PHY_OPER_MODE 0x36 /* 0x37-0x7f Reserved */ +/* IETF IE - Sub IE */ +#define IEEE802154_IETF_SUBIE_6TOP 0x00 /* not formally assigned yet */ + /* IEEE 802.15.4 cipher block size. */ #define IEEE802154_CIPHER_SIZE 16 @@ -292,22 +295,39 @@ typedef enum { #define IEEE802154_IS_ENCRYPTED(_level_) ((_level_) & 0x4) /*SIXTOP Bit-mask*/ -#define SIXP_VERSION 0x0F -#define SIXP_CODE 0xF0 -#define SIXP_SFID 0xFF +#define IETF_6TOP_VERSION 0x0F +#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 /* SIXTOP CMD and RC identifiers */ -#define SIXTOP_CMD_ADD 0x01 -#define SIXTOP_CMD_DELETE 0x02 -#define SIXTOP_CMD_COUNT 0x03 -#define SIXTOP_CMD_LIST 0x04 -#define SIXTOP_CMD_CLEAR 0x05 -#define SIXTOP_RC_SUCCESS 0x06 -#define SIXTOP_RC_VER_ERR 0x07 -#define SIXTOP_RC_SFID_ERR 0x08 -#define SIXTOP_RC_BUSY 0x09 -#define SIXTOP_RC_RESET 0x0A -#define SIXTOP_RC_ERR 0x0B +#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 + +/* SIXTOP Message Types */ +#define IETF_6TOP_TYPE_REQUEST 0x00 +#define IETF_6TOP_TYPE_RESPONSE 0x01 +#define IETF_6TOP_TYPE_CONFIRMATION 0x02 +#define IETF_6TOP_TYPE_RESERVED 0x03 + +/* SIXTOP Cell Options */ +#define IETF_6TOP_CELL_OPTION_TX 0x01 +#define IETF_6TOP_CELL_OPTION_RX 0x02 +#define IETF_6TOP_CELL_OPTION_SHARED 0x04 +#define IETF_6TOP_CELL_OPTION_RESERVED 0xF8 /* Structure containing information regarding all necessary packet fields. */ typedef struct { |