diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-01-02 08:13:40 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-01-02 08:13:40 +0000 |
| commit | 2f7ee4de2a8d3224da40a9912ef5d3889bb69112 (patch) | |
| tree | 5752f0f5c73ffd81be6abe6c2331f8e2ce71dbf5 /epan/dissectors/packet-btl2cap.h | |
| parent | a1dea2a48d04c1af765ddea935f6ad879ed52a36 (diff) | |
From Allan M. Madsen via. bug 5445:
Bluetooth profiles and protocols above RFCOMM and L2CAP can not be dissected correctly because the required information (server channel and dynamic PSM value mappings to services/profiles) about the type of data carried in the payload is not available. RFCOMM is currently hardcoded to handoff all payload data to the obex dissector though it may carry e.g. handsfree, dial-up networking or serial port profile related data.
The patch consists of modifcations to the following dissectors:
btsdp: Extraction of RFCOMM server channel and L2CAP dynamic PSM with service mapping is provided to RFCOMM and L2CAP through a tap interface. In addition, the packet list info is beautyfied and extended with more details for better
overview.
btl2cap: Adds a new dissector table with services and dynamic PSM mapping which is filled by a tap listner catching the info from btsdp. More info added to packet list.
btrfcomm: Adds a new dissector table with services and server channel mapping which is filled by a tap listner catching the info from btsdp. Dissectors for handsfree, dial-up netorking and serial port profiles (all based on RFCOMM) are also added.
btobex: Registers several obex based profiles (e.g. obex push, file transfer, basic printing etc.) in both RFCOMM and L2CAP. Some cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35323 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-btl2cap.h')
| -rw-r--r-- | epan/dissectors/packet-btl2cap.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/epan/dissectors/packet-btl2cap.h b/epan/dissectors/packet-btl2cap.h index 42bef4fe02..53c0ac38a2 100644 --- a/epan/dissectors/packet-btl2cap.h +++ b/epan/dissectors/packet-btl2cap.h @@ -24,9 +24,16 @@ #ifndef __PACKET_BTL2CAP_H__ #define __PACKET_BTL2CAP_H__ -#define BTL2CAP_PSM_SDP 0x0001 -#define BTL2CAP_PSM_RFCOMM 0x0003 -#define BTL2CAP_PSM_BNEP 0x000f +#define BTL2CAP_PSM_SDP 0x0001 +#define BTL2CAP_PSM_RFCOMM 0x0003 +#define BTL2CAP_PSM_BNEP 0x000f +#define BTL2CAP_PSM_HID_CTRL 0x0011 +#define BTL2CAP_PSM_HID_INTR 0x0013 +#define BTL2CAP_PSM_AVCTP_CTRL 0x0017 +#define BTL2CAP_PSM_AVDTP 0x0019 +#define BTL2CAP_PSM_AVCTP_BRWS 0x001b + +#define BTL2CAP_DYNAMIC_PSM_START 0x1000 #define BTL2CAP_FIXED_CID_NULL 0x0000 #define BTL2CAP_FIXED_CID_SIGNAL 0x0001 |