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-nfs.h | |
| 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-nfs.h')
| -rw-r--r-- | epan/dissectors/packet-nfs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-nfs.h b/epan/dissectors/packet-nfs.h index 9a4d9a904c..d523f317bb 100644 --- a/epan/dissectors/packet-nfs.h +++ b/epan/dissectors/packet-nfs.h @@ -178,10 +178,10 @@ extern void nfs_name_snoop_add_name(int xid, tvbuff_t *tvb, int name_offset, int int parent_offset, int parent_len, const char *name); extern gboolean nfs_fhandle_reqrep_matching; extern int dissect_fhandle(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - const char *name, guint32 *hash); + const char *name, guint32 *hash, rpc_call_info_value *civ); extern void dissect_fhandle_hidden(packet_info *pinfo, proto_tree *tree, int frame); extern int dissect_nfs3_fh(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - const char *name, guint32 *hash); + const char *name, guint32 *hash, rpc_call_info_value *civ); extern int dissect_nfs3_post_op_attr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, const char* name); extern int dissect_nfs2_fattr(tvbuff_t *tvb, int offset, proto_tree *tree, const char* name); @@ -189,7 +189,7 @@ extern proto_tree* display_access_items(tvbuff_t* tvb, int offset, packet_info* proto_tree* tree, guint32 amask, char mtype, int version, GString* optext, const char* label); extern int dissect_access_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree, - int version, GString *optext); + int version, GString *optext, rpc_call_info_value *civ); extern int hf_nfs_status; #endif /* packet-nfs.h */ |