aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-bluetooth.h
diff options
context:
space:
mode:
authorMichal Labedzki <michal.labedzki@tieto.com>2015-05-13 17:33:28 +0200
committerMichal Labedzki <michal.labedzki@tieto.com>2015-06-15 05:40:25 +0000
commit7102a06811ab63e0433ac91ad242e02c5668d259 (patch)
tree128482bd4b38cb6d4f56344261d94ea76db1c7e1 /epan/dissectors/packet-bluetooth.h
parent9fb6ec6c89631f2fbb5228d8f81a727f6d1fee27 (diff)
Qt/Bluetooth: Add Devices dialogue
Please found it under Bluetooth menu. It shows all devices found in logs, not only connected, all that its address can be found in logs. Show if device is local (in most cases: capturing on it side) and manufacturer and LMP version what should answer the question what version of Bluetooth is used by Bluetooth device chip. Also firmware version. Change-Id: I32e3b7100cdebcaa850b6541de0ab89dff41c0e1 Reviewed-on: https://code.wireshark.org/review/8901 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/dissectors/packet-bluetooth.h')
-rw-r--r--epan/dissectors/packet-bluetooth.h42
1 files changed, 39 insertions, 3 deletions
diff --git a/epan/dissectors/packet-bluetooth.h b/epan/dissectors/packet-bluetooth.h
index 69e7a02965..b072173140 100644
--- a/epan/dissectors/packet-bluetooth.h
+++ b/epan/dissectors/packet-bluetooth.h
@@ -183,15 +183,51 @@ typedef struct _bluetooth_uuid_custom {
const gchar *name;
} bluetooth_uuid_custom_t;
+enum bluetooth_device_type {
+ BLUETOOTH_DEVICE_BD_ADDR,
+ BLUETOOTH_DEVICE_NAME,
+ BLUETOOTH_DEVICE_LOCAL_ADAPTER,
+ BLUETOOTH_DEVICE_LOCAL_VERSION,
+ BLUETOOTH_DEVICE_REMOTE_VERSION
+};
+
+typedef struct _bluetooth_device_tap_t {
+ guint32 interface_id;
+ guint32 adapter_id;
+
+ gboolean is_local;
+ gboolean has_bd_addr;
+ guint8 bd_addr[6];
+ enum bluetooth_device_type type;
+ union {
+ char *name;
+ struct {
+ guint8 hci_version;
+ guint16 hci_revision;
+ guint8 lmp_version;
+ guint16 lmp_subversion;
+ guint16 manufacturer;
+ } local_version;
+ struct {
+ guint8 lmp_version;
+ guint16 lmp_subversion;
+ guint16 manufacturer;
+ } remote_version;
+ } data;
+} bluetooth_device_tap_t;
+
+extern int bluetooth_device_tap;
+
WS_DLL_PUBLIC const value_string bluetooth_uuid_vals[];
WS_DLL_PUBLIC const bluetooth_uuid_custom_t bluetooth_uuid_custom[];
WS_DLL_PUBLIC value_string_ext bluetooth_uuid_vals_ext;
-extern value_string_ext bluetooth_company_id_vals_ext;
+WS_DLL_PUBLIC value_string_ext bluetooth_company_id_vals_ext;
extern guint32 max_disconnect_in_frame;
-extern gint dissect_bd_addr(gint hf_bd_addr, proto_tree *tree, tvbuff_t *tvb,
- gint offset, guint8 *bdaddr);
+extern gint dissect_bd_addr(gint hf_bd_addr, packet_info *pinfo, proto_tree *tree,
+ tvbuff_t *tvb, gint offset, gboolean is_local_bd_addr,
+ guint32 interface_id, guint32 adapter_id, guint8 *bdaddr);
extern bluetooth_uuid_t get_uuid(tvbuff_t *tvb, gint offset, gint size);
extern gchar *print_uuid(bluetooth_uuid_t *uuid);