diff options
| author | Dana Sy <dana.hayden.sy@gmail.com> | 2022-05-26 17:49:10 -0700 |
|---|---|---|
| committer | A Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2022-05-28 09:09:43 +0000 |
| commit | 7df725a1194b0cc896fa156c90743040b60f2440 (patch) | |
| tree | f759ebf4609da41e713e1085caaa7923dd390f4a | |
| parent | 941539b6a2d0ed09201728a2f2774117ea6ac4f8 (diff) | |
Zigbee: Touchlink missing info field
Added in the profile interop bit for the Touhlink information field.
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-general.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index 963c618b77..e445182e1c 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -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, |