diff options
| author | John Keeping <john@metanate.com> | 2017-08-12 16:23:27 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-08-13 01:31:32 +0000 |
| commit | e871a3ffb432095a92f11c11024b0e96e23b9f7c (patch) | |
| tree | 3b9e2be911da045b81c3d457ad4566ece733ee19 | |
| parent | aa2117a8f250b4b0ca08b133d847aa6768a3ce5a (diff) | |
ZigBee ZCL IAS: decode IAS Zone Enroll Request
Add missing decoding for the Enroll Request command in the IAS Zone
cluster.
Change-Id: I8dc0875912c87601f610173014879e13cad0820c
Reviewed-on: https://code.wireshark.org/review/23050
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-misc.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-misc.c b/epan/dissectors/packet-zbee-zcl-misc.c index 1baa8cbfde..934d81fa23 100644 --- a/epan/dissectors/packet-zbee-zcl-misc.c +++ b/epan/dissectors/packet-zbee-zcl-misc.c @@ -704,6 +704,7 @@ static int hf_zbee_zcl_ias_zone_type = -1; static int hf_zbee_zcl_ias_zone_status = -1; static int hf_zbee_zcl_ias_zone_delay = -1; static int hf_zbee_zcl_ias_zone_ext_status = -1; +static int hf_zbee_zcl_ias_zone_manufacturer_code = -1; static int hf_zbee_zcl_ias_zone_status_ac_mains = -1; static int hf_zbee_zcl_ias_zone_status_alarm1 = -1; static int hf_zbee_zcl_ias_zone_status_alarm2 = -1; @@ -859,8 +860,16 @@ dissect_zbee_zcl_ias_zone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v offset += 1; proto_tree_add_item(tree, hf_zbee_zcl_ias_zone_delay, tvb, offset, 2, ENC_LITTLE_ENDIAN); + break; case ZBEE_ZCL_CMD_ID_IAS_ZONE_ENROLL_REQUEST: + proto_tree_add_item(tree, hf_zbee_zcl_ias_zone_type, tvb, offset, 2, + ENC_LITTLE_ENDIAN); + offset += 2; + proto_tree_add_item(tree, hf_zbee_zcl_ias_zone_manufacturer_code, + tvb, offset, 2, ENC_LITTLE_ENDIAN); + break; + default: break; } /* switch */ @@ -963,6 +972,10 @@ proto_register_zbee_zcl_ias_zone(void) { &hf_zbee_zcl_ias_zone_type, { "ZoneType", "zbee_zcl_ias.zone.type", FT_UINT16, BASE_HEX, VALS(zbee_ias_type_names), 0x0, NULL, HFILL }}, + { &hf_zbee_zcl_ias_zone_manufacturer_code, + { "ManufacturerCode", "zbee_zcl_ias.zone.manufacturer_code", FT_UINT16, BASE_HEX, VALS(zbee_mfr_code_names), + 0x0, NULL, HFILL } }, + { &hf_zbee_zcl_ias_zone_status, { "ZoneStatus", "zbee_zcl_ias.zone.status", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, |