diff options
| author | Chris Brandson <chris.brandson@gmail.com> | 2016-03-21 15:41:10 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-04-05 08:22:38 +0000 |
| commit | 736a0d2daecec5d8fa9a2bcc965a034f600f7c5e (patch) | |
| tree | f39ff8fe98f7980f3c9cbb9e193bbeb1a1998be7 /epan/dissectors/packet-ieee802154.h | |
| parent | b9d5f59b24afc5e74ef8a978eb8bcebd4fde08e2 (diff) | |
802.15.4 added support for the new ZigBee IEs
ZigBee has added new 802.15.4 Information Elements, defined in
Annex D.8 of ZigBee Specification R22. Specifically this is the
Enhanced Beacon Payload IE, TX Power, and Rejoin IEs.
Change-Id: Ic54b92c6d1f6437dc7888d10e9ae63453eb60e1d
Reviewed-on: https://code.wireshark.org/review/14547
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ieee802154.h')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee802154.h b/epan/dissectors/packet-ieee802154.h index 5ab2334b15..1f2a1e9ad2 100644 --- a/epan/dissectors/packet-ieee802154.h +++ b/epan/dissectors/packet-ieee802154.h @@ -172,6 +172,24 @@ #define IEEE802154_MLME_PSIE_EB_FLT_PERCENT 0x04 #define IEEE802154_MLME_PSIE_EB_FLT_ATTR_LEN 0x18 +/* Vendor OUIs */ +#define IEEE802154_VENDOR_OUI_ZIGBEE 0x4A191B + +/* ZigBee Vendor Sub IE Fields */ +#define IEEE802154_ZIGBEE_IE_ID_MASK 0xFFC0 +#define IEEE802154_ZIGBEE_IE_LENGTH_MASK 0x003F +#define IEEE802154_ZIGBEE_IE_REJOIN 0x00 +#define IEEE802154_ZIGBEE_IE_TX_POWER 0x01 +#define IEEE802154_ZIGBEE_IE_BEACON_PAYLOAD 0x02 + +/* ZigBee PRO beacons */ +#define IEEE802154_ZIGBEE_BEACON_PROTOCOL_ID 0x00 +#define IEEE802154_ZIGBEE_BEACON_STACK_PROFILE 0x0f +#define IEEE802154_ZIGBEE_BEACON_PROTOCOL_VERSION 0xf0 +#define IEEE802154_ZIGBEE_BEACON_ROUTER_CAPACITY 0x04 +#define IEEE802154_ZIGBEE_BEACON_NETWORK_DEPTH 0x78 +#define IEEE802154_ZIGBEE_BEACON_END_DEVICE_CAPACITY 0x80 + /* Bit-masks for CC24xx style FCS */ #define IEEE802154_CC24xx_CORRELATION 0x7F00 #define IEEE802154_CC24xx_CRC_OK 0x8000 @@ -241,9 +259,6 @@ typedef enum { /* Reserved 0x3-0xe */ #define IEEE802154_PAYLOAD_IE_GID_TERM 0xf -/* Vendor OUIs */ -#define IEEE802154_VENDOR_OUI_ZIGBEE 0xacde48 - /* Payload IE (Nested) Sub ID */ /* 0x00 - 0x0f Reserved for Long Format */ /* 0x10 - 0x19 Short Format Reserved */ |