aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorPaul Zander <p.j.zander@lighting.com>2018-03-12 11:15:18 +0100
committerAnders Broman <a.broman58@gmail.com>2018-03-14 06:16:18 +0000
commita7ef22d24725a7dbbc0a4cecc57ffa2dc0bf4aef (patch)
tree420cdcfeed9984cae7709540a545cb6949b99cd0 /epan/dissectors
parentbe177eb84fee8462be0f7542c0db726301955f90 (diff)
Register the ZigBee ZCL cluster with a manufacturer specific code.
Change-Id: I3ac949ba6d6cd0cd61d0a8bb59f568d6a33998c7 Reviewed-on: https://code.wireshark.org/review/26441 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')
-rw-r--r--epan/dissectors/packet-zbee-zcl-closures.c2
-rw-r--r--epan/dissectors/packet-zbee-zcl-general.c29
-rw-r--r--epan/dissectors/packet-zbee-zcl-ha.c4
-rw-r--r--epan/dissectors/packet-zbee-zcl-hvac.c4
-rw-r--r--epan/dissectors/packet-zbee-zcl-lighting.c2
-rw-r--r--epan/dissectors/packet-zbee-zcl-meas-sensing.c7
-rw-r--r--epan/dissectors/packet-zbee-zcl-misc.c2
-rw-r--r--epan/dissectors/packet-zbee-zcl-sas.c2
-rw-r--r--epan/dissectors/packet-zbee-zcl-se.c14
-rw-r--r--epan/dissectors/packet-zbee-zcl.c6
-rw-r--r--epan/dissectors/packet-zbee-zcl.h2
11 files changed, 70 insertions, 4 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-closures.c b/epan/dissectors/packet-zbee-zcl-closures.c
index f5db9e29c4..e1e8954fe1 100644
--- a/epan/dissectors/packet-zbee-zcl-closures.c
+++ b/epan/dissectors/packet-zbee-zcl-closures.c
@@ -233,6 +233,7 @@ proto_reg_handoff_zbee_zcl_shade_configuration(void)
proto_zbee_zcl_shade_configuration,
ett_zbee_zcl_shade_configuration,
ZBEE_ZCL_CID_SHADE_CONFIG,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_shade_configuration_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_shade_configuration_attr_data
@@ -568,6 +569,7 @@ proto_reg_handoff_zbee_zcl_door_lock(void)
proto_zbee_zcl_door_lock,
ett_zbee_zcl_door_lock,
ZBEE_ZCL_CID_DOOR_LOCK,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_door_lock_attr_id,
hf_zbee_zcl_door_lock_srv_rx_cmd_id,
hf_zbee_zcl_door_lock_srv_tx_cmd_id,
diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c
index 808f2bed80..d4bc0bf8cb 100644
--- a/epan/dissectors/packet-zbee-zcl-general.c
+++ b/epan/dissectors/packet-zbee-zcl-general.c
@@ -399,6 +399,7 @@ proto_reg_handoff_zbee_zcl_basic(void)
proto_zbee_zcl_basic,
ett_zbee_zcl_basic,
ZBEE_ZCL_CID_BASIC,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_basic_attr_id,
hf_zbee_zcl_basic_srv_rx_cmd_id,
-1,
@@ -869,6 +870,7 @@ proto_reg_handoff_zbee_zcl_power_config(void)
proto_zbee_zcl_power_config,
ett_zbee_zcl_power_config,
ZBEE_ZCL_CID_POWER_CONFIG,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_power_config_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_power_config_attr_data
@@ -1095,6 +1097,7 @@ proto_reg_handoff_zbee_zcl_device_temperature_configuration(void)
proto_zbee_zcl_device_temperature_configuration,
ett_zbee_zcl_device_temperature_configuration,
ZBEE_ZCL_CID_DEVICE_TEMP_CONFIG,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_device_temperature_configuration_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_device_temperature_configuration_attr_data
@@ -1472,6 +1475,7 @@ proto_reg_handoff_zbee_zcl_identify(void)
proto_zbee_zcl_identify,
ett_zbee_zcl_identify,
ZBEE_ZCL_CID_IDENTIFY,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_identify_attr_id,
hf_zbee_zcl_identify_srv_rx_cmd_id,
hf_zbee_zcl_identify_srv_tx_cmd_id,
@@ -2069,6 +2073,7 @@ proto_reg_handoff_zbee_zcl_groups(void)
proto_zbee_zcl_groups,
ett_zbee_zcl_groups,
ZBEE_ZCL_CID_GROUPS,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_groups_attr_id,
hf_zbee_zcl_groups_srv_rx_cmd_id,
hf_zbee_zcl_groups_srv_tx_cmd_id,
@@ -2902,6 +2907,7 @@ proto_reg_handoff_zbee_zcl_scenes(void)
proto_zbee_zcl_scenes,
ett_zbee_zcl_scenes,
ZBEE_ZCL_CID_SCENES,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_scenes_attr_id,
hf_zbee_zcl_scenes_srv_rx_cmd_id,
hf_zbee_zcl_scenes_srv_tx_cmd_id,
@@ -3275,6 +3281,7 @@ proto_reg_handoff_zbee_zcl_on_off(void)
proto_zbee_zcl_on_off,
ett_zbee_zcl_on_off,
ZBEE_ZCL_CID_ON_OFF,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_on_off_attr_id,
hf_zbee_zcl_on_off_srv_rx_cmd_id,
-1,
@@ -3471,6 +3478,7 @@ proto_reg_handoff_zbee_zcl_on_off_switch_configuration(void)
proto_zbee_zcl_on_off_switch_configuration,
ett_zbee_zcl_on_off_switch_configuration,
ZBEE_ZCL_CID_ON_OFF_SWITCH_CONFIG,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_on_off_switch_configuration_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_on_off_switch_configuration_attr_data
@@ -3825,6 +3833,7 @@ proto_reg_handoff_zbee_zcl_alarms(void)
proto_zbee_zcl_alarms,
ett_zbee_zcl_alarms,
ZBEE_ZCL_CID_ALARMS,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_alarms_attr_id,
hf_zbee_zcl_alarms_srv_rx_cmd_id,
hf_zbee_zcl_alarms_srv_tx_cmd_id,
@@ -4058,6 +4067,7 @@ proto_reg_handoff_zbee_zcl_time(void)
proto_zbee_zcl_time,
ett_zbee_zcl_time,
ZBEE_ZCL_CID_TIME,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_time_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_time_attr_data
@@ -4466,6 +4476,7 @@ proto_reg_handoff_zbee_zcl_level_control(void)
proto_zbee_zcl_level_control,
ett_zbee_zcl_level_control,
ZBEE_ZCL_CID_LEVEL_CONTROL,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_level_control_attr_id,
hf_zbee_zcl_level_control_srv_rx_cmd_id,
-1,
@@ -5670,6 +5681,7 @@ proto_reg_handoff_zbee_zcl_rssi_location(void)
proto_zbee_zcl_rssi_location,
ett_zbee_zcl_rssi_location,
ZBEE_ZCL_CID_RSSI_LOCATION,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_rssi_location_attr_id,
hf_zbee_zcl_rssi_location_srv_rx_cmd_id,
hf_zbee_zcl_rssi_location_srv_tx_cmd_id,
@@ -5955,6 +5967,7 @@ proto_reg_handoff_zbee_zcl_analog_input_basic(void)
proto_zbee_zcl_analog_input_basic,
ett_zbee_zcl_analog_input_basic,
ZBEE_ZCL_CID_ANALOG_INPUT_BASIC,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_analog_input_basic_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_analog_input_basic_attr_data
@@ -6244,6 +6257,7 @@ proto_reg_handoff_zbee_zcl_analog_output_basic(void)
proto_zbee_zcl_analog_output_basic,
ett_zbee_zcl_analog_output_basic,
ZBEE_ZCL_CID_ANALOG_OUTPUT_BASIC,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_analog_output_basic_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_analog_output_basic_attr_data
@@ -6522,6 +6536,7 @@ proto_reg_handoff_zbee_zcl_analog_value_basic(void)
proto_zbee_zcl_analog_value_basic,
ett_zbee_zcl_analog_value_basic,
ZBEE_ZCL_CID_ANALOG_VALUE_BASIC,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_analog_value_basic_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_analog_value_basic_attr_data
@@ -6773,6 +6788,7 @@ proto_reg_handoff_zbee_zcl_binary_input_basic(void)
proto_zbee_zcl_binary_input_basic,
ett_zbee_zcl_binary_input_basic,
ZBEE_ZCL_CID_BINARY_INPUT_BASIC,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_binary_input_basic_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_binary_input_basic_attr_data
@@ -7077,6 +7093,7 @@ proto_reg_handoff_zbee_zcl_binary_output_basic(void)
proto_zbee_zcl_binary_output_basic,
ett_zbee_zcl_binary_output_basic,
ZBEE_ZCL_CID_BINARY_OUTPUT_BASIC,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_binary_output_basic_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_binary_output_basic_attr_data
@@ -7363,6 +7380,7 @@ proto_reg_handoff_zbee_zcl_binary_value_basic(void)
proto_zbee_zcl_binary_value_basic,
ett_zbee_zcl_binary_value_basic,
ZBEE_ZCL_CID_BINARY_VALUE_BASIC,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_binary_value_basic_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_binary_value_basic_attr_data
@@ -7596,6 +7614,7 @@ proto_reg_handoff_zbee_zcl_multistate_input_basic(void)
proto_zbee_zcl_multistate_input_basic,
ett_zbee_zcl_multistate_input_basic,
ZBEE_ZCL_CID_MULTISTATE_INPUT_BASIC,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_multistate_input_basic_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_multistate_input_basic_attr_data
@@ -7884,6 +7903,7 @@ proto_reg_handoff_zbee_zcl_multistate_output_basic(void)
proto_zbee_zcl_multistate_output_basic,
ett_zbee_zcl_multistate_output_basic,
ZBEE_ZCL_CID_MULTISTATE_OUTPUT_BASIC,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_multistate_output_basic_attr_id,
-1,-1,
(zbee_zcl_fn_attr_data)dissect_zcl_multistate_output_basic_attr_data
@@ -8173,6 +8193,7 @@ proto_reg_handoff_zbee_zcl_multistate_value_basic(void)
proto_zbee_zcl_multistate_value_basic,
ett_zbee_zcl_multistate_value_basic,
ZBEE_ZCL_CID_MULTISTATE_VALUE_BASIC,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_multistate_value_basic_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_multistate_value_basic_attr_data
@@ -8771,6 +8792,7 @@ proto_reg_handoff_zbee_zcl_commissioning(void)
proto_zbee_zcl_commissioning,
ett_zbee_zcl_commissioning,
ZBEE_ZCL_CID_COMMISSIONING,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_commissioning_attr_id,
hf_zbee_zcl_commissioning_srv_rx_cmd_id,
hf_zbee_zcl_commissioning_srv_tx_cmd_id,
@@ -9335,6 +9357,7 @@ void proto_reg_handoff_zbee_zcl_part(void)
proto_zbee_zcl_part,
ett_zbee_zcl_part,
ZBEE_ZCL_CID_PARTITION,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_part_attr_id,
hf_zbee_zcl_part_srv_rx_cmd_id,
hf_zbee_zcl_part_srv_tx_cmd_id,
@@ -10526,6 +10549,7 @@ void proto_reg_handoff_zbee_zcl_ota(void)
proto_zbee_zcl_ota,
ett_zbee_zcl_ota,
ZBEE_ZCL_CID_OTA_UPGRADE,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_ota_attr_id,
hf_zbee_zcl_ota_srv_rx_cmd_id,
hf_zbee_zcl_ota_srv_tx_cmd_id,
@@ -11664,6 +11688,7 @@ proto_reg_handoff_zbee_zcl_pwr_prof(void)
proto_zbee_zcl_pwr_prof,
ett_zbee_zcl_pwr_prof,
ZBEE_ZCL_CID_POWER_PROFILE,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_pwr_prof_attr_id,
hf_zbee_zcl_pwr_prof_srv_rx_cmd_id,
hf_zbee_zcl_pwr_prof_srv_tx_cmd_id,
@@ -12334,6 +12359,7 @@ proto_reg_handoff_zbee_zcl_appl_ctrl(void)
proto_zbee_zcl_appl_ctrl,
ett_zbee_zcl_appl_ctrl,
ZBEE_ZCL_CID_APPLIANCE_CONTROL,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_appl_ctrl_attr_id,
hf_zbee_zcl_appl_ctrl_srv_rx_cmd_id,
hf_zbee_zcl_appl_ctrl_srv_tx_cmd_id,
@@ -12598,6 +12624,7 @@ proto_reg_handoff_zbee_zcl_poll_ctrl(void)
proto_zbee_zcl_poll_ctrl,
ett_zbee_zcl_poll_ctrl,
ZBEE_ZCL_CID_POLL_CONTROL,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_poll_ctrl_attr_id,
hf_zbee_zcl_poll_ctrl_srv_rx_cmd_id,
hf_zbee_zcl_poll_ctrl_srv_tx_cmd_id,
@@ -15352,6 +15379,7 @@ proto_reg_handoff_zbee_zcl_gp(void)
proto_zbee_zcl_gp,
ett_zbee_zcl_gp,
ZBEE_ZCL_CID_GP,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_gp_attr_id,
hf_zbee_zcl_gp_srv_rx_cmd_id,
hf_zbee_zcl_gp_srv_tx_cmd_id,
@@ -16160,6 +16188,7 @@ proto_reg_handoff_zbee_zcl_touchlink(void)
proto_zbee_zcl_touchlink,
ett_zbee_zcl_touchlink,
ZBEE_ZCL_CID_ZLL,
+ ZBEE_MFG_CODE_NONE,
-1,
hf_zbee_zcl_touchlink_rx_cmd_id, hf_zbee_zcl_touchlink_tx_cmd_id,
NULL
diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c
index 22ffe30044..df7b06d763 100644
--- a/epan/dissectors/packet-zbee-zcl-ha.c
+++ b/epan/dissectors/packet-zbee-zcl-ha.c
@@ -336,6 +336,7 @@ proto_reg_handoff_zbee_zcl_appl_idt(void)
proto_zbee_zcl_appl_idt,
ett_zbee_zcl_appl_idt,
ZBEE_ZCL_CID_APPLIANCE_IDENTIFICATION,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_appl_idt_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_appl_idt_attr_data
@@ -540,6 +541,7 @@ proto_reg_handoff_zbee_zcl_met_idt(void)
proto_zbee_zcl_met_idt,
ett_zbee_zcl_met_idt,
ZBEE_ZCL_CID_METER_IDENTIFICATION,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_met_idt_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_met_idt_attr_data
@@ -914,6 +916,7 @@ proto_reg_handoff_zbee_zcl_appl_evtalt(void)
proto_zbee_zcl_appl_evtalt,
ett_zbee_zcl_appl_evtalt,
ZBEE_ZCL_CID_APPLIANCE_EVENTS_AND_ALERT,
+ ZBEE_MFG_CODE_NONE,
-1,
hf_zbee_zcl_appl_evtalt_srv_rx_cmd_id,
hf_zbee_zcl_appl_evtalt_srv_tx_cmd_id,
@@ -1267,6 +1270,7 @@ proto_reg_handoff_zbee_zcl_appl_stats(void)
proto_zbee_zcl_appl_stats,
ett_zbee_zcl_appl_stats,
ZBEE_ZCL_CID_APPLIANCE_STATISTICS,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_appl_stats_attr_id,
hf_zbee_zcl_appl_stats_srv_rx_cmd_id,
hf_zbee_zcl_appl_stats_srv_tx_cmd_id,
diff --git a/epan/dissectors/packet-zbee-zcl-hvac.c b/epan/dissectors/packet-zbee-zcl-hvac.c
index 3f2716150a..84dce46474 100644
--- a/epan/dissectors/packet-zbee-zcl-hvac.c
+++ b/epan/dissectors/packet-zbee-zcl-hvac.c
@@ -474,6 +474,7 @@ proto_reg_handoff_zbee_zcl_pump_config_control(void)
proto_zbee_zcl_pump_config_control,
ett_zbee_zcl_pump_config_control,
ZBEE_ZCL_CID_PUMP_CONFIG_CONTROL,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_pump_config_control_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_pump_config_control_attr_data
@@ -653,6 +654,7 @@ proto_reg_handoff_zbee_zcl_fan_control(void)
proto_zbee_zcl_fan_control,
ett_zbee_zcl_fan_control,
ZBEE_ZCL_CID_FAN_CONTROL,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_fan_control_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_fan_control_attr_data
@@ -858,6 +860,7 @@ proto_reg_handoff_zbee_zcl_dehumidification_control(void)
proto_zbee_zcl_dehumidification_control,
ett_zbee_zcl_dehumidification_control,
ZBEE_ZCL_CID_DEHUMIDIFICATION_CONTROL,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_dehumidification_control_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_dehumidification_control_attr_data
@@ -1032,6 +1035,7 @@ proto_reg_handoff_zbee_zcl_thermostat_ui_config(void)
proto_zbee_zcl_thermostat_ui_config,
ett_zbee_zcl_thermostat_ui_config,
ZBEE_ZCL_CID_THERMOSTAT_UI_CONFIG,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_thermostat_ui_config_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_thermostat_ui_config_attr_data
diff --git a/epan/dissectors/packet-zbee-zcl-lighting.c b/epan/dissectors/packet-zbee-zcl-lighting.c
index 28ecde1690..caf63b437d 100644
--- a/epan/dissectors/packet-zbee-zcl-lighting.c
+++ b/epan/dissectors/packet-zbee-zcl-lighting.c
@@ -738,6 +738,7 @@ proto_reg_handoff_zbee_zcl_color_control(void)
proto_zbee_zcl_color_control,
ett_zbee_zcl_color_control,
ZBEE_ZCL_CID_COLOR_CONTROL,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_color_control_attr_id,
hf_zbee_zcl_color_control_srv_rx_cmd_id,
-1,
@@ -994,6 +995,7 @@ proto_reg_handoff_zbee_zcl_ballast_configuration(void)
proto_zbee_zcl_ballast_configuration,
ett_zbee_zcl_ballast_configuration,
ZBEE_ZCL_CID_BALLAST_CONFIG,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_ballast_configuration_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_ballast_configuration_attr_data
diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c
index 100807bdbd..937139998d 100644
--- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c
+++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c
@@ -302,6 +302,7 @@ proto_reg_handoff_zbee_zcl_illum_meas(void)
proto_zbee_zcl_illum_meas,
ett_zbee_zcl_illum_meas,
ZBEE_ZCL_CID_ILLUMINANCE_MEASUREMENT,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_illum_meas_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_illum_meas_attr_data
@@ -508,6 +509,7 @@ proto_reg_handoff_zbee_zcl_illum_level_sen(void)
proto_zbee_zcl_illum_level_sen,
ett_zbee_zcl_illum_level_sen,
ZBEE_ZCL_CID_ILLUMINANCE_LEVEL_SENSING,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_illum_level_sen_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_illum_level_sen_attr_data
@@ -767,6 +769,7 @@ proto_reg_handoff_zbee_zcl_temp_meas(void)
proto_zbee_zcl_temp_meas,
ett_zbee_zcl_temp_meas,
ZBEE_ZCL_CID_TEMPERATURE_MEASUREMENT,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_temp_meas_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_temp_meas_attr_data
@@ -1088,6 +1091,7 @@ proto_reg_handoff_zbee_zcl_press_meas(void)
proto_zbee_zcl_press_meas,
ett_zbee_zcl_press_meas,
ZBEE_ZCL_CID_PRESSURE_MEASUREMENT,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_press_meas_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_press_meas_attr_data
@@ -1350,6 +1354,7 @@ proto_reg_handoff_zbee_zcl_flow_meas(void)
proto_zbee_zcl_flow_meas,
ett_zbee_zcl_flow_meas,
ZBEE_ZCL_CID_FLOW_MEASUREMENT,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_flow_meas_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_flow_meas_attr_data
@@ -1607,6 +1612,7 @@ proto_reg_handoff_zbee_zcl_relhum_meas(void)
proto_zbee_zcl_relhum_meas,
ett_zbee_zcl_relhum_meas,
ZBEE_ZCL_CID_REL_HUMIDITY_MEASUREMENT,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_relhum_meas_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_relhum_meas_attr_data
@@ -1807,6 +1813,7 @@ proto_reg_handoff_zbee_zcl_occ_sen(void)
proto_zbee_zcl_occ_sen,
ett_zbee_zcl_occ_sen,
ZBEE_ZCL_CID_OCCUPANCY_SENSING,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_occ_sen_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_occ_sen_attr_data
diff --git a/epan/dissectors/packet-zbee-zcl-misc.c b/epan/dissectors/packet-zbee-zcl-misc.c
index 2e277f130f..0a5087b9d3 100644
--- a/epan/dissectors/packet-zbee-zcl-misc.c
+++ b/epan/dissectors/packet-zbee-zcl-misc.c
@@ -569,6 +569,7 @@ proto_reg_handoff_zbee_zcl_thermostat(void)
proto_zbee_zcl_thermostat,
ett_zbee_zcl_thermostat,
ZBEE_ZCL_CID_THERMOSTAT,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_thermostat_attr_id,
hf_zbee_zcl_thermostat_srv_rx_cmd_id,
hf_zbee_zcl_thermostat_srv_tx_cmd_id,
@@ -908,6 +909,7 @@ proto_reg_handoff_zbee_zcl_ias_zone(void)
proto_zbee_zcl_ias_zone,
ett_zbee_zcl_ias_zone,
ZBEE_ZCL_CID_IAS_ZONE,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_ias_zone_attr_id,
hf_zbee_zcl_ias_zone_srv_rx_cmd_id,
hf_zbee_zcl_ias_zone_srv_tx_cmd_id,
diff --git a/epan/dissectors/packet-zbee-zcl-sas.c b/epan/dissectors/packet-zbee-zcl-sas.c
index d195caa0b3..c38e1eef8e 100644
--- a/epan/dissectors/packet-zbee-zcl-sas.c
+++ b/epan/dissectors/packet-zbee-zcl-sas.c
@@ -431,6 +431,7 @@ proto_reg_handoff_zbee_zcl_ias_ace(void)
proto_zbee_zcl_ias_ace,
ett_zbee_zcl_ias_ace,
ZBEE_ZCL_CID_IAS_ACE,
+ ZBEE_MFG_CODE_NONE,
-1,
hf_zbee_zcl_ias_ace_srv_rx_cmd_id,
hf_zbee_zcl_ias_ace_srv_tx_cmd_id,
@@ -745,6 +746,7 @@ proto_reg_handoff_zbee_zcl_ias_wd(void)
proto_zbee_zcl_ias_wd,
ett_zbee_zcl_ias_wd,
ZBEE_ZCL_CID_IAS_WD,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_ias_wd_attr_id,
hf_zbee_zcl_ias_wd_srv_rx_cmd_id,
-1,
diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c
index a0f3eacd7d..00c0fdc8df 100644
--- a/epan/dissectors/packet-zbee-zcl-se.c
+++ b/epan/dissectors/packet-zbee-zcl-se.c
@@ -226,6 +226,7 @@ proto_reg_handoff_zbee_zcl_keep_alive(void)
proto_zbee_zcl_keep_alive,
ett_zbee_zcl_keep_alive,
ZBEE_ZCL_CID_KEEP_ALIVE,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_keep_alive_attr_id,
-1, -1,
(zbee_zcl_fn_attr_data)dissect_zcl_keep_alive_attr_data
@@ -3545,6 +3546,7 @@ proto_reg_handoff_zbee_zcl_price(void)
proto_zbee_zcl_price,
ett_zbee_zcl_price,
ZBEE_ZCL_CID_PRICE,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_price_attr_id,
hf_zbee_zcl_price_srv_rx_cmd_id,
hf_zbee_zcl_price_srv_tx_cmd_id,
@@ -3781,6 +3783,7 @@ proto_reg_handoff_zbee_zcl_drlc(void)
proto_zbee_zcl_drlc,
ett_zbee_zcl_drlc,
ZBEE_ZCL_CID_DEMAND_RESPONSE_LOAD_CONTROL,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_drlc_attr_id,
hf_zbee_zcl_drlc_srv_rx_cmd_id,
hf_zbee_zcl_drlc_srv_tx_cmd_id,
@@ -5927,6 +5930,7 @@ proto_reg_handoff_zbee_zcl_met(void)
proto_zbee_zcl_met,
ett_zbee_zcl_met,
ZBEE_ZCL_CID_SIMPLE_METERING,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_met_attr_id,
hf_zbee_zcl_met_srv_rx_cmd_id,
hf_zbee_zcl_met_srv_tx_cmd_id,
@@ -6542,6 +6546,7 @@ proto_reg_handoff_zbee_zcl_msg(void)
proto_zbee_zcl_msg,
ett_zbee_zcl_msg,
ZBEE_ZCL_CID_MESSAGE,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_msg_attr_id,
hf_zbee_zcl_msg_srv_rx_cmd_id,
hf_zbee_zcl_msg_srv_tx_cmd_id,
@@ -7129,6 +7134,7 @@ proto_reg_handoff_zbee_zcl_tun(void)
proto_zbee_zcl_tun,
ett_zbee_zcl_tun,
ZBEE_ZCL_CID_TUNNELING,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_tun_attr_id,
hf_zbee_zcl_tun_srv_rx_cmd_id,
hf_zbee_zcl_tun_srv_tx_cmd_id,
@@ -8526,6 +8532,7 @@ proto_reg_handoff_zbee_zcl_pp(void)
proto_zbee_zcl_pp,
ett_zbee_zcl_pp,
ZBEE_ZCL_CID_PRE_PAYMENT,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_pp_attr_id,
hf_zbee_zcl_pp_srv_rx_cmd_id,
hf_zbee_zcl_pp_srv_tx_cmd_id,
@@ -8750,6 +8757,7 @@ proto_reg_handoff_zbee_zcl_energy_management(void)
proto_zbee_zcl_energy_management,
ett_zbee_zcl_energy_management,
ZBEE_ZCL_CID_ENERGY_MANAGEMENT,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_energy_management_attr_id,
hf_zbee_zcl_energy_management_srv_rx_cmd_id,
hf_zbee_zcl_energy_management_srv_tx_cmd_id,
@@ -9721,6 +9729,7 @@ proto_reg_handoff_zbee_zcl_calendar(void)
proto_zbee_zcl_calendar,
ett_zbee_zcl_calendar,
ZBEE_ZCL_CID_CALENDAR,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_calendar_attr_id,
hf_zbee_zcl_calendar_srv_rx_cmd_id,
hf_zbee_zcl_calendar_srv_tx_cmd_id,
@@ -10016,6 +10025,7 @@ proto_reg_handoff_zbee_zcl_device_management(void)
proto_zbee_zcl_device_management,
ett_zbee_zcl_device_management,
ZBEE_ZCL_CID_DEVICE_MANAGEMENT,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_device_management_attr_id,
hf_zbee_zcl_device_management_srv_rx_cmd_id,
hf_zbee_zcl_device_management_srv_tx_cmd_id,
@@ -10543,6 +10553,7 @@ proto_reg_handoff_zbee_zcl_events(void)
proto_zbee_zcl_events,
ett_zbee_zcl_events,
ZBEE_ZCL_CID_EVENTS,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_events_attr_id,
hf_zbee_zcl_events_srv_rx_cmd_id,
hf_zbee_zcl_events_srv_tx_cmd_id,
@@ -10855,6 +10866,7 @@ proto_reg_handoff_zbee_zcl_mdu_pairing(void)
proto_zbee_zcl_mdu_pairing,
ett_zbee_zcl_mdu_pairing,
ZBEE_ZCL_CID_MDU_PAIRING,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_mdu_pairing_attr_id,
hf_zbee_zcl_mdu_pairing_srv_rx_cmd_id,
hf_zbee_zcl_mdu_pairing_srv_tx_cmd_id,
@@ -11108,6 +11120,7 @@ proto_reg_handoff_zbee_zcl_sub_ghz(void)
proto_zbee_zcl_sub_ghz,
ett_zbee_zcl_sub_ghz,
ZBEE_ZCL_CID_SUB_GHZ,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_sub_ghz_attr_id,
hf_zbee_zcl_sub_ghz_srv_rx_cmd_id,
hf_zbee_zcl_sub_ghz_srv_tx_cmd_id,
@@ -11674,6 +11687,7 @@ proto_reg_handoff_zbee_zcl_ke(void)
proto_zbee_zcl_ke,
ett_zbee_zcl_ke,
ZBEE_ZCL_CID_KE,
+ ZBEE_MFG_CODE_NONE,
hf_zbee_zcl_ke_attr_id,
hf_zbee_zcl_ke_srv_rx_cmd_id,
hf_zbee_zcl_ke_srv_tx_cmd_id,
diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c
index 8131e5a51f..e7b91bdc06 100644
--- a/epan/dissectors/packet-zbee-zcl.c
+++ b/epan/dissectors/packet-zbee-zcl.c
@@ -2345,14 +2345,14 @@ void proto_reg_handoff_zbee_zcl(void)
*@param fn_attr_data specific cluster attribute data decode function
*/
void
-zbee_zcl_init_cluster(const char *proto_abbrev, int proto, gint ett, guint16 cluster_id, int hf_attr_id, int hf_cmd_rx_id, int hf_cmd_tx_id, zbee_zcl_fn_attr_data fn_attr_data)
+zbee_zcl_init_cluster(const char *proto_abbrev, int proto, gint ett, guint16 cluster_id, guint16 mfr_code, int hf_attr_id, int hf_cmd_rx_id, int hf_cmd_tx_id, zbee_zcl_fn_attr_data fn_attr_data)
{
zbee_zcl_cluster_desc *cluster_desc;
dissector_handle_t dissector_handle;
/* Register the dissector with the ZigBee application dissectors. */
dissector_handle = find_dissector(proto_abbrev);
- dissector_add_uint("zbee.zcl.cluster", ZCL_CLUSTER_MFR_KEY(cluster_id, ZBEE_MFG_CODE_NONE), dissector_handle);
+ dissector_add_uint("zbee.zcl.cluster", ZCL_CLUSTER_MFR_KEY(cluster_id, mfr_code), dissector_handle);
/* Allocate a cluster descriptor */
cluster_desc = g_new(zbee_zcl_cluster_desc, 1);
@@ -2363,7 +2363,7 @@ zbee_zcl_init_cluster(const char *proto_abbrev, int proto, gint ett, guint16 clu
cluster_desc->name = proto_get_protocol_short_name(cluster_desc->proto);
cluster_desc->ett = ett;
cluster_desc->cluster_id = cluster_id;
- cluster_desc->mfr_code = ZBEE_MFG_CODE_NONE;
+ cluster_desc->mfr_code = mfr_code;
cluster_desc->hf_attr_id = hf_attr_id;
cluster_desc->hf_cmd_rx_id = hf_cmd_rx_id;
cluster_desc->hf_cmd_tx_id = hf_cmd_tx_id;
diff --git a/epan/dissectors/packet-zbee-zcl.h b/epan/dissectors/packet-zbee-zcl.h
index 3022c2f0bf..98790ab6ef 100644
--- a/epan/dissectors/packet-zbee-zcl.h
+++ b/epan/dissectors/packet-zbee-zcl.h
@@ -208,7 +208,7 @@ void decode_zcl_time_in_seconds (gchar *s, guint16 value);
void decode_zcl_time_in_minutes (gchar *s, guint16 value);
void dissect_zcl_attr_data (tvbuff_t *tvb, proto_tree *tree, guint *offset, guint data_type);
-void zbee_zcl_init_cluster(const char *proto_abbrev, int proto, gint ett, guint16 cluster_id, int hf_attr_id, int hf_cmd_rx_id, int hf_cmd_tx_id, zbee_zcl_fn_attr_data fn_attr_data);
+void zbee_zcl_init_cluster(const char *proto_abbrev, int proto, gint ett, guint16 cluster_id, guint16 mfr_code, int hf_attr_id, int hf_cmd_rx_id, int hf_cmd_tx_id, zbee_zcl_fn_attr_data fn_attr_data);
zbee_zcl_cluster_desc *zbee_zcl_get_cluster_desc(guint16 cluster_id, guint16 mfr_code);
/* Cluster-specific commands and parameters */
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 20:23:48 +0000