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-afs.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-afs.c')
| -rw-r--r-- | epan/dissectors/packet-afs.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index 68b6e59608..7c27c02b1a 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -1636,10 +1636,10 @@ afs_init_protocol(void) * Dissection routines */ -static void -dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { - struct rxinfo *rxinfo = (struct rxinfo *)pinfo->private_data; + struct rxinfo *rxinfo = (struct rxinfo *)data; int reply = 0; conversation_t *conversation; struct afs_request_key request_key, *new_request_key; @@ -1839,7 +1839,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_str(pinfo->cinfo, COL_INFO, " [AFS reassembled]"); } else { col_set_str(pinfo->cinfo, COL_INFO, "[AFS segment of a reassembled PDU]"); - return; + return tvb_length(tvb); } } @@ -1915,6 +1915,8 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ( rxinfo->flags & RX_LAST_PACKET && reply ){ } + + return tvb_length(tvb); } @@ -3836,7 +3838,7 @@ proto_register_afs(void) proto_register_subtree_array(ett, array_length(ett)); register_init_routine(&afs_init_protocol); - register_dissector("afs", dissect_afs, proto_afs); + new_register_dissector("afs", dissect_afs, proto_afs); } /* |