diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-22 01:02:00 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-22 01:02:00 +0000 |
| commit | b6df06199c08299c0c3cc79bafa17e3b0a8ed0f0 (patch) | |
| tree | b0fcdea46dff50bd3d36cca2f4a60e99097bdb8a /epan/dissectors/packet-rx.c | |
| parent | 28b5926fe84efed7828340aa43bf6f4cf2b9ebf4 (diff) | |
Pass struct rxinfo "private data" into AFS dissector instead of using pinfo->private_data.
svn path=/trunk/; revision=52751
Diffstat (limited to 'epan/dissectors/packet-rx.c')
| -rw-r--r-- | epan/dissectors/packet-rx.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index 44cdb7d990..a9644fd168 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -562,12 +562,9 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *dat break; case RX_PACKET_TYPE_DATA: { tvbuff_t *next_tvb; - void* pd_save; - pd_save = pinfo->private_data; - pinfo->private_data = &rxinfo; + next_tvb = tvb_new_subset_remaining(tvb, offset); - call_dissector(afs_handle, next_tvb, pinfo, parent_tree); - pinfo->private_data = pd_save; + call_dissector_with_data(afs_handle, next_tvb, pinfo, parent_tree, &rxinfo); }; break; case RX_PACKET_TYPE_ABORT: |