diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-28 18:11:02 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-28 18:11:02 +0000 |
| commit | 8dab82556c2a4799800b09a111dab61cb9935883 (patch) | |
| tree | 8d58b8edafc5053ada1654af6955dffa1b9753b4 /epan/dissectors/packet-btrfcomm.c | |
| parent | 30ae01c73bee0443409e29141ff23bc4629ef736 (diff) | |
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
Diffstat (limited to 'epan/dissectors/packet-btrfcomm.c')
| -rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 99ccd47e49..f5e3a7d2d1 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -627,7 +627,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data k_interface_id = l2cap_data->interface_id; k_adapter_id = l2cap_data->adapter_id; k_sdp_psm = SDP_PSM_DEFAULT; - k_direction = (dlci & 0x01) ? P2P_DIR_SENT : P2P_DIR_RECV; + k_direction = (l2cap_data->is_local_psm) ? P2P_DIR_SENT : P2P_DIR_RECV; if (k_direction == P2P_DIR_RECV) { k_bd_addr_oui = l2cap_data->remote_bd_addr_oui; k_bd_addr_id = l2cap_data->remote_bd_addr_id; @@ -780,6 +780,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data rfcomm_data->adapter_id = l2cap_data->adapter_id; rfcomm_data->chandle = l2cap_data->chandle; rfcomm_data->cid = l2cap_data->cid; + rfcomm_data->is_local_psm = l2cap_data->is_local_psm; rfcomm_data->dlci = dlci; rfcomm_data->remote_bd_addr_oui = l2cap_data->remote_bd_addr_oui; rfcomm_data->remote_bd_addr_id = l2cap_data->remote_bd_addr_id; |