diff options
| author | Julien STAUB <atsju2@yahoo.fr> | 2015-04-14 19:30:18 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-04-15 06:07:48 +0000 |
| commit | 92371746f02ce6194eb743793f799c42f5576cbd (patch) | |
| tree | af350d04e3291665eda13452f348aba27bd0d805 /epan/dissectors/packet-zbee-zcl.h | |
| parent | 6a413491321c98a71834473c8ea10dcd47bf8bbb (diff) | |
ZigBee: fix IS_ANALOG_SUBTYPE macro
Modify IS_ANALOG_SUBTYPE macro according to 07-5123-04 zigbee cluster
library specification. It wasn't filtering out the 8-bit enums ans 16
bit enum (digital types).
Bug: 11120
Change-Id: I74f1c0e6671b33fa69e5045cfc283ada3a39d380
Reviewed-on: https://code.wireshark.org/review/8069
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-zcl.h')
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-zbee-zcl.h b/epan/dissectors/packet-zbee-zcl.h index 4672457b63..16ba6bf7a2 100644 --- a/epan/dissectors/packet-zbee-zcl.h +++ b/epan/dissectors/packet-zbee-zcl.h @@ -141,7 +141,7 @@ typedef struct{ #define ZBEE_ZCL_DIR_RECEIVED 1 /* seconds elapsed from year 1970 to 2000 */ #define ZBEE_ZCL_NSTIME_UTC_OFFSET (((3*365 + 366)*7 + 2*365)*24*3600) -#define IS_ANALOG_SUBTYPE(x) ( (x & 0xe0) == 0x20 || (x & 0xe0) == 0xe0 ) +#define IS_ANALOG_SUBTYPE(x) ( (x & 0xF0) == 0x20 || (x & 0xF8) == 0x38 || (x & 0xF8) == 0xE0 ) /* ZCL Status Enumerations */ #define ZBEE_ZCL_STAT_SUCCESS 0x00 |