Was this patch overlooked? I wanted to get this patch into the tree prior
to the NFSv4 bake-off coming in a week or so.
--- Begin Message ---
The enclosed patch fixes problems with SETCLIENTID and SETCLIENTID_REPLY
decoding. This should now in in-sync with the latest protocol draft.
Index: packet-nfs.c
===================================================================
RCS file: /cvsroot/ethereal/packet-nfs.c,v
retrieving revision 1.80
diff -u -r1.80 packet-nfs.c
--- packet-nfs.c 2002/08/28 21:00:23 1.80
+++ packet-nfs.c 2002/10/10 17:08:01
@@ -6308,6 +6308,7 @@
case NFS4_OP_SETCLIENTID_CONFIRM:
offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_clientid4,
offset);
+ offset = dissect_rpc_uint64(tvb, newftree, hf_nfs_verifier4,
offset);
break;
case NFS4_OP_VERIFY:
@@ -6532,8 +6533,12 @@
case NFS4_OP_SETCLIENTID:
if (status == NFS4_OK)
+ {
offset = dissect_rpc_uint64(tvb, newftree,
hf_nfs_clientid4,
offset);
+ offset = dissect_rpc_uint64(tvb, newftree,
hf_nfs_verifier4,
+ offset);
+ }
else
if (status == NFS4ERR_CLID_INUSE)
offset = dissect_nfs_clientaddr4(tvb, offset,
newftree);
@@ -7379,7 +7384,7 @@
NULL, 0, "nfs.cb_location", HFILL }},
{ &hf_nfs_cb_program, {
- "cb_program", "nfs.cb_program", FT_UINT32, BASE_DEC,
+ "cb_program", "nfs.cb_program", FT_UINT32, BASE_HEX,
NULL, 0, "nfs.cb_program", HFILL }},
{ &hf_nfs_recall4, {
--- End Message ---
