diff options
| author | Joakim Andersson <joakim.andersson@nordicsemi.no> | 2021-06-25 11:42:07 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2021-07-08 07:23:07 +0000 |
| commit | 3b330cf6475dd33b88e11977029bf0c3df96f446 (patch) | |
| tree | 301d8d96663993d0676412f9b25fac5a2a071b9a | |
| parent | 4cbec00089f8dfa5ebfe0133e74b06d1ae755b3d (diff) | |
Bluetooth: Fix parsing of CTE Info field in extended advertising header
Fix parsing of the CTE Info field in the extended advertising header.
The bit-mask of the different fields was wrongly placed.
The text of the different fields all said "CTE Info".
The CTE Time field was added twice.
Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
| -rw-r--r-- | epan/dissectors/packet-btle.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index eb8bb69f6a..fe72872c53 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -1168,11 +1168,10 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) sub_item = proto_tree_add_item(ext_header_tree, hf_extended_advertising_cte_info, tvb, offset, 1, ENC_NA); sub_tree = proto_item_add_subtree(sub_item, ett_extended_advertising_cte_info); - proto_tree_add_item(sub_tree, hf_extended_advertising_cte_info_time, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(sub_tree, hf_extended_advertising_cte_info_rfu, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(sub_tree, hf_extended_advertising_cte_info_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); item = proto_tree_add_item_ret_uint(sub_tree, hf_extended_advertising_cte_info_time, tvb, offset, 1, ENC_LITTLE_ENDIAN, &cte_time); proto_item_append_text(item, " (%u usec)", cte_time * 8); + proto_tree_add_item(sub_tree, hf_extended_advertising_cte_info_rfu, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(sub_tree, hf_extended_advertising_cte_info_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; acad_len -= 1; @@ -2216,18 +2215,18 @@ proto_register_btle(void) NULL, HFILL } }, { &hf_extended_advertising_cte_info_time, - { "CTE Info", "btle.extended_advertising_header.cte_info.time", + { "CTE Time", "btle.extended_advertising_header.cte_info.time", FT_UINT8, BASE_HEX, NULL, 0x1F, NULL, HFILL } }, { &hf_extended_advertising_cte_info_rfu, - { "CTE Info", "btle.extended_advertising_header.cte_info.rfu", - FT_UINT8, BASE_HEX, NULL, 0x2, + { "RFU", "btle.extended_advertising_header.cte_info.rfu", + FT_UINT8, BASE_HEX, NULL, 0x20, NULL, HFILL } }, { &hf_extended_advertising_cte_info_type, - { "CTE Info", "btle.extended_advertising_header.cte_info.type", - FT_UINT8, BASE_HEX, VALS(le_cte_type_vals), 0xC, + { "CTE Type", "btle.extended_advertising_header.cte_info.type", + FT_UINT8, BASE_HEX, VALS(le_cte_type_vals), 0xC0, NULL, HFILL } }, { &hf_extended_advertising_data_info, |