aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-zcl-general.c
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/packet-zbee-zcl-general.c
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/packet-zbee-zcl-general.c')
-rw-r--r--epan/dissectors/packet-zbee-zcl-general.c29
1 files changed, 29 insertions, 0 deletions
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