From 8dab82556c2a4799800b09a111dab61cb9935883 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 28 Nov 2013 18:11:02 +0000 Subject: Bluetooth improvements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446) From Michal Labedzki. 1. Bluetooth: HFP: Fix recognizing roles. There is need to check which side SDP record is, then it is possible to recognize roles. 2. Bluetooth: RFCOMM/HFP: Fix recognizing services and roles. Direction bit means only that device is initiator of connection or not. But need information who is owner of connection (remote device or localhost), so use this information from L2CAP. 3. Bluetooth: HFP: Fix unexpected expert info 4. Bluetooth: HCI: Set addresses to host/controller. Also optimize a little handing of dissectors handles. svn path=/trunk/; revision=53628 --- epan/dissectors/packet-btrfcomm.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'epan/dissectors/packet-btrfcomm.h') diff --git a/epan/dissectors/packet-btrfcomm.h b/epan/dissectors/packet-btrfcomm.h index 78c2b83dae..c613c3be31 100644 --- a/epan/dissectors/packet-btrfcomm.h +++ b/epan/dissectors/packet-btrfcomm.h @@ -27,13 +27,14 @@ extern int proto_btrfcomm; typedef struct _btrfcomm_data_t { - guint32 interface_id; - guint32 adapter_id; - guint16 chandle; /* only low 12 bits used */ - guint16 cid; - guint8 dlci; - guint32 remote_bd_addr_oui; - guint32 remote_bd_addr_id; + guint32 interface_id; + guint32 adapter_id; + guint16 chandle; /* only low 12 bits used */ + guint16 cid; + gboolean is_local_psm; /* otherwise it is PSM in remote device */ + guint8 dlci; + guint32 remote_bd_addr_oui; + guint32 remote_bd_addr_id; } btrfcomm_data_t; #endif -- cgit v1.2.3