aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-zcl-ha.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-zbee-zcl-ha.c')
-rw-r--r--epan/dissectors/packet-zbee-zcl-ha.c24
1 files changed, 8 insertions, 16 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c
index 77cb2a91b7..22ffe30044 100644
--- a/epan/dissectors/packet-zbee-zcl-ha.c
+++ b/epan/dissectors/packet-zbee-zcl-ha.c
@@ -332,7 +332,8 @@ proto_register_zbee_zcl_appl_idt(void)
void
proto_reg_handoff_zbee_zcl_appl_idt(void)
{
- zbee_zcl_init_cluster( proto_zbee_zcl_appl_idt,
+ zbee_zcl_init_cluster( ZBEE_PROTOABBREV_ZCL_APPLIDT,
+ proto_zbee_zcl_appl_idt,
ett_zbee_zcl_appl_idt,
ZBEE_ZCL_CID_APPLIANCE_IDENTIFICATION,
hf_zbee_zcl_appl_idt_attr_id,
@@ -535,7 +536,8 @@ proto_register_zbee_zcl_met_idt(void)
void
proto_reg_handoff_zbee_zcl_met_idt(void)
{
- zbee_zcl_init_cluster( proto_zbee_zcl_met_idt,
+ zbee_zcl_init_cluster( ZBEE_PROTOABBREV_ZCL_METIDT,
+ proto_zbee_zcl_met_idt,
ett_zbee_zcl_met_idt,
ZBEE_ZCL_CID_METER_IDENTIFICATION,
hf_zbee_zcl_met_idt_attr_id,
@@ -908,13 +910,8 @@ proto_register_zbee_zcl_appl_evtalt(void)
void
proto_reg_handoff_zbee_zcl_appl_evtalt(void)
{
- dissector_handle_t appl_evtalt_handle;
-
- /* Register our dissector with the ZigBee application dissectors. */
- appl_evtalt_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_APPLEVTALT);
- dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_APPLIANCE_EVENTS_AND_ALERT, appl_evtalt_handle);
-
- zbee_zcl_init_cluster( proto_zbee_zcl_appl_evtalt,
+ zbee_zcl_init_cluster( ZBEE_PROTOABBREV_ZCL_APPLEVTALT,
+ proto_zbee_zcl_appl_evtalt,
ett_zbee_zcl_appl_evtalt,
ZBEE_ZCL_CID_APPLIANCE_EVENTS_AND_ALERT,
-1,
@@ -1266,13 +1263,8 @@ proto_register_zbee_zcl_appl_stats(void)
void
proto_reg_handoff_zbee_zcl_appl_stats(void)
{
- dissector_handle_t appl_stats_handle;
-
- /* Register our dissector with the ZigBee application dissectors. */
- appl_stats_handle = find_dissector(ZBEE_PROTOABBREV_ZCL_APPLSTATS);
- dissector_add_uint("zbee.zcl.cluster", ZBEE_ZCL_CID_APPLIANCE_STATISTICS, appl_stats_handle);
-
- zbee_zcl_init_cluster( proto_zbee_zcl_appl_stats,
+ zbee_zcl_init_cluster( ZBEE_PROTOABBREV_ZCL_APPLSTATS,
+ proto_zbee_zcl_appl_stats,
ett_zbee_zcl_appl_stats,
ZBEE_ZCL_CID_APPLIANCE_STATISTICS,
hf_zbee_zcl_appl_stats_attr_id,