diff options
| author | Paul Zander <p.j.zander@lighting.com> | 2018-03-12 10:57:31 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-03-14 05:37:00 +0000 |
| commit | be177eb84fee8462be0f7542c0db726301955f90 (patch) | |
| tree | 09d0371add4390d7dd2caccaa79582cb75349ca1 /epan/dissectors/packet-zbee-zcl-general.c | |
| parent | 8f86a3b6cb5873bccd5c71ca2791146cde74313d (diff) | |
Add support for ZigBee ZCL manufacturer specific attributes and commands.
For each ZCL cluster there is the possibility to implement manufacturer specific attributes and commands.
This is done by setting a flag (Manufacturer specific = true/false) in the Frame Control Field of the ZCL frame.
If this flag is set then also the Manufacturer Code is added to the ZCL frame.
Example: Manufacturer Code = 0x100b = Philips.
So basically this means that the meaning of an attribute/command is dependent on the manufacturer code.
Currently the ZCL frame is parsed and the manufacturer code is also dissected and displayed correctly.
However, the dissection of manufacturer specific attributes and commands is not done properly.
Their is no distinction between a global attribute/command and a manufacturer specific attribute/command.
This results in the incorrect dissection of these manufacturer specific attributes/commands.
This patch fixes this issue.
The registration of a cluster is now done with a cluster Id AND the manufacturer specific code.
Change-Id: I5d4aeb5473fd56f2a570d2a1f83d1090d42423ab
Reviewed-on: https://code.wireshark.org/review/26440
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-zcl-general.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-general.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index 0ce251cc4f..808f2bed80 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -9078,7 +9078,7 @@ dissect_zcl_part_rdhandshakeparam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *offset += 2; /* Dissect the attribute id list */ - dissect_zcl_read_attr(tvb, pinfo, tree, offset, ZBEE_ZCL_CID_PARTITION); + dissect_zcl_read_attr(tvb, pinfo, tree, offset, ZBEE_ZCL_CID_PARTITION, ZBEE_MFG_CODE_NONE); } /*dissect_zcl_part_rdhandshakeparam*/ /*FUNCTION:------------------------------------------------------ @@ -9103,7 +9103,7 @@ dissect_zcl_part_wrhandshakeparam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *offset += 2; /* Dissect the attributes list */ - dissect_zcl_write_attr(tvb, pinfo, tree, offset, ZBEE_ZCL_CID_PARTITION); + dissect_zcl_write_attr(tvb, pinfo, tree, offset, ZBEE_ZCL_CID_PARTITION, ZBEE_MFG_CODE_NONE); } /*dissect_zcl_part_wrhandshakeparam*/ @@ -9202,7 +9202,7 @@ dissect_zcl_part_rdhandshakeparamrsp(tvbuff_t *tvb, packet_info *pinfo, proto_tr *offset += 2; /* Dissect the attributes list */ - dissect_zcl_read_attr_resp(tvb, pinfo, tree, offset, ZBEE_ZCL_CID_PARTITION); + dissect_zcl_read_attr_resp(tvb, pinfo, tree, offset, ZBEE_ZCL_CID_PARTITION, ZBEE_MFG_CODE_NONE); } /*dissect_zcl_part_rdhandshakeparamrsp*/ |