osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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

svn path=/trunk/; revision=40133
This commit is contained in:
Alexis La Goutte 2011-12-09 17:00:28 +00:00
parent 9936838ce3
commit da4a280a50
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/dissectors/packet-zbee-zcl.c
View File

@ -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 }
};

31
epan/dissectors/packet-zbee-zcl.h
View File

@ -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