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

Zigbee: Touchlink missing info field 

Added in the profile interop bit for the Touhlink information field.
This commit is contained in:
Dana Sy 2022-05-26 17:49:10 -07:00 committed by A Wireshark GitLab Utility
parent 941539b6a2
commit 7df725a119
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-zbee-zcl-general.c
View File

@ -15841,6 +15841,7 @@ proto_reg_handoff_zbee_zcl_gp(void)
#define ZBEE_ZCL_TOUCHLINK_INFO_ASSIGNMENT 0x02
#define ZBEE_ZCL_TOUCHLINK_INFO_INITIATOR 0x10
#define ZBEE_ZCL_TOUCHLINK_INFO_UNDEFINED 0x20
#define ZBEE_ZCL_TOUCHLINK_INFO_PROFILE_INTEROP 0x80
/*Touchlink Key Indicies*/
#define ZBEE_ZCL_TOUCHLINK_KEYID_DEVELOPMENT 0
@ -15870,6 +15871,7 @@ static int hf_zbee_zcl_touchlink_info_factory = -1;
static int hf_zbee_zcl_touchlink_info_assignment = -1;
static int hf_zbee_zcl_touchlink_info_initiator = -1;
static int hf_zbee_zcl_touchlink_info_undefined = -1;
static int hf_zbee_zcl_touchlink_info_profile_introp = -1;
static int hf_zbee_zcl_touchlink_start_index = -1;
static int hf_zbee_zcl_touchlink_ident_duration = -1;
@ -15953,6 +15955,12 @@ static const value_string zbee_zcl_touchlink_status_names[] = {
{ 0, NULL }
};
static const value_string zbee_zcl_touchlink_profile_interop_names[] = {
{ 0, "ZLL" },
{ 1, "Zigbee 3.0" },
{ 0, NULL }
};
static const value_string zbee_zcl_touchlink_keyid_names[] = {
{ ZBEE_ZCL_TOUCHLINK_KEYID_DEVELOPMENT, "Development Key" },
{ ZBEE_ZCL_TOUCHLINK_KEYID_MASTER, "Master Key" },
@ -15986,6 +15994,7 @@ dissect_zcl_touchlink_scan_request(tvbuff_t *tvb, proto_tree *tree, guint *offse
&hf_zbee_zcl_touchlink_info_assignment,
&hf_zbee_zcl_touchlink_info_initiator,
&hf_zbee_zcl_touchlink_info_undefined,
&hf_zbee_zcl_touchlink_info_profile_introp,
NULL
};
proto_tree_add_bitmask(tree, tvb, *offset, hf_zbee_zcl_touchlink_zbee, ett_zbee_zcl_touchlink_zbee, zbee_info_flags, ENC_LITTLE_ENDIAN);
@ -16128,6 +16137,7 @@ dissect_zcl_touchlink_scan_response(tvbuff_t *tvb, proto_tree *tree, guint *offs
&hf_zbee_zcl_touchlink_info_assignment,
&hf_zbee_zcl_touchlink_info_initiator,
&hf_zbee_zcl_touchlink_info_undefined,
&hf_zbee_zcl_touchlink_info_profile_introp,
NULL
};
static int * const zll_keybit_flags[] = {
@ -16437,6 +16447,10 @@ proto_register_zbee_zcl_touchlink(void)
{ "Undefined", "zbee_zcl_general.touchlink.info.undefined", FT_BOOLEAN, 8, NULL,
ZBEE_ZCL_TOUCHLINK_INFO_UNDEFINED, NULL, HFILL } },
{ &hf_zbee_zcl_touchlink_info_profile_introp,
{ "Profile Interop", "zbee_zcl_general.touchlink.info.profile.interop", FT_UINT8, BASE_HEX, VALS(zbee_zcl_touchlink_profile_interop_names),
ZBEE_ZCL_TOUCHLINK_INFO_PROFILE_INTEROP, NULL, HFILL } },
/* Touchlink Key Information Bitmask */
{ &hf_zbee_zcl_touchlink_key_bitmask,
{ "Key Bitmask", "zbee_zcl_general.touchlink.key_bitmask", FT_UINT16, BASE_HEX, NULL,