diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2014-03-03 08:51:04 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-03-06 05:53:52 +0000 |
| commit | 248c284622bd330ab91b08ffda9d5497b60bb68a (patch) | |
| tree | 8c25e343ac513bc3b9221174643f7963bce19590 /epan/dissectors/packet-bluetooth-hci.h | |
| parent | e2ed48a8d38e7a885d47ba213e7deb72e18ca3d9 (diff) | |
Bluetooth: Fix interface_id
Interface ID should correspond to the Wireshark Interface Id
to avoid mixing data from various interfaces in dissectors.
Change-Id: Ibaa3ddab7f0ebd0985efea74439b94a5881145a7
Reviewed-on: https://code.wireshark.org/review/472
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-bluetooth-hci.h')
| -rw-r--r-- | epan/dissectors/packet-bluetooth-hci.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/epan/dissectors/packet-bluetooth-hci.h b/epan/dissectors/packet-bluetooth-hci.h index d5a8e81dac..20b388274c 100644 --- a/epan/dissectors/packet-bluetooth-hci.h +++ b/epan/dissectors/packet-bluetooth-hci.h @@ -84,14 +84,16 @@ extern const value_string bthci_cmd_notification_types[]; AVDTP, BNEP etc. RFCOMM channel has end-protocol like OBEX, HFP, etc. Important note: correct payload decoding should store needed data using key contain interface_id, adapter_id, ..., last_channel_type (for example - RFCOMM channel, transaction_id, frame number etc. ) */ -#define HCI_INTERFACE_H1 0 -#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 + RFCOMM channel, transaction_id, frame number etc. ) + + interface_id - interface id provided by Wireshark, see "frame.interface_id", + in case where is only one interface id HCI_INTERFACE_DEFAULT + is used (for example open BTSNOOP file with HCI H4 protocol) + adapter_id - identified Bluetooth device (interface, for example Linux + hci0, hci1, etc.) +*/ +#define HCI_INTERFACE_DEFAULT 0 +#define HCI_ADAPTER_DEFAULT 0 /* chandle_to_bdaddr_table: interface_id + adapter_id + connection_handle + frame_number -> bd_addr[6] */ /* bdaddr_to_name_table: bd_addr[6] + frame_number -> name */ |