Wireshark · Ethereal-dev: [Ethereal-dev] More NFSv4 patches...

[Mike Frisch <mfrisch@xxxxxxxxxx>]

This should be it from Connectathon.

Index: packet-nfs.c
===================================================================
RCS file: /cvsroot/ethereal/packet-nfs.c,v
retrieving revision 1.67
diff -u -r1.67 packet-nfs.c
--- packet-nfs.c	2002/03/06 04:02:02	1.67
+++ packet-nfs.c	2002/03/07 04:50:47
@@ -5217,7 +5217,7 @@
 
 int
 dissect_nfs_open_claim4(tvbuff_t *tvb, int offset, packet_info *pinfo,
-	proto_tree *tree, char *name)
+	proto_tree *tree)
 {
 	guint open_claim_type4;
 	proto_item *fitem = NULL;
@@ -5986,13 +5986,13 @@
 			break;
 
 		case NFS4_OP_OPEN:
-			offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nfs_seqid4, offset);
+			offset = dissect_rpc_uint32(tvb, pinfo, newftree, hf_nfs_seqid4, 
+				offset);
 			offset = dissect_nfs_open4_share_access(tvb, offset, pinfo, newftree);
 			offset = dissect_nfs_open4_share_deny(tvb, offset, pinfo, newftree);
 			offset = dissect_nfs_open_owner4(tvb, offset, pinfo, newftree);
 			offset = dissect_nfs_openflag4(tvb, offset, pinfo, newftree);
-			offset = dissect_nfs_open_claim4(tvb, offset, pinfo, newftree, 
-				"claim");
+			offset = dissect_nfs_open_claim4(tvb, offset, pinfo, newftree);
 			break;
 
 		case NFS4_OP_OPENATTR:
@@ -6002,12 +6002,14 @@
 
 		case NFS4_OP_OPEN_CONFIRM:
 			offset = dissect_nfs_stateid4(tvb, offset, pinfo, newftree);
-			offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nfs_seqid4, offset);
+			offset = dissect_rpc_uint32(tvb, pinfo, newftree, hf_nfs_seqid4, 
+				offset);
 			break;
 
 		case NFS4_OP_OPEN_DOWNGRADE:
 			offset = dissect_nfs_stateid4(tvb, offset, pinfo, newftree);
-			offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nfs_seqid4, offset);
+			offset = dissect_rpc_uint32(tvb, pinfo, newftree, hf_nfs_seqid4, 
+				offset);
 			offset = dissect_nfs_open4_share_access(tvb, offset, pinfo, newftree);
 			offset = dissect_nfs_open4_share_deny(tvb, offset, pinfo, newftree);
 			break;