diff options
| author | Chris Brandson <chris.brandson@gmail.com> | 2014-11-07 14:11:02 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-12-17 11:53:26 +0000 |
| commit | df639f509e812fff3c5eb4bdf4f77988c6ec122b (patch) | |
| tree | 2d6733280c8596f2dfacc878c878b469d301428f /epan/dissectors/packet-zbee-aps.h | |
| parent | c5b720708e75562d1b8676fd5ab75f9d7b338652 (diff) | |
Fixed bug in ZigBee (zbee) decryption, added Key Establishment cluster and moved IAS, Thermostat and Poll clusters out of the ZCL foundation dissector.
Removed attrID and cmdID ZCL cluster functions.
Bug in ZCL HVAC attribute registration.
Fixed bug in ZCL command ID field registration.
Update Manufacturer Codes and Profile Ids to ZigBee-053874r26 Oct 2014
Fixed broken fragmented ZigBee packet collection and reassembly
Use protocol fields for Thermostat schedule transitions.
Added support for Key Establishment Cluster (CBKE) at SE 1.2a
Updated Message cluster to SE 1.2a spec
Added attribute reporting status which is common to all SE 1.2a clusters
Added SE 1.2a tunnel cluster support
ZigBee Smart Energy (SE) decryption appears to have been broken for some time. For SE you do not know the Link Key until after successful completion of Key Establishment and then manually enter it into preferences. Entry in preferences was broken such that when the new Link Key was entered all existing link keys would be lost. This lead to the loss of the Network Key as well when the Transport Key message was re-processed without the Pre-Configured Link Key. The Link Key 'key ring' has been moved to the UAT post-update callback so that it will always be updated correctly after changes to the link keys in preferences
The attribute reporting status attribute which is common to all SE clusters was accidentally shared, now each cluster has it's own instance
ZigBee security added key display for decrypted packets
ZigBee Security Preferences fixed UAT type for Label so key label is editable again
Added definition for Retail Service profile
Added dissection for profile-wide (General Command Frame) commands when the profile is unknown
Added zbee-zcl-misc.c to precommit check whitelist as it contains ias and hvac clusters avoiding proliferation of too many small files
Change-Id: I53d85ba9d782db6a0e7e78c51b0bc7cdcdbca3ad
Reviewed-on: https://code.wireshark.org/review/5565
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-aps.h')
| -rw-r--r-- | epan/dissectors/packet-zbee-aps.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/epan/dissectors/packet-zbee-aps.h b/epan/dissectors/packet-zbee-aps.h index ba37a8fe6d..b8f77709c8 100644 --- a/epan/dissectors/packet-zbee-aps.h +++ b/epan/dissectors/packet-zbee-aps.h @@ -208,8 +208,16 @@ #define ZBEE_ZCL_CID_DEMAND_RESPONSE_LOAD_CONTROL 0x0701 #define ZBEE_ZCL_CID_SIMPLE_METERING 0x0702 #define ZBEE_ZCL_CID_MESSAGE 0x0703 -#define ZBEE_ZCL_CID_SMART_ENERGY_TUNNELING 0x0704 +#define ZBEE_ZCL_CID_TUNNELING 0x0704 #define ZBEE_ZCL_CID_PRE_PAYMENT 0x0705 +#define ZBEE_ZCL_CID_ENERGY_MANAGEMENT 0x0706 +#define ZBEE_ZCL_CID_CALENDAR 0x0707 +#define ZBEE_ZCL_CID_DEVICE_MANAGEMENT 0x0708 +#define ZBEE_ZCL_CID_EVENTS 0x0709 +#define ZBEE_ZCL_CID_MDU_PAIRING 0x070A + +/* ZCL Cluster IDs - Key Establishment */ +#define ZBEE_ZCL_CID_KE 0x0800 /* ZCL Cluster IDs - Home Automation */ #define ZBEE_ZCL_CID_APPLIANCE_IDENTIFICATION 0x0b00 @@ -257,7 +265,6 @@ typedef struct{ /* Fragmentation Fields. */ guint8 fragmentation; /* ZigBee 2007 and Later */ guint8 block_number; /* ZigBee 2007 and Later */ - guint8 ack_bitfield; /* ZigBee 2007 and Later */ /* Some helpers for the upper layers. */ gboolean profile_present; |