summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-nfs.c
diff options
context:
space:
mode:
authorBenjamin Coddington <bcodding@redhat.com>2016-03-25 10:50:19 -0400
committerMichael Mann <mmann78@netscape.net>2016-03-25 23:31:36 +0000
commitd3b86727e91dc016eed040ae086c8f3332c2f316 (patch)
tree62ae00391fcaa8758228d1b8bcb1184c1077c283 /epan/dissectors/packet-nfs.c
parent731c383f5f3948f97990345cef02258d29ad7108 (diff)
downloadwireshark-d3b86727e91dc016eed040ae086c8f3332c2f316.tar.gz
packet-nfs: enable nfs4.lock_owner4
Change-Id: I32e718a8ef94b514fd2907651e2f9bd92d8119ef Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Reviewed-on: https://code.wireshark.org/review/14627 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-nfs.c')
-rw-r--r--epan/dissectors/packet-nfs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index f38d7c74cb..11ee401e05 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -462,7 +462,7 @@ static int hf_nfs4_count_dircount = -1;
static int hf_nfs4_count_maxcount = -1;
static int hf_nfs4_minorversion = -1;
static int hf_nfs4_open_owner = -1;
-/* static int hf_nfs4_lock_owner = -1; */
+static int hf_nfs4_lock_owner = -1;
static int hf_nfs4_new_lock_owner = -1;
static int hf_nfs4_sec_oid = -1;
static int hf_nfs4_qop = -1;
@@ -6160,7 +6160,7 @@ dissect_nfs4_lock_owner(tvbuff_t *tvb, int offset, proto_tree *tree)
newftree = proto_tree_add_subtree(tree, tvb, offset, 4, ett_nfs4_lock_owner, NULL, "Owner");
offset = dissect_rpc_uint64(tvb, newftree, hf_nfs4_clientid, offset);
- offset = dissect_nfsdata(tvb, offset, newftree, hf_nfs_data);
+ offset = dissect_nfsdata(tvb, offset, newftree, hf_nfs4_lock_owner);
return offset;
}
@@ -12358,11 +12358,9 @@ proto_register_nfs(void)
"owner", "nfs.open_owner4", FT_BYTES, BASE_NONE,
NULL, 0, NULL, HFILL }},
-#if 0
{ &hf_nfs4_lock_owner, {
"owner", "nfs.lock_owner4", FT_BYTES, BASE_NONE,
NULL, 0, NULL, HFILL }},
-#endif
{ &hf_nfs4_createmode, {
"Create Mode", "nfs.createmode4", FT_UINT32, BASE_DEC,