summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-nfs.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2010-07-21 01:43:14 +0000
committerBill Meier <wmeier@newsguy.com>2010-07-21 01:43:14 +0000
commitaa3ba1a1b5d1a1b2bc3b38e71f756c452bb1b7b3 (patch)
tree2cd280094bc628cd56386c8d85e976b0714e3ca7 /epan/dissectors/packet-nfs.c
parent2910c9949aab9a5fa0f063ded70cf68eea48e58e (diff)
downloadwireshark-aa3ba1a1b5d1a1b2bc3b38e71f756c452bb1b7b3.tar.gz
From Alex Burlyga: Make hf_nfs_slotid4 useful again.
"hf_slotid4 is used for all possible slotid fields in sequence op. This patch separates them out and makes it useful for filtering." See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4995 svn path=/trunk/; revision=33601
Diffstat (limited to 'epan/dissectors/packet-nfs.c')
-rw-r--r--epan/dissectors/packet-nfs.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 451b0cb206..1488cf7711 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -411,6 +411,8 @@ static int hf_nfs_stripedevs4 = -1;
static int hf_nfs_devaddr4 = -1;
static int hf_nfs_return_on_close4 = -1;
static int hf_nfs_slotid4 = -1;
+static int hf_nfs_high_slotid4 = -1;
+static int hf_nfs_target_high_slotid4 = -1;
static int hf_nfs_sr_status4 = -1;
static int hf_nfs_serverscope4 = -1;
static int hf_nfs_minorid4 = -1;
@@ -9436,7 +9438,7 @@ dissect_nfs_argop4(tvbuff_t *tvb, int offset, packet_info *pinfo,
FALSE, NULL, NULL);
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);
break;
@@ -9851,8 +9853,8 @@ dissect_nfs_resop4(tvbuff_t *tvb, int offset, packet_info *pinfo,
FALSE, NULL, NULL);
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);
offset = dissect_rpc_uint32(tvb, newftree, hf_nfs_sr_status4,
offset);
break;
@@ -11791,6 +11793,13 @@ proto_register_nfs(void)
{ &hf_nfs_slotid4, {
"slot ID", "nfs.slotid4", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
+
+ { &hf_nfs_high_slotid4, {
+ "high slot id", "nfs.high.slotid4", 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,
+ NULL, 0, NULL, HFILL }},
{ &hf_nfs_sr_status4, {
"status", "nfs.status", FT_UINT32, BASE_DEC,