osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Bluetooth HCI: Rename LE Read Remote Used Features command 

The command name was changed between core spec 4.2 and 5.0,
it is now: LE Read Remote Features

Bug: 14582
Change-Id: Ia64db822e680263d9e4fef9d6c466e128597a13f
Signed-off-by: Allan Møller Madsen <almomadk@gmail.com>
Reviewed-on: https://code.wireshark.org/review/32540
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Allan Møller Madsen 2019-03-23 12:06:34 +01:00 committed by Anders Broman
parent ed23cfba22
commit da5a160edf
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-bthci_cmd.c
View File

@ -305,7 +305,7 @@ static int hf_bthci_cmd_le_event_mask_le_read_local_p256_public_key_complete = -
static int hf_bthci_cmd_le_event_mask_le_data_length_change = -1;
static int hf_bthci_cmd_le_event_mask_le_remote_connection_parameter_request = -1;
static int hf_bthci_cmd_le_event_mask_le_long_term_key_request = -1;
static int hf_bthci_cmd_le_event_mask_le_read_remote_used_features_complete = -1;
static int hf_bthci_cmd_le_event_mask_le_read_remote_features_complete = -1;
static int hf_bthci_cmd_le_event_mask_le_connection_update_complete = -1;
static int hf_bthci_cmd_le_event_mask_le_advertising_report = -1;
static int hf_bthci_cmd_le_event_mask_le_connection_complete = -1;
@ -564,7 +564,7 @@ static const int *hfx_bthci_cmd_le_event_mask[] = {
&hf_bthci_cmd_le_event_mask_le_data_length_change,
&hf_bthci_cmd_le_event_mask_le_remote_connection_parameter_request,
&hf_bthci_cmd_le_event_mask_le_long_term_key_request,
&hf_bthci_cmd_le_event_mask_le_read_remote_used_features_complete,
&hf_bthci_cmd_le_event_mask_le_read_remote_features_complete,
&hf_bthci_cmd_le_event_mask_le_connection_update_complete,
&hf_bthci_cmd_le_event_mask_le_advertising_report,
&hf_bthci_cmd_le_event_mask_le_connection_complete,
@ -1300,7 +1300,7 @@ value_string_ext bthci_cmd_ocf_testing_vals_ext = VALUE_STRING_EXT_INIT(bthci_cm
{ (base) | 0x013, "LE Connection Update" }, \
{ (base) | 0x014, "LE Set Host Channel Classification" }, \
{ (base) | 0x015, "LE Read Channel Map" }, \
{ (base) | 0x016, "LE Read Remote Used Features" }, \
{ (base) | 0x016, "LE Read Remote Features" }, \
{ (base) | 0x017, "LE Encrypt" }, \
{ (base) | 0x018, "LE Rand" }, \
{ (base) | 0x019, "LE Start Encryption" }, \
@ -4362,7 +4362,7 @@ dissect_le_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
break;
case 0x0015: /* LE Read Channel Map */
case 0x0016: /* LE Read Remote Used Features */
case 0x0016: /* LE Read Remote Features */
case 0x001b: /* LE Long Term Key Request Negative Reply */
case 0x0030: /* LE Read PHY */
proto_tree_add_item(tree, hf_bthci_cmd_connection_handle, tvb, offset, 2, ENC_LITTLE_ENDIAN);
@ -6539,8 +6539,8 @@ proto_register_bthci_cmd(void)
FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x04),
NULL, HFILL }
},
{ &hf_bthci_cmd_le_event_mask_le_read_remote_used_features_complete,
{ "LE Read Remote Used Features Complete", "bthci_cmd.le_event_mask.le_read_remote_used_features_complete",
{ &hf_bthci_cmd_le_event_mask_le_read_remote_features_complete,
{ "LE Read Remote Features Complete", "bthci_cmd.le_event_mask.le_read_remote_features_complete",
FT_BOOLEAN, 64, NULL, G_GUINT64_CONSTANT(0x08),
NULL, HFILL }
},

8
epan/dissectors/packet-bthci_evt.c
View File

@ -962,7 +962,7 @@ static const value_string evt_le_meta_subevent[] = {
{ 0x01, "LE Connection Complete" },
{ 0x02, "LE Advertising Report" },
{ 0x03, "LE Connection Update Complete" },
{ 0x04, "LE Read Remote Used Features Complete" },
{ 0x04, "LE Read Remote Features Complete" },
{ 0x05, "LE Long Term Key Request" },
{ 0x06, "LE Remote Connection Parameter Request" },
{ 0x07, "LE Data Length Change" },
@ -2514,7 +2514,7 @@ dissect_bthci_evt_le_meta(tvbuff_t *tvb, int offset, packet_info *pinfo,
add_opcode(opcode_list, 0x2013, COMMAND_STATUS_NORMAL); /* LE Connection Update */
break;
case 0x04: /* LE Read Remote Used Features Complete */
case 0x04: /* LE Read Remote Features Complete */
proto_tree_add_item(tree, hf_bthci_evt_status, tvb, offset, 1, ENC_LITTLE_ENDIAN);
send_hci_summary_status_tap(tvb_get_guint8(tvb, offset), pinfo, bluetooth_data);
offset += 1;
@ -2525,7 +2525,7 @@ dissect_bthci_evt_le_meta(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree_add_bitmask(tree, tvb, offset, hf_bthci_evt_le_features, ett_le_features, hfx_bthci_evt_le_features, ENC_LITTLE_ENDIAN);
offset += 8;
add_opcode(opcode_list, 0x2016, COMMAND_STATUS_NORMAL); /* LE Read Remote Used Features */
add_opcode(opcode_list, 0x2016, COMMAND_STATUS_NORMAL); /* LE Read Remote Features */
break;
case 0x05: /* LE Long Term Key Request */
proto_tree_add_item(tree, hf_bthci_evt_connection_handle, tvb, offset, 2, ENC_LITTLE_ENDIAN);
@ -5166,7 +5166,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset,
case 0x0C6B: /* Short Range Mode */
case 0x200D: /* LE Create Connection */
case 0x2013: /* LE Connection Update */
case 0x2016: /* LE Read Remote Used Features */
case 0x2016: /* LE Read Remote Features */
case 0x2019: /* LE Start Encryption */
case 0x2025: /* LE Read Local P-256 Public Key */
case 0x2026: /* LE Generate DHKey [v1] */