osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Adding following dissectors for HVAC clusters for Zigbee Protocol: 

1. Pump Configuration and Control
2. Fan Control
3. Dehumidification Control
4. Thermostat User Interface Configuration

Change-Id: I854f992a0c6e8a5714f308e97f30e7bc26fb73fc
Reviewed-on: https://code.wireshark.org/review/13102
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Aditya Jain 2016-01-07 12:02:00 +05:30 committed by Anders Broman
parent ce979903fd
commit e530a09a12
5 changed files with 1089 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docbook/release-notes.asciidoc
View File

@ -51,7 +51,7 @@ ISO14443
Extensible Control & Management Protocol (eCMP)
RTI TCP Transport Layer (RTITCP)
ITU-T G.7041/Y.1303 Generic Framing Procedure (GFP)
Zigbee Protocol Clusters Dissectors Added (Closures, Lighting, General, Measurement & Sensing)
Zigbee Protocol Clusters Dissectors Added (Closures, Lighting, General, Measurement & Sensing, HVAC)
LAT protocol (DECNET)
// Items in --sort-and-group-- blocks will be sorted and comma-separated.
--sort-and-group--

5
epan/CMakeLists.txt
View File

@ -1460,8 +1460,9 @@ set(DISSECTOR_SRC
dissectors/packet-zbee-nwk-gp.c
dissectors/packet-zbee-security.c
dissectors/packet-zbee-zcl.c
dissectors/packet-zbee-zcl-closures.c
dissectors/packet-zbee-zcl-lighting.c
dissectors/packet-zbee-zcl-closures.c
dissectors/packet-zbee-zcl-lighting.c
dissectors/packet-zbee-zcl-hvac.c
dissectors/packet-zbee-zcl-general.c
dissectors/packet-zbee-zcl-ha.c
dissectors/packet-zbee-zcl-meas-sensing.c

1
epan/dissectors/Makefile.common
View File

@ -1379,6 +1379,7 @@ DISSECTOR_SRC = \
packet-zbee-zcl.c \
packet-zbee-zcl-closures.c \
packet-zbee-zcl-lighting.c \
packet-zbee-zcl-hvac.c \
packet-zbee-zcl-general.c \
packet-zbee-zcl-ha.c \
packet-zbee-zcl-meas-sensing.c \

1080
epan/dissectors/packet-zbee-zcl-hvac.c Normal file
View File

File diff suppressed because it is too large Load Diff

4
epan/dissectors/packet-zbee.h
View File

@ -1127,7 +1127,11 @@
#define ZBEE_PROTOABBREV_ZCL_SCENES "zbee_zcl_general.scenes"
#define ZBEE_PROTOABBREV_ZCL_ALARMS "zbee_zcl_general.alarms"
#define ZBEE_PROTOABBREV_ZCL_TIME "zbee_zcl_general.time"
#define ZBEE_PROTOABBREV_ZCL_PUMP_CONFIG_CTRL "zbee_zcl_hvac.pump_config_ctrl"
#define ZBEE_PROTOABBREV_ZCL_THERMOSTAT "zbee_zcl_hvac.thermostat"
#define ZBEE_PROTOABBREV_ZCL_FAN_CONTROL "zbee_zcl_hvac.fan_ctrl"
#define ZBEE_PROTOABBREV_ZCL_DEHUMIDIFICATION_CONTROL "zbee_zcl_hvac.dehum_ctrl"
#define ZBEE_PROTOABBREV_ZCL_THERMOSTAT_UI_CONFIG "zbee_zcl_hvac.thermo_ui_config"
#define ZBEE_PROTOABBREV_ZCL_APPLEVTALT "zbee_zcl_ha.applevtalt"
#define ZBEE_PROTOABBREV_ZCL_APPLIDT "zbee_zcl_ha.applident"
#define ZBEE_PROTOABBREV_ZCL_APPLSTATS "zbee_zcl_ha.applstats"