diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-10 03:20:04 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-10 03:20:04 +0000 |
| commit | af0819f942fc85919fe9e81a9e990b0f9bf50ca2 (patch) | |
| tree | c9f62d5848425f56a87583227b0672dbf1787c83 /epan/dissectors/packet-gluster_pmap.c | |
| parent | 2965a6bf250609ee3536ebf9fbc44864b55f6931 (diff) | |
Add data parameter to dissect_function_t in vsff structure. The intention here is to use it to replace some pinfo->private_data.
I didn't realize how expansive this change would be, so committing it now before replacing the pinfo->private_data, so if something needs to be reverted, all of this is not lost.
svn path=/trunk/; revision=53213
Diffstat (limited to 'epan/dissectors/packet-gluster_pmap.c')
| -rw-r--r-- | epan/dissectors/packet-gluster_pmap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-gluster_pmap.c b/epan/dissectors/packet-gluster_pmap.c index 7d02a6b51f..5e82b1675a 100644 --- a/epan/dissectors/packet-gluster_pmap.c +++ b/epan/dissectors/packet-gluster_pmap.c @@ -67,9 +67,9 @@ static gint ett_gluster_dump_detail = -1; /* PMAP PORTBYBRICK */ static int gluster_pmap_portbybrick_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_uint32(tvb, tree, hf_gluster_brick_status, offset); offset = dissect_rpc_uint32(tvb, tree, hf_gluster_brick_port, offset); @@ -78,7 +78,7 @@ gluster_pmap_portbybrick_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_pmap_portbybrick_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_rpc_string(tvb, tree, hf_gluster_brick, offset, NULL); @@ -91,7 +91,7 @@ gluster_pmap_portbybrick_call(tvbuff_t *tvb, int offset, */ static int gluster_dump_reply_detail(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { proto_item *detail_item; proto_tree *detail_tree; @@ -120,10 +120,10 @@ gluster_dump_reply_detail(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int gluster_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint64(tvb, tree, hf_gluster_gfsid, offset); - offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree); + offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_list(tvb, pinfo, tree, offset, gluster_dump_reply_detail); @@ -134,7 +134,7 @@ gluster_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, /* DUMP request */ static int gluster_dump_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_rpc_uint64(tvb, tree, hf_gluster_gfsid, offset); |