diff options
author | Michael Mann <mmann78@netscape.net> | 2013-11-10 16:39:46 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-11-10 16:39:46 +0000 |
commit | fe52a15217f645f09640529ce5ad1d344cafbed3 (patch) | |
tree | 624a61b433295083642c9284629ba33e79fba403 /epan/dissectors/packet-hclnfsd.c | |
parent | 6f6d04e2f9585f603e713198938197821328c1b5 (diff) |
Have rpc_call_info_value be passed through to (sub)dissectors instead of using pinfo->private_data.
This was acheived by adding a void* data parameter to the dissect_function_t typedef in packet-rpc.h (r53213). After converting the pinfo->private_data, I'm not sure if it would be better to change the void* data pointer to be a rpc_call_info_value* explicitly. Not all "dissector functions" use it, but it would certainly save a lot of casting...
svn path=/trunk/; revision=53232
Diffstat (limited to 'epan/dissectors/packet-hclnfsd.c')
-rw-r--r-- | epan/dissectors/packet-hclnfsd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c index dc4395d014..865322a40c 100644 --- a/epan/dissectors/packet-hclnfsd.c +++ b/epan/dissectors/packet-hclnfsd.c @@ -115,11 +115,11 @@ dissect_hclnfsd_gids(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tr } static int -dissect_hclnfsd_spool_inquire_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) +dissect_hclnfsd_spool_inquire_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data) { offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_status, offset); - offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "spool filehandle", NULL); + offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "spool filehandle", NULL, (rpc_call_info_value*)data); return offset; } @@ -390,7 +390,7 @@ dissect_hclnfsd_name_to_uid_reply(tvbuff_t *tvb, int offset, packet_info *pinfo static int -dissect_hclnfsd_share_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) +dissect_hclnfsd_share_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data) { guint32 request_type; @@ -404,7 +404,7 @@ dissect_hclnfsd_share_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_lockname, offset, NULL); - offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "Filehandle", NULL); + offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "Filehandle", NULL, (rpc_call_info_value*)data); offset = dissect_rpc_data(tvb, tree, hf_hclnfsd_unknown_data, offset); @@ -452,7 +452,7 @@ dissect_hclnfsd_unshare_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, pro static int -dissect_hclnfsd_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) +dissect_hclnfsd_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data) { offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_status, offset); offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_cookie, offset); @@ -462,7 +462,7 @@ dissect_hclnfsd_lock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_lockname, offset, NULL); - offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "Filehandle", NULL); + offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "Filehandle", NULL, (rpc_call_info_value*)data); offset = dissect_rpc_data(tvb, tree, hf_hclnfsd_lockowner, offset); @@ -506,7 +506,7 @@ dissect_hclnfsd_remove_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, p static int -dissect_hclnfsd_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) +dissect_hclnfsd_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data) { offset += 4; /* skip unused */ @@ -514,7 +514,7 @@ dissect_hclnfsd_unlock_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto offset = dissect_rpc_string(tvb, tree, hf_hclnfsd_lockname, offset, NULL); - offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "Filehandle", NULL); + offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "Filehandle", NULL, (rpc_call_info_value*)data); offset = dissect_rpc_data(tvb, tree, hf_hclnfsd_unknown_data, offset); |