diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-01-12 00:50:41 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-01-12 00:50:41 +0000 |
| commit | c071a1c7286eb9789dc5c96bb45ab75c75c3ecb4 (patch) | |
| tree | 39717e01eed5f1ad45d3276c820938e3c0ee7d4d /epan/dissectors/packet-bluetooth-hci.h | |
| parent | 4210311b6985f957ad4073b410678685f0494865 (diff) | |
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606)
From Michal Labedski
1. add support for new btsnoop "format" introduced by BlueZ team in "btmon" tool
2. Bluetooth: Make EIR, AD and COD more generic
3. Bluetooth: HCI/LL: Update Error Codes to Core 4.1 Specification
4. Ubertooth: Fix response command handling
5. Ubertooth: Update to support firmware version
6. Ubertooth: Dissect by Vendor Id/Product Id
svn path=/trunk/; revision=54699
Diffstat (limited to 'epan/dissectors/packet-bluetooth-hci.h')
| -rw-r--r-- | epan/dissectors/packet-bluetooth-hci.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/epan/dissectors/packet-bluetooth-hci.h b/epan/dissectors/packet-bluetooth-hci.h index 658cd5f54f..c1929accfb 100644 --- a/epan/dissectors/packet-bluetooth-hci.h +++ b/epan/dissectors/packet-bluetooth-hci.h @@ -67,19 +67,6 @@ extern value_string_ext bthci_cmd_auth_req_vals_ext; extern value_string_ext bthci_cmd_appearance_vals_ext; extern value_string_ext bthci_evt_comp_id_ext; -extern value_string_ext bthci_cmd_cod_major_device_class_vals_ext; -extern value_string_ext bthci_cmd_cod_minor_device_class_computer_vals_ext; -extern value_string_ext bthci_cmd_cod_minor_device_class_phone_vals_ext; -extern value_string_ext bthci_cmd_cod_minor_device_class_lan_net_load_factor_vals_ext; -extern value_string_ext bthci_cmd_cod_minor_device_class_lan_net_type_vals_ext; -extern value_string_ext bthci_cmd_cod_minor_device_class_audio_video_vals_ext; -extern value_string_ext bthci_cmd_cod_minor_device_class_peripheral_class_vals_ext; -extern value_string_ext bthci_cmd_cod_minor_device_class_peripheral_type_vals_ext; -extern value_string_ext bthci_cmd_cod_minor_device_class_imaging_type_vals_ext; -extern value_string_ext bthci_cmd_cod_minor_device_class_wearable_vals_ext; -extern value_string_ext bthci_cmd_cod_minor_device_class_toy_vals_ext; -extern value_string_ext bthci_cmd_cod_minor_device_class_health_vals_ext; - extern const value_string bthci_cmd_io_capability_vals[]; extern const value_string bthci_cmd_oob_data_present_vals[]; extern const value_string bthci_cmd_address_types_vals[]; @@ -103,6 +90,7 @@ extern const value_string bthci_cmd_notification_types[]; #define HCI_INTERFACE_H4 1 #define HCI_INTERFACE_USB 2 #define HCI_INTERFACE_AMP 3 +#define HCI_INTERFACE_MON 4 #define HCI_ADAPTER_DEFAULT 0 @@ -144,4 +132,7 @@ typedef struct _localhost_name_entry_t { gchar *name; } localhost_name_entry_t; +/* In "packet-btle.c" */ +extern gint dissect_bd_addr(gint hf_bd_addr, proto_tree *tree, tvbuff_t *tvb, gint offset); + #endif |