Wireshark-commits: [Wireshark-commits] master be177eb: Add support for ZigBee ZCL manufacturer spec
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 14 Mar 2018 05:37:10 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=be177eb84fee8462be0f7542c0db726301955f90
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

be177eb by Paul Zander (p.j.zander@xxxxxxxxxxxx):

    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@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  8f86a3b   .mailamp: update (of Q1 2018)
    adds  be177eb   Add support for ZigBee ZCL manufacturer specific attributes and commands.


Summary of changes:
 epan/dissectors/packet-zbee-nwk-gp.c      |   2 +-
 epan/dissectors/packet-zbee-zcl-general.c |   6 +-
 epan/dissectors/packet-zbee-zcl.c         | 139 ++++++++++++++++++------------
 epan/dissectors/packet-zbee-zcl.h         |  13 ++-
 epan/dissectors/packet-zbee.h             |   2 +
 5 files changed, 97 insertions(+), 65 deletions(-)