diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2010-05-19 06:26:02 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2010-05-19 06:26:02 +0000 |
| commit | 485dca153508bc1e774bfe40deb71f73293dd2d8 (patch) | |
| tree | 9f66aff87b5ac36912638ebf0688bd0c92acd92e /epan/dissectors/packet-btrfcomm.c | |
| parent | 9bd8195d0ed37cb7e73fc0d9aef0489471f09c08 (diff) | |
Pass along btrfcomm_data_t to higher layer protocols
svn path=/trunk/; revision=32888
Diffstat (limited to 'epan/dissectors/packet-btrfcomm.c')
| -rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 696a4defd2..7e63493cdb 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -53,6 +53,7 @@ #include <epan/emem.h> #include <epan/expert.h> #include "packet-btl2cap.h" +#include "packet-btrfcomm.h" static int hf_pf = -1; static int hf_ea = -1; @@ -498,9 +499,6 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 frame_type, pf_flag; guint16 frame_len; dlci_state_t *dlci_state; - btl2cap_data_t *l2cap_data; - - l2cap_data=pinfo->private_data; ti = proto_tree_add_item(tree, proto_btrfcomm, tvb, offset, -1, TRUE); rfcomm_tree = proto_item_add_subtree(ti, ett_btrfcomm); @@ -593,7 +591,16 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* dissect everything as OBEX for now */ if(dlci && frame_len && btobex_handle){ tvbuff_t *next_tvb; + btl2cap_data_t *l2cap_data; + btrfcomm_data_t rfcomm_data; + next_tvb = tvb_new_subset(tvb, offset, frame_len, frame_len); + + l2cap_data = pinfo->private_data; + pinfo->private_data = &rfcomm_data; + rfcomm_data.chandle = l2cap_data->chandle; + rfcomm_data.cid = l2cap_data->cid; + rfcomm_data.dlci = dlci; call_dissector(btobex_handle, next_tvb, pinfo, tree); } |