diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-09-21 11:30:53 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-09-21 11:30:53 +0000 |
| commit | ff1a7d93bf956835cd1ad3d3a74544d333e721e7 (patch) | |
| tree | 03355d95d0acff345a8062573f167ba69996d1d7 /epan | |
| parent | 1684c38d4435c9a922553d13b017d63346621e1f (diff) | |
From Michal Labedzki:
Bluetooth: Provide PSM for higher layers
This is needed by AVRCP, HCRP and AVDTP to recognize other substreams.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7740
svn path=/trunk/; revision=45041
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-btl2cap.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-btl2cap.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index dddc749635..224fcfa52c 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -1343,7 +1343,8 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if (cid == BTL2CAP_FIXED_CID_CONNLESS) { /* Connectionless reception channel */ col_append_str(pinfo->cinfo, COL_INFO, "Connectionless reception channel"); - psm = tvb_get_letohs(tvb, offset); + psm = tvb_get_letohs(tvb, offset); + l2cap_data->psm = psm; proto_tree_add_item(btl2cap_tree, hf_btl2cap_psm, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; @@ -1420,6 +1421,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) || (psm_data->dcid == (cid | ((pinfo->p2p_dir == P2P_DIR_RECV) ? 0x0000 : 0x8000)))) ) { psm = psm_data->psm; + l2cap_data->psm = psm; if (pinfo->p2p_dir == P2P_DIR_RECV) config_data = &(psm_data->in); diff --git a/epan/dissectors/packet-btl2cap.h b/epan/dissectors/packet-btl2cap.h index fa09aab020..a439137751 100644 --- a/epan/dissectors/packet-btl2cap.h +++ b/epan/dissectors/packet-btl2cap.h @@ -49,6 +49,7 @@ typedef struct _btl2cap_data_t { guint16 chandle; /* only low 12 bits used */ guint16 cid; + guint16 psm; } btl2cap_data_t; #endif |