aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorJorge Mora <jmora1300@gmail.com>2019-04-17 13:10:53 -0600
committerAnders Broman <a.broman58@gmail.com>2019-04-18 06:35:26 +0000
commit694d212b7254bb7d91b0cf6dafc3c1559e9da9d2 (patch)
tree3608de7a37b30bac1c93f4b2b00e2d16c6b3762a /epan/dissectors
parent1998de886cbeb5aceef017fe4c2d03e754a90bb9 (diff)
NFS: Fix header field type in dissect_rpc_array calls
The field type must be FT_NONE in dissect_rpc_array to avoid warning: Trailing stray characters. Change-Id: I259e1fe5491b3ab95234c3521aa2c2b575650856 Reviewed-on: https://code.wireshark.org/review/32880 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-nfs.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 0efb1c950f..448bdea330 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -420,6 +420,7 @@ static int hf_nfs4_fattr_xattr_support = -1;
static int hf_nfs4_fattr_offline = -1;
static int hf_nfs4_who = -1;
static int hf_nfs4_server = -1;
+static int hf_nfs4_servers = -1;
static int hf_nfs4_fslocation = -1;
static int hf_nfs4_stable_how = -1;
static int hf_nfs4_dirlist_eof = -1;
@@ -6668,7 +6669,7 @@ dissect_nfs4_fs_location(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
newftree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_nfs4_fs_location, NULL, "fs_location4");
- offset = dissect_rpc_array(tvb, pinfo, newftree, offset, dissect_nfs4_server, hf_nfs4_server);
+ offset = dissect_rpc_array(tvb, pinfo, newftree, offset, dissect_nfs4_server, hf_nfs4_servers);
offset = dissect_nfs4_pathname(tvb, offset, newftree);
return offset;
@@ -12430,8 +12431,12 @@ proto_register_nfs(void)
"server", "nfs.server", FT_STRING, BASE_NONE,
NULL, 0, NULL, HFILL }},
+ { &hf_nfs4_servers, {
+ "servers", "nfs.servers", FT_NONE, BASE_NONE,
+ NULL, 0, NULL, HFILL }},
+
{ &hf_nfs4_fslocation, {
- "fs_location4", "nfs.fattr4.fs_location", FT_STRING, BASE_NONE,
+ "fs_location4", "nfs.fattr4.fs_location", FT_NONE, BASE_NONE,
NULL, 0, NULL, HFILL }},
{ &hf_nfs4_fattr_owner, {