diff options
| author | alagoutte <alagoutte@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-12-09 17:00:28 +0000 |
|---|---|---|
| committer | alagoutte <alagoutte@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-12-09 17:00:28 +0000 |
| commit | 71b28a65df98a186a8441890a2abe3d2fcaf04c2 (patch) | |
| tree | 11be2fd545cf7e850306e9af77035cb63a01840f | |
| parent | d07c88dd892b980b40b7c61c18e1924bd7c9f3ca (diff) | |
From report of Arasch Honarbacht via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6649
ZigBee ZCL Dissector reports invalid status
The status code 0x8d contained in an attriute status record in a configure reporting response frame is incorrectly displayed as "Write only" (where WRITE_ONLY = 0x8f). According to the ZigBee Cluster Library Specification, Document 075123r03ZB, April 26, 2010 a status of 0x8d should display as "INVALID_DATA_TYPE"
From me :
Fix this issue (Wrong value define) based on Specs available in ZigBee.org
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40133 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl.h | 31 |
2 files changed, 17 insertions, 19 deletions
diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index 363197d775..e710428503 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -400,6 +400,8 @@ static const value_string zbee_zcl_status_names[] = { { ZBEE_ZCL_STAT_UNSUP_MFR_GENERAL_CMD, "Unsupported Manufacturer General Command"}, { ZBEE_ZCL_STAT_INVALID_FIELD, "Invalid Field"}, { ZBEE_ZCL_STAT_UNSUPPORTED_ATTR, "Unsupported Attribute"}, + { ZBEE_ZCL_STAT_INVALID_VALUE, "Invalid Value"}, + { ZBEE_ZCL_STAT_READ_ONLY, "Read Only"}, { ZBEE_ZCL_STAT_INSUFFICIENT_SPACE, "Insufficient Space"}, { ZBEE_ZCL_STAT_DUPLICATE_EXISTS, "Duplicate Exists"}, { ZBEE_ZCL_STAT_NOT_FOUND, "Not Found"}, @@ -411,10 +413,7 @@ static const value_string zbee_zcl_status_names[] = { { ZBEE_ZCL_STAT_DEFINED_OUT_OF_BAND, "Defined Out of Band"}, { ZBEE_ZCL_STAT_HARDWARE_FAILURE, "Hardware Failure"}, { ZBEE_ZCL_STAT_SOFTWARE_FAILURE, "Software Failure"}, - { ZBEE_ZCL_STAT_CALIBRATION_ERROR, "Calibration Error"}, - { ZBEE_ZCL_STAT_INVALID_VALUE, "Invalid Value"}, - { ZBEE_ZCL_STAT_READ_ONLY, "Read Only"}, { 0, NULL } }; diff --git a/epan/dissectors/packet-zbee-zcl.h b/epan/dissectors/packet-zbee-zcl.h index 55afdf7958..d1e1970379 100644 --- a/epan/dissectors/packet-zbee-zcl.h +++ b/epan/dissectors/packet-zbee-zcl.h @@ -3,7 +3,7 @@ * By Fred Fierling <fff@exegin.com> * Copyright 2009 Exegin Technologies Limited * - * $Id:$ + * $Id$ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -154,21 +154,20 @@ typedef struct{ #define ZBEE_ZCL_STAT_UNSUP_MFR_GENERAL_CMD 0x84 #define ZBEE_ZCL_STAT_INVALID_FIELD 0x85 #define ZBEE_ZCL_STAT_UNSUPPORTED_ATTR 0x86 -#define ZBEE_ZCL_STAT_INSUFFICIENT_SPACE 0x87 -#define ZBEE_ZCL_STAT_DUPLICATE_EXISTS 0x88 -#define ZBEE_ZCL_STAT_NOT_FOUND 0x89 -#define ZBEE_ZCL_STAT_UNREPORTABLE_ATTR 0x8a -#define ZBEE_ZCL_STAT_INVALID_DATA_TYPE 0x8b -#define ZBEE_ZCL_STAT_INVALID_SELECTOR 0x8c -#define ZBEE_ZCL_STAT_WRITE_ONLY 0x8d -#define ZBEE_ZCL_STAT_INCONSISTENT_STARTUP_STATE 0x8e -#define ZBEE_ZCL_STAT_DEFINED_OUT_OF_BAND 0x8f -#define ZBEE_ZCL_STAT_HARDWARE_FAILURE 0x90 -#define ZBEE_ZCL_STAT_SOFTWARE_FAILURE 0x91 - -#define ZBEE_ZCL_STAT_CALIBRATION_ERROR 0xc0 -#define ZBEE_ZCL_STAT_INVALID_VALUE 0xc1 -#define ZBEE_ZCL_STAT_READ_ONLY 0xc2 +#define ZBEE_ZCL_STAT_INVALID_VALUE 0x87 +#define ZBEE_ZCL_STAT_READ_ONLY 0x88 +#define ZBEE_ZCL_STAT_INSUFFICIENT_SPACE 0x89 +#define ZBEE_ZCL_STAT_DUPLICATE_EXISTS 0x8a +#define ZBEE_ZCL_STAT_NOT_FOUND 0x8b +#define ZBEE_ZCL_STAT_UNREPORTABLE_ATTR 0x8c +#define ZBEE_ZCL_STAT_INVALID_DATA_TYPE 0x8d +#define ZBEE_ZCL_STAT_INVALID_SELECTOR 0x8e +#define ZBEE_ZCL_STAT_WRITE_ONLY 0x8f +#define ZBEE_ZCL_STAT_INCONSISTENT_STARTUP_STATE 0x90 +#define ZBEE_ZCL_STAT_DEFINED_OUT_OF_BAND 0x91 +#define ZBEE_ZCL_STAT_HARDWARE_FAILURE 0xc0 +#define ZBEE_ZCL_STAT_SOFTWARE_FAILURE 0xc1 +#define ZBEE_ZCL_STAT_CALIBRATION_ERROR 0xc2 /* Misc. */ #define INT24_SIGN_BITS 0xffff8000 |