diff options
-rw-r--r-- | epan/dissectors/packet-gluster_pmap.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-glusterfs.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-mount.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-nfs.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-pcnfsd.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-portmap.c | 5 | ||||
-rw-r--r-- | epan/dissectors/packet-rpc.c | 5 | ||||
-rw-r--r-- | epan/dissectors/packet-rpc.h | 3 |
8 files changed, 26 insertions, 19 deletions
diff --git a/epan/dissectors/packet-gluster_pmap.c b/epan/dissectors/packet-gluster_pmap.c index ed933f1a4a..1db553f360 100644 --- a/epan/dissectors/packet-gluster_pmap.c +++ b/epan/dissectors/packet-gluster_pmap.c @@ -129,7 +129,7 @@ gluster_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = gluster_dissect_common_reply(tvb, offset, pinfo, tree, data); offset = dissect_rpc_list(tvb, pinfo, tree, offset, - gluster_dump_reply_detail); + gluster_dump_reply_detail, NULL); return offset; } diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c index 4916903594..746706e21a 100644 --- a/epan/dissectors/packet-glusterfs.c +++ b/epan/dissectors/packet-glusterfs.c @@ -845,7 +845,7 @@ glusterfs_gfs3_op_readdirp_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, { offset = _glusterfs_gfs3_common_readdir_reply(tvb, tree, offset); offset = dissect_rpc_list(tvb, pinfo, tree, offset, - glusterfs_gfs3_op_readdirp_entry); + glusterfs_gfs3_op_readdirp_entry, NULL); return offset; } @@ -1447,7 +1447,7 @@ glusterfs_gfs3_3_op_readdir_reply(tvbuff_t *tvb, int offset, { offset = _glusterfs_gfs3_common_readdir_reply(tvb, tree, offset); offset = dissect_rpc_list(tvb, pinfo, tree, offset, - glusterfs_gfs3_3_op_readdir_entry); + glusterfs_gfs3_3_op_readdir_entry, NULL); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); return offset; @@ -1624,7 +1624,7 @@ glusterfs_gfs3_3_op_readdirp_reply(tvbuff_t *tvb, int offset, { offset = _glusterfs_gfs3_common_readdir_reply(tvb, tree, offset); offset = dissect_rpc_list(tvb, pinfo, tree, offset, - glusterfs_gfs3_3_op_readdirp_entry); + glusterfs_gfs3_3_op_readdirp_entry, NULL); offset = gluster_rpc_dissect_dict(tree, tvb, hf_glusterfs_dict, offset); return offset; diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c index 2175a19eb1..a535d8056b 100644 --- a/epan/dissectors/packet-mount.c +++ b/epan/dissectors/packet-mount.c @@ -243,7 +243,8 @@ dissect_mountlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree static int dissect_mount_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { - offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_mountlist); + offset = dissect_rpc_list(tvb, pinfo, tree, offset, + dissect_mountlist, NULL); return offset; } @@ -309,7 +310,8 @@ dissect_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr groups_tree = proto_item_add_subtree(groups_item, ett_mount_groups); } - offset = dissect_rpc_list(tvb, pinfo, groups_tree, offset, dissect_group); + offset = dissect_rpc_list(tvb, pinfo, groups_tree, offset, + dissect_group, NULL); if (groups_item) { /* mark empty lists */ if (offset - groups_offset == 4) { @@ -336,7 +338,8 @@ dissect_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr static int dissect_mount_export_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { - offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_exportlist); + offset = dissect_rpc_list(tvb, pinfo, tree, offset, + dissect_exportlist, NULL); return offset; } @@ -608,7 +611,8 @@ dissect_sgi_exportlist(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_ static int dissect_mount_exportlist_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { - offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_sgi_exportlist); + offset = dissect_rpc_list(tvb, pinfo, tree, offset, + dissect_sgi_exportlist, NULL); return offset; } diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 42c426af84..2340bb418a 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -3506,7 +3506,7 @@ dissect_nfs2_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_item_append_text(tree, ", READDIR Reply"); offset = dissect_rpc_list(tvb, pinfo, tree, offset, - dissect_readdir_entry); + dissect_readdir_entry, NULL); eof_value = tvb_get_ntohl(tvb, offset+0); if (tree) proto_tree_add_uint(tree, hf_nfs_readdir_eof, tvb, @@ -5755,7 +5755,7 @@ dissect_nfs3_readdir_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, "dir_attributes"); offset = dissect_nfs3_cookie_verf(tvb, offset, tree); offset = dissect_rpc_list(tvb, pinfo, tree, offset, - dissect_entry3); + dissect_entry3, NULL); eof_value = tvb_get_ntohl(tvb, offset+0); if (tree) proto_tree_add_uint(tree, hf_nfs_readdir_eof, tvb, @@ -5856,7 +5856,7 @@ dissect_nfs3_entryplus(tvbuff_t *tvb, int offset, packet_info *pinfo, /* NFSv3 RFC 1813, Page 80..83 */ static int dissect_nfs3_readdirplus_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, void *data _U_) + proto_tree *tree, void *data) { guint32 status; guint32 eof_value; @@ -5871,7 +5871,7 @@ dissect_nfs3_readdirplus_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, "dir_attributes"); offset = dissect_nfs3_cookie_verf(tvb, offset, tree); offset = dissect_rpc_list(tvb, pinfo, tree, offset, - dissect_nfs3_entryplus); + dissect_nfs3_entryplus, data); eof_value = tvb_get_ntohl(tvb, offset+0); if (tree) proto_tree_add_uint(tree, hf_nfs_readdir_eof, tvb, diff --git a/epan/dissectors/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c index 385fe39b5b..eb2e433eb6 100644 --- a/epan/dissectors/packet-pcnfsd.c +++ b/epan/dissectors/packet-pcnfsd.c @@ -119,7 +119,7 @@ dissect_pcnfsd2_mapid_call(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_rpc_string(tvb, tree, hf_pcnfsd_comment, offset, NULL); offset = dissect_rpc_list(tvb, pinfo, tree, offset, - dissect_pcnfsd2_dissect_mapreq_arg_item); + dissect_pcnfsd2_dissect_mapreq_arg_item, NULL); return offset; } @@ -166,7 +166,7 @@ dissect_pcnfsd2_mapid_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_rpc_string(tvb, tree, hf_pcnfsd_comment, offset, NULL); offset = dissect_rpc_list(tvb, pinfo, tree, offset, - dissect_pcnfsd2_dissect_mapreq_res_item); + dissect_pcnfsd2_dissect_mapreq_res_item, NULL); return offset; } diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c index a3b46bd4de..0028ffa02a 100644 --- a/epan/dissectors/packet-portmap.c +++ b/epan/dissectors/packet-portmap.c @@ -267,7 +267,7 @@ dissect_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { offset = dissect_rpc_list(tvb, pinfo, tree, offset, - dissect_dump_entry); + dissect_dump_entry, NULL); return offset; } @@ -455,7 +455,8 @@ static int dissect_rpcb3_dump_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, void* data _U_) { - offset = dissect_rpc_list(tvb, pinfo, tree, offset, dissect_rpcb); + offset = dissect_rpc_list(tvb, pinfo, tree, offset, + dissect_rpcb, NULL); return offset; } diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 3baabab60c..8534c01d81 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -767,7 +767,7 @@ dissect_rpc_bytes(tvbuff_t *tvb, proto_tree *tree, int dissect_rpc_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, - int offset, dissect_function_t *rpc_list_dissector) + int offset, dissect_function_t *rpc_list_dissector, void *data) { guint32 value_follows; @@ -777,7 +777,8 @@ dissect_rpc_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset, 4, value_follows); offset += 4; if (value_follows == 1) { - offset = rpc_list_dissector(tvb, offset, pinfo, tree, NULL); + offset = rpc_list_dissector(tvb, offset, pinfo, tree, + data); } else { break; diff --git a/epan/dissectors/packet-rpc.h b/epan/dissectors/packet-rpc.h index a5afc1cd56..d4f90bddcc 100644 --- a/epan/dissectors/packet-rpc.h +++ b/epan/dissectors/packet-rpc.h @@ -168,7 +168,8 @@ WS_DLL_PUBLIC int dissect_rpc_bytes(tvbuff_t *tvb, proto_tree *tree, int hfindex, int offset, guint32 length, gboolean string_data, const char **string_buffer_ret); WS_DLL_PUBLIC int dissect_rpc_list(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, int offset, dissect_function_t *rpc_list_dissector); + proto_tree *tree, int offset, dissect_function_t *rpc_list_dissector, + void *data); WS_DLL_PUBLIC int dissect_rpc_array(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, dissect_function_t *rpc_array_dissector, int hfindex); |