aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-nfs.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-04-15 23:26:57 +0000
committerEvan Huus <eapache@gmail.com>2013-04-15 23:26:57 +0000
commitf7fbe1ccdac5a04734b3bf904684137a8d7194d7 (patch)
tree4bd8b79a88d0d182e5a59a9944bc89f8d328fdf2 /epan/dissectors/packet-nfs.c
parentd75dbf9aff92f777c584a48413dd23f6844395e4 (diff)
From J. Bruce Fields via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8582
Fix a few misc. issues with NFS CB_SEQUENCE decoding. svn path=/trunk/; revision=48868
Diffstat (limited to 'epan/dissectors/packet-nfs.c')
-rw-r--r--epan/dissectors/packet-nfs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index b222c688a3..fc922e9908 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -10509,7 +10509,7 @@ dissect_nfs_cb_argop(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
offset = dissect_nfs_sessionid4(tvb, offset, newftree);
offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_seqid4, offset);
offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_slotid4, offset);
- offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_slotid4, offset);
+ offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_high_slotid4, offset);
offset = dissect_rpc_bool(tvb, newftree, hf_nfs_cachethis4, offset);
offset = dissect_nfs_cb_referring_calls(tvb, offset, newftree);
break;
@@ -10607,8 +10607,8 @@ dissect_nfs_cb_resop(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
offset = dissect_nfs_sessionid4(tvb, offset, newftree);
offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_seqid4, offset);
offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_slotid4, offset);
- offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_slotid4, offset);
- offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_slotid4, offset);
+ offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_high_slotid4, offset);
+ offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_target_high_slotid4, offset);
break;
case NFS4_OP_CB_WANTS_CANCELLED:
case NFS4_OP_CB_NOTIFY_LOCK:
@@ -12041,14 +12041,14 @@ proto_register_nfs(void)
NULL, 0, NULL, HFILL }},
{ &hf_nfs_slotid4, {
- "slot ID", "nfs.slotid4", FT_UINT32, BASE_DEC,
+ "slot id", "nfs.slotid", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
{ &hf_nfs_high_slotid4, {
- "high slot id", "nfs.high.slotid4", FT_UINT32, BASE_DEC,
+ "high slot id", "nfs.high_slotid", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
{ &hf_nfs_target_high_slotid4, {
- "target high slot id", "nfs.target.high.slotid4", FT_UINT32, BASE_DEC,
+ "target high slot id", "nfs.target_high_slotid", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
{ &hf_nfs_serverscope4, {