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-glusterfs_hndsk.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-glusterfs_hndsk.c')
| -rw-r--r-- | epan/dissectors/packet-glusterfs_hndsk.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-glusterfs_hndsk.c b/epan/dissectors/packet-glusterfs_hndsk.c index ad83f1ab70..72957159fa 100644 --- a/epan/dissectors/packet-glusterfs_hndsk.c +++ b/epan/dissectors/packet-glusterfs_hndsk.c @@ -64,9 +64,9 @@ static gint ett_gluster_hndsk = -1; /* procedures for GLUSTER_HNDSK_PROGRAM */ static int gluster_hndsk_setvolume_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 = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, offset); return offset; @@ -74,7 +74,7 @@ gluster_hndsk_setvolume_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_hndsk_setvolume_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, offset); @@ -83,9 +83,9 @@ gluster_hndsk_setvolume_call(tvbuff_t *tvb, int offset, static int gluster_hndsk_2_setvolume_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 = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, offset); return offset; @@ -93,7 +93,7 @@ gluster_hndsk_2_setvolume_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_hndsk_2_setvolume_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, offset); @@ -102,9 +102,9 @@ gluster_hndsk_2_setvolume_call(tvbuff_t *tvb, int offset, static int gluster_hndsk_2_getspec_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_string(tvb, tree, hf_gluster_hndsk_spec, offset, NULL); offset = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, @@ -114,7 +114,7 @@ gluster_hndsk_2_getspec_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int gluster_hndsk_2_getspec_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { if (tree) proto_tree_add_item(tree, hf_gluster_hndsk_flags, tvb, offset, @@ -129,16 +129,16 @@ gluster_hndsk_2_getspec_call(tvbuff_t *tvb, int offset, static int gluster_hndsk_2_set_lk_ver_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_hndsk_lk_ver, offset); return offset; } static int gluster_hndsk_2_set_lk_ver_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_hndsk_uid, offset, NULL); @@ -148,7 +148,7 @@ gluster_hndsk_2_set_lk_ver_call(tvbuff_t *tvb, int offset, static int gluster_hndsk_2_event_notify_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_uint32(tvb, tree, hf_gluster_hndsk_event_op, offset); @@ -161,9 +161,9 @@ gluster_hndsk_2_event_notify_call(tvbuff_t *tvb, int offset, static int gluster_hndsk_2_event_notify_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree) + packet_info *pinfo, 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 = gluster_rpc_dissect_dict(tree, tvb, hf_gluster_hndsk_dict, offset); return offset; |