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

Bluetooth HCI: Add support for Bluetooth v5.2 

Dissection of all new HCI commands and events added in
the newly released Bluetooth specification version 5.2.
Bluetooth Device Dialog updated to also show ISO buffer
size and amount.

Change-Id: I3a459760cbe5f6c4f985621cee40dbbe5e473d39
Signed-off-by: Allan Møller Madsen <almomadk@gmail.com>
Reviewed-on: https://code.wireshark.org/review/35957
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 2020-01-26 21:54:02 +01:00 committed by Anders Broman
parent 76ed59b756
commit 1592679ed8
6 changed files with 1690 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-bluetooth.h
View File

@ -241,7 +241,9 @@ typedef struct _bluetooth_device_tap_t {
} mtus;
struct {
guint16 acl_mtu;
guint16 iso_mtu;
guint16 acl_packets;
guint16 iso_packets;
} le_mtus;
} data;
} bluetooth_device_tap_t;

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

File diff suppressed because it is too large Load Diff

3
epan/dissectors/packet-bthci_cmd.h
View File

@ -34,7 +34,10 @@ extern value_string_ext bthci_cmd_auth_req_vals_ext;
extern value_string_ext bthci_cmd_appearance_vals_ext;
extern value_string_ext bthci_cmd_le_phy_vals_ext;
extern value_string_ext bthci_cmd_cte_type_vals_ext;
extern value_string_ext bthci_cmd_clock_accuray_vals_ext;
extern value_string_ext bthci_cmd_slot_durations_vals_ext;
extern value_string_ext bthci_cmd_phy_and_coding_vals_ext;
extern value_string_ext bthci_cmd_framing_vals_ext;
extern const value_string bthci_cmd_io_capability_vals[];
extern const value_string bthci_cmd_oob_data_present_vals[];

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

File diff suppressed because it is too large Load Diff

22
ui/qt/bluetooth_device_dialog.cpp
View File

@ -51,10 +51,12 @@ static const int row_number_sco_mtu = 14;
static const int row_number_sco_packets = 15;
static const int row_number_le_acl_mtu = 16;
static const int row_number_le_acl_packets = 17;
static const int row_number_inquiry_mode = 18;
static const int row_number_page_timeout = 19;
static const int row_number_simple_pairing_mode = 20;
static const int row_number_voice_setting = 21;
static const int row_number_le_iso_mtu = 18;
static const int row_number_le_iso_packets = 19;
static const int row_number_inquiry_mode = 20;
static const int row_number_page_timeout = 21;
static const int row_number_simple_pairing_mode = 22;
static const int row_number_voice_setting = 23;
static tap_packet_status
bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data)
@ -623,6 +625,18 @@ tap_packet_status BluetoothDeviceDialog::tapPacket(void *tapinfo_ptr, packet_inf
updateChanges(tableWidget, field, row_number_le_acl_packets, tapinfo->changes, pinfo);
item->setText(field);
field = QString::number(tap_device->data.le_mtus.iso_mtu);
item = tableWidget->item(row_number_le_iso_mtu, column_number_value);
saveItemData(item, tap_device, pinfo);
updateChanges(tableWidget, field, row_number_le_iso_mtu, tapinfo->changes, pinfo);
item->setText(field);
field = QString::number(tap_device->data.le_mtus.iso_packets);
item = tableWidget->item(row_number_le_iso_packets, column_number_value);
saveItemData(item, tap_device, pinfo);
updateChanges(tableWidget, field, row_number_le_iso_packets, tapinfo->changes, pinfo);
item->setText(field);
break;
}

10
ui/qt/bluetooth_device_dialog.ui
View File

@ -163,6 +163,16 @@
<string>LE ACL Total Packets</string>
</property>
</row>
<row>
<property name="text">
<string>LE ISO MTU</string>
</property>
</row>
<row>
<property name="text">
<string>LE ISO Total Packets</string>
</property>
</row>
<row>
<property name="text">
<string>Inquiry Mode</string>