diff options
| author | Yasuyuki Tanaka <yasuyuki.tanaka@inria.fr> | 2018-03-19 17:09:55 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-03-22 06:17:09 +0000 |
| commit | 9be139cae0b9e82524a670e33429ad147859ff6d (patch) | |
| tree | 506abeca30418ef1da2f14a376f0bbdeb27d5b9b /epan/dissectors/packet-ieee802154.h | |
| parent | eea63ae2a7f41332ae3b7da39513d184662494a2 (diff) | |
ieee802154: support 6top protocol (6P) draft-10
- remove GEN field, that is obsoleted
- add SIGNAL command
- update return codes following the draft
Bug: 14542
Change-Id: I7eeb6f832d23688d5dc50f68224da9a7612429ff
Reviewed-on: https://code.wireshark.org/review/26553
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ieee802154.h')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ieee802154.h b/epan/dissectors/packet-ieee802154.h index d3b7ec7222..43be02d328 100644 --- a/epan/dissectors/packet-ieee802154.h +++ b/epan/dissectors/packet-ieee802154.h @@ -308,8 +308,7 @@ typedef enum { #define IETF_6TOP_VERSION 0x0F #define IETF_6TOP_TYPE 0x30 #define IETF_6TOP_FLAGS_RESERVED 0xC0 -#define IETF_6TOP_SEQNUM 0x0F -#define IETF_6TOP_GEN 0xF0 +#define IETF_6TOP_SEQNUM 0xFF /* SIXTOP CMD and RC identifiers */ #define IETF_6TOP_CMD_ADD 0x01 @@ -317,17 +316,18 @@ typedef enum { #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_CMD_SIGNAL 0x06 +#define IETF_6TOP_CMD_CLEAR 0x07 #define IETF_6TOP_RC_SUCCESS 0x00 -#define IETF_6TOP_RC_ERROR 0x01 -#define IETF_6TOP_RC_EOL 0x02 +#define IETF_6TOP_RC_EOL 0x01 +#define IETF_6TOP_RC_ERR 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 +#define IETF_6TOP_RC_ERR_VERSION 0x04 +#define IETF_6TOP_RC_ERR_SFID 0x05 +#define IETF_6TOP_RC_ERR_SEQNUM 0x06 +#define IETF_6TOP_RC_ERR_CELLLIST 0x07 +#define IETF_6TOP_RC_ERR_BUSY 0x08 +#define IETF_6TOP_RC_ERR_LOCKED 0x09 /* SIXTOP Message Types */ #define IETF_6TOP_TYPE_REQUEST 0x00 |