nfs v3 support from tcpdump.org/netbsd; tests with pedro, marius

1 files changed, 1040 insertions, 245 deletions

diff --git a/usr.sbin/tcpdump/print-nfs.c b/usr.sbin/tcpdump/print-nfs.c
index 3558d7e0729..c576607ad53 100644
--- a/usr.sbin/tcpdump/print-nfs.c
+++ b/usr.sbin/tcpdump/print-nfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-nfs.c,v 1.11 2002/02/19 19:39:40 millert Exp $	*/
+/*	$OpenBSD: print-nfs.c,v 1.12 2004/09/16 11:26:39 markus Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -50,34 +50,249 @@ struct rtentry;
 #include "interface.h"
 #include "addrtoname.h"
 
-#include "nfsv2.h"
+#include "nfs.h"
 #include "nfsfh.h"
 
-static void nfs_printfh(const u_int32_t *);
-static void xid_map_enter(const struct rpc_msg *, const struct ip *);
-static u_int32_t xid_map_find(const struct rpc_msg *, const struct ip *,
-    u_int32_t *);
-static void interp_reply(const struct rpc_msg *, u_int32_t, u_int);
+static void nfs_printfh(const u_int32_t *, const u_int);
+static void xid_map_enter(const struct rpc_msg *, const u_char *);
+static int32_t xid_map_find(const struct rpc_msg *, const u_char *,
+			    u_int32_t *, u_int32_t *);
+static void interp_reply(const struct rpc_msg *, u_int32_t, u_int32_t, int);
+static const u_int32_t *parse_post_op_attr(const u_int32_t *, int);
+static void print_sattr3(const struct nfsv3_sattr *sa3, int verbose);
+static int print_int64(const u_int32_t *dp, int how);
+
+/*
+ * Mapping of old NFS Version 2 RPC numbers to generic numbers.
+ */
+u_int32_t nfsv3_procid[NFS_NPROCS] = {
+	NFSPROC_NULL,
+	NFSPROC_GETATTR,
+	NFSPROC_SETATTR,
+	NFSPROC_NOOP,
+	NFSPROC_LOOKUP,
+	NFSPROC_READLINK,
+	NFSPROC_READ,
+	NFSPROC_NOOP,
+	NFSPROC_WRITE,
+	NFSPROC_CREATE,
+	NFSPROC_REMOVE,
+	NFSPROC_RENAME,
+	NFSPROC_LINK,
+	NFSPROC_SYMLINK,
+	NFSPROC_MKDIR,
+	NFSPROC_RMDIR,
+	NFSPROC_READDIR,
+	NFSPROC_FSSTAT,
+	NFSPROC_NOOP,
+	NFSPROC_NOOP,
+	NFSPROC_NOOP,
+	NFSPROC_NOOP,
+	NFSPROC_NOOP,
+	NFSPROC_NOOP,
+	NFSPROC_NOOP,
+	NFSPROC_NOOP
+};
+
+/*
+ * NFS V2 and V3 status values.
+ *
+ * Some of these come from the RFCs for NFS V2 and V3, with the message
+ * strings taken from the FreeBSD C library "errlst.c".
+ *
+ * Others are errors that are not in the RFC but that I suspect some
+ * NFS servers could return; the values are FreeBSD errno values, as
+ * the first NFS server was the SunOS 2.0 one, and until 5.0 SunOS
+ * was primarily BSD-derived.
+ */
+static struct tok status2str[] = {
+	{ 1,     "Operation not permitted" },	/* EPERM */
+	{ 2,     "No such file or directory" },	/* ENOENT */
+	{ 5,     "Input/output error" },	/* EIO */
+	{ 6,     "Device not configured" },	/* ENXIO */
+	{ 11,    "Resource deadlock avoided" },	/* EDEADLK */
+	{ 12,    "Cannot allocate memory" },	/* ENOMEM */
+	{ 13,    "Permission denied" },		/* EACCES */
+	{ 17,    "File exists" },		/* EEXIST */
+	{ 18,    "Cross-device link" },		/* EXDEV */
+	{ 19,    "Operation not supported by device" }, /* ENODEV */
+	{ 20,    "Not a directory" },		/* ENOTDIR */
+	{ 21,    "Is a directory" },		/* EISDIR */
+	{ 22,    "Invalid argument" },		/* EINVAL */
+	{ 26,    "Text file busy" },		/* ETXTBSY */
+	{ 27,    "File too large" },		/* EFBIG */
+	{ 28,    "No space left on device" },	/* ENOSPC */
+	{ 30,    "Read-only file system" },	/* EROFS */
+	{ 31,    "Too many links" },		/* EMLINK */
+	{ 45,    "Operation not supported" },	/* EOPNOTSUPP */
+	{ 62,    "Too many levels of symbolic links" }, /* ELOOP */
+	{ 63,    "File name too long" },	/* ENAMETOOLONG */
+	{ 66,    "Directory not empty" },	/* ENOTEMPTY */
+	{ 69,    "Disc quota exceeded" },	/* EDQUOT */
+	{ 70,    "Stale NFS file handle" },	/* ESTALE */
+	{ 71,    "Too many levels of remote in path" }, /* EREMOTE */
+	{ 99,    "Write cache flushed to disk" }, /* NFSERR_WFLUSH (not used) */
+	{ 10001, "Illegal NFS file handle" },	/* NFS3ERR_BADHANDLE */
+	{ 10002, "Update synchronization mismatch" }, /* NFS3ERR_NOT_SYNC */
+	{ 10003, "READDIR/READDIRPLUS cookie is stale" }, /* NFS3ERR_BAD_COOKIE */
+	{ 10004, "Operation not supported" },	/* NFS3ERR_NOTSUPP */
+	{ 10005, "Buffer or request is too small" }, /* NFS3ERR_TOOSMALL */
+	{ 10006, "Unspecified error on server" }, /* NFS3ERR_SERVERFAULT */
+	{ 10007, "Object of that type not supported" }, /* NFS3ERR_BADTYPE */
+	{ 10008, "Request couldn't be completed in time" }, /* NFS3ERR_JUKEBOX */
+	{ 0,     NULL }
+};
+
+static struct tok nfsv3_writemodes[] = {
+	{ 0,		"unstable" },
+	{ 1,		"datasync" },
+	{ 2,		"filesync" },
+	{ 0,		NULL }
+};
+
+static struct tok type2str[] = {
+	{ NFNON,	"NON" },
+	{ NFREG,	"REG" },
+	{ NFDIR,	"DIR" },
+	{ NFBLK,	"BLK" },
+	{ NFCHR,	"CHR" },
+	{ NFLNK,	"LNK" },
+	{ NFFIFO,	"FIFO" },
+	{ 0,		NULL }
+};
+
+/*
+ * Print out a 64-bit integer. This appears to be different on each system,
+ * try to make the best of it. The integer stored as 2 consecutive XDR
+ * encoded 32-bit integers, to which a pointer is passed.
+ *
+ * Assume that a system that has INT64_FORMAT defined, has a 64-bit
+ * integer datatype and can print it.
+ */ 
+
+#define UNSIGNED 0
+#define SIGNED   1
+#define HEX      2
+
+static int print_int64(const u_int32_t *dp, int how)
+{
+#ifdef INT64_FORMAT
+	u_int64_t res;
+
+	res = ((u_int64_t)ntohl(dp[0]) << 32) | (u_int64_t)ntohl(dp[1]);
+	switch (how) {
+	case SIGNED:
+		printf(INT64_FORMAT, res);
+		break;
+	case UNSIGNED:
+		printf(U_INT64_FORMAT, res);
+		break;
+	case HEX:
+		printf(HEX_INT64_FORMAT, res);
+		break;
+	default:
+		return (0);
+	}
+#else
+	switch (how) {
+	case SIGNED:
+	case UNSIGNED:
+	case HEX:
+		if (dp[0])
+			printf("0x%x%08x", (u_int32_t)ntohl(dp[0]),
+			    (u_int32_t)ntohl(dp[1]));
+		else
+			printf("0x%x", (u_int32_t)ntohl(dp[1]));
+		break;
+	default:
+		return (0);
+	}
+#endif
+	return 1;
+}
+
+static const u_int32_t *
+parse_sattr3(const u_int32_t *dp, struct nfsv3_sattr *sa3)
+{
+	TCHECK(dp[0]);
+	if ((sa3->sa_modeset = ntohl(*dp++))) {
+		TCHECK(dp[0]);
+		sa3->sa_mode = ntohl(*dp++);
+	}
+
+	TCHECK(dp[0]);
+	if ((sa3->sa_uidset = ntohl(*dp++))) {
+		TCHECK(dp[0]);
+		sa3->sa_uid = ntohl(*dp++);
+	}
+
+	TCHECK(dp[0]);
+	if ((sa3->sa_gidset = ntohl(*dp++))) {
+		TCHECK(dp[0]);
+		sa3->sa_gid = ntohl(*dp++);
+	}
+
+	TCHECK(dp[0]);
+	if ((sa3->sa_sizeset = ntohl(*dp++))) {
+		TCHECK(dp[0]);
+		sa3->sa_size = ntohl(*dp++);
+	}
+
+	TCHECK(dp[0]);
+	if ((sa3->sa_atimetype = ntohl(*dp++)) == NFSV3SATTRTIME_TOCLIENT) {
+		TCHECK(dp[1]);
+		sa3->sa_atime.nfsv3_sec = ntohl(*dp++);
+		sa3->sa_atime.nfsv3_nsec = ntohl(*dp++);
+	}
+
+	TCHECK(dp[0]);
+	if ((sa3->sa_mtimetype = ntohl(*dp++)) == NFSV3SATTRTIME_TOCLIENT) {
+		TCHECK(dp[1]);
+		sa3->sa_mtime.nfsv3_sec = ntohl(*dp++);
+		sa3->sa_mtime.nfsv3_nsec = ntohl(*dp++);
+	}
+
+	return dp;
+trunc:
+	return NULL;
+}
 
 static int nfserr;		/* true if we error rather than trunc */
 
+static void
+print_sattr3(const struct nfsv3_sattr *sa3, int verbose)
+{
+	if (sa3->sa_modeset)
+		printf(" mode %o", sa3->sa_mode);
+	if (sa3->sa_uidset)
+		printf(" uid %u", sa3->sa_uid);
+	if (sa3->sa_gidset)
+		printf(" gid %u", sa3->sa_gid);
+	if (verbose > 1) {
+		if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT)
+			printf(" atime %u.%06u", sa3->sa_atime.nfsv3_sec,
+			       sa3->sa_atime.nfsv3_nsec);
+		if (sa3->sa_mtimetype == NFSV3SATTRTIME_TOCLIENT)
+			printf(" mtime %u.%06u", sa3->sa_mtime.nfsv3_sec,
+			       sa3->sa_mtime.nfsv3_nsec);
+	}
+}
+
 void
 nfsreply_print(register const u_char *bp, u_int length,
 	       register const u_char *bp2)
 {
 	register const struct rpc_msg *rp;
-	register const struct ip *ip;
-	u_int32_t proc;
+	u_int32_t proc, vers;
 
 	nfserr = 0;		/* assume no error */
 	rp = (const struct rpc_msg *)bp;
-	ip = (const struct ip *)bp2;
 
 	printf("xid 0x%x reply %s %d", (u_int32_t)ntohl(rp->rm_xid),
 		ntohl(rp->rm_reply.rp_stat) == MSG_ACCEPTED ? "ok":"ERR",
 		length);
-	if (xid_map_find(rp, ip, &proc))
-		interp_reply(rp, proc, length);
+	if (xid_map_find(rp, bp2, &proc, &vers) >= 0)
+		interp_reply(rp, proc, vers, length);
 }
 
 /*
@@ -115,12 +330,22 @@ trunc:
  * If packet was truncated, return 0.
  */
 static const u_int32_t *
-parsefh(register const u_int32_t *dp)
+parsefh(register const u_int32_t *dp, int v3)
 {
-	if (dp + 8 <= (u_int32_t *)snapend) {
-		nfs_printfh(dp);
-		return (dp + 8);
+	int len;
+
+	if (v3) {
+		TCHECK(dp[0]);
+		len = (int)ntohl(*dp) / 4;
+		dp++;
+	} else
+		len = NFSX_V2FH / 4;
+
+	if (TTEST2(*dp, len * sizeof(*dp))) {
+		nfs_printfh(dp, len);
+		return (dp + len);
 	}
+trunc:
 	return (NULL);
 }
 
@@ -135,24 +360,25 @@ parsefn(register const u_int32_t *dp)
 	register const u_char *cp;
 
 	/* Bail if we don't have the string length */
-	if ((u_char *)dp > snapend - sizeof(*dp))
-		return (NULL);
+	TCHECK(*dp);
 
 	/* Fetch string length; convert to host order */
 	len = *dp++;
 	NTOHL(len);
 
+	TCHECK2(*dp, ((len + 3) & ~3));
+
 	cp = (u_char *)dp;
 	/* Update 32-bit pointer (NFS filenames padded to 32-bit boundaries) */
 	dp += ((len + 3) & ~3) / sizeof(*dp);
-	if ((u_char *)dp > snapend)
-		return (NULL);
 	/* XXX seems like we should be checking the length */
 	putchar('"');
 	(void) fn_printn(cp, len, NULL);
 	putchar('"');
 
 	return (dp);
+trunc:
+	return NULL;
 }
 
 /*
@@ -161,9 +387,9 @@ parsefn(register const u_int32_t *dp)
  * If packet was truncated (or there was some other error), return 0.
  */
 static const u_int32_t *
-parsefhn(register const u_int32_t *dp)
+parsefhn(register const u_int32_t *dp, int v3)
 {
-	dp = parsefh(dp);
+	dp = parsefh(dp, v3);
 	if (dp == NULL)
 		return (NULL);
 	putchar(' ');
@@ -175,116 +401,187 @@ nfsreq_print(register const u_char *bp, u_int length,
     register const u_char *bp2)
 {
 	register const struct rpc_msg *rp;
-	register const struct ip *ip;
 	register const u_int32_t *dp;
+	nfstype type;
+	int v3;
+	u_int32_t proc;
+	struct nfsv3_sattr sa3;
 
 	nfserr = 0;		/* assume no error */
 	rp = (const struct rpc_msg *)bp;
-	ip = (const struct ip *)bp2;
 	printf("xid 0x%x %d", (u_int32_t)ntohl(rp->rm_xid), length);
 
-	xid_map_enter(rp, ip);	/* record proc number for later on */
+	xid_map_enter(rp, bp2);	/* record proc number for later on */
+
+	v3 = (ntohl(rp->rm_call.cb_vers) == NFS_VER3);
+	proc = ntohl(rp->rm_call.cb_proc);
+
+	if (!v3 && proc < NFS_NPROCS)
+		proc =  nfsv3_procid[proc];
 
-	switch (ntohl(rp->rm_call.cb_proc)) {
-#ifdef NFSPROC_NOOP
+	switch (proc) {
 	case NFSPROC_NOOP:
 		printf(" nop");
 		return;
-#else
-#define NFSPROC_NOOP -1
-#endif
 	case NFSPROC_NULL:
 		printf(" null");
 		return;
 
 	case NFSPROC_GETATTR:
 		printf(" getattr");
-		if ((dp = parsereq(rp, length)) != NULL && parsefh(dp) != NULL)
+		if ((dp = parsereq(rp, length)) != NULL &&
+		    parsefh(dp, v3) != NULL)
 			return;
 		break;
 
 	case NFSPROC_SETATTR:
 		printf(" setattr");
-		if ((dp = parsereq(rp, length)) != NULL && parsefh(dp) != NULL)
+		if ((dp = parsereq(rp, length)) != NULL &&
+		    parsefh(dp, v3) != NULL)
 			return;
 		break;
 
-#if NFSPROC_ROOT != NFSPROC_NOOP
-	case NFSPROC_ROOT:
-		printf(" root");
-		break;
-#endif
 	case NFSPROC_LOOKUP:
 		printf(" lookup");
-		if ((dp = parsereq(rp, length)) != NULL && parsefhn(dp) != NULL)
+		if ((dp = parsereq(rp, length)) != NULL &&
+		    parsefhn(dp, v3) != NULL)
 			return;
 		break;
 
+	case NFSPROC_ACCESS:
+		printf(" access");
+		if ((dp = parsereq(rp, length)) != NULL &&
+		    (dp = parsefh(dp, v3)) != NULL) {
+			TCHECK(dp[0]);
+			printf(" %04x", (u_int32_t)ntohl(dp[0]));
+			return;
+		}
+		break;
+
 	case NFSPROC_READLINK:
 		printf(" readlink");
-		if ((dp = parsereq(rp, length)) != NULL && parsefh(dp) != NULL)
+		if ((dp = parsereq(rp, length)) != NULL &&
+		    parsefh(dp, v3) != NULL)
 			return;
 		break;
 
 	case NFSPROC_READ:
 		printf(" read");
 		if ((dp = parsereq(rp, length)) != NULL &&
-		    (dp = parsefh(dp)) != NULL) {
-			TCHECK2(dp[0], 3 * sizeof(*dp));
-			printf(" %u bytes @ %u",
-			    (u_int32_t)ntohl(dp[1]),
-			    (u_int32_t)ntohl(dp[0]));
+		    (dp = parsefh(dp, v3)) != NULL) {
+			if (v3) {
+				TCHECK(dp[2]);
+				printf(" %u bytes @ ",
+				       (u_int32_t) ntohl(dp[2]));
+				print_int64(dp, UNSIGNED);
+			} else {
+				TCHECK(dp[1]);
+				printf(" %u bytes @ %u",
+				    (u_int32_t)ntohl(dp[1]),
+				    (u_int32_t)ntohl(dp[0]));
+			}
 			return;
 		}
 		break;
 
-#if NFSPROC_WRITECACHE != NFSPROC_NOOP
-	case NFSPROC_WRITECACHE:
-		printf(" writecache");
-		if ((dp = parsereq(rp, length)) != NULL &&
-		    (dp = parsefh(dp)) != NULL) {
-			TCHECK2(dp[0], 4 * sizeof(*dp));
-			printf(" %u (%u) bytes @ %u (%u)",
-			    (u_int32_t)ntohl(dp[3]),
-			    (u_int32_t)ntohl(dp[2]),
-			    (u_int32_t)ntohl(dp[1]),
-			    (u_int32_t)ntohl(dp[0]));
-			return;
-		}
-		break;
-#endif
 	case NFSPROC_WRITE:
 		printf(" write");
 		if ((dp = parsereq(rp, length)) != NULL &&
-		    (dp = parsefh(dp)) != NULL) {
-			TCHECK2(dp[0], 4 * sizeof(*dp));
-			printf(" %u (%u) bytes @ %u (%u)",
-			    (u_int32_t)ntohl(dp[3]),
-			    (u_int32_t)ntohl(dp[2]),
-			    (u_int32_t)ntohl(dp[1]),
-			    (u_int32_t)ntohl(dp[0]));
+		    (dp = parsefh(dp, v3)) != NULL) {
+			if (v3) {
+				TCHECK(dp[4]);
+				printf(" %u bytes @ ",
+						(u_int32_t) ntohl(dp[4]));
+				print_int64(dp, UNSIGNED);
+				if (vflag) {
+					dp += 3;
+					TCHECK(dp[0]);
+					printf(" <%s>",
+						tok2str(nfsv3_writemodes,
+							NULL, ntohl(*dp)));
+				}
+			} else {
+				TCHECK(dp[3]);
+				printf(" %u (%u) bytes @ %u (%u)",
+						(u_int32_t)ntohl(dp[3]),
+						(u_int32_t)ntohl(dp[2]),
+						(u_int32_t)ntohl(dp[1]),
+						(u_int32_t)ntohl(dp[0]));
+			}
 			return;
 		}
 		break;
 
 	case NFSPROC_CREATE:
 		printf(" create");
-		if ((dp = parsereq(rp, length)) != NULL && parsefhn(dp) != NULL)
+		if ((dp = parsereq(rp, length)) != NULL &&
+		    parsefhn(dp, v3) != NULL)
+			return;
+		break;
+
+	case NFSPROC_MKDIR:
+		printf(" mkdir");
+		if ((dp = parsereq(rp, length)) != 0 && parsefhn(dp, v3) != 0)
 			return;
 		break;
 
+	case NFSPROC_SYMLINK:
+		printf(" symlink");
+		if ((dp = parsereq(rp, length)) != 0 &&
+		    (dp = parsefhn(dp, v3)) != 0) {
+			fputs(" ->", stdout);
+			if (v3 && (dp = parse_sattr3(dp, &sa3)) == 0)
+				break;
+			if (parsefn(dp) == 0)
+				break;
+			if (v3 && vflag)
+				print_sattr3(&sa3, vflag);
+			return;
+		}
+		break;
+
+	case NFSPROC_MKNOD:
+		printf(" mknod");
+		if ((dp = parsereq(rp, length)) != 0 &&
+		    (dp = parsefhn(dp, v3)) != 0) {
+			TCHECK(*dp);
+			type = (nfstype)ntohl(*dp++);
+			if ((dp = parse_sattr3(dp, &sa3)) == 0)
+				break;
+			printf(" %s", tok2str(type2str, "unk-ft %d", type));
+			if (vflag && (type == NFCHR || type == NFBLK)) {
+				TCHECK(dp[1]);
+				printf(" %u/%u",
+				       (u_int32_t)ntohl(dp[0]),
+				       (u_int32_t)ntohl(dp[1]));
+				dp += 2;
+			}
+			if (vflag)
+				print_sattr3(&sa3, vflag);
+			return;
+		}
+		break;
+
 	case NFSPROC_REMOVE:
 		printf(" remove");
-		if ((dp = parsereq(rp, length)) != NULL && parsefhn(dp) != NULL)
+		if ((dp = parsereq(rp, length)) != NULL &&
+		    parsefhn(dp, v3) != NULL)
+			return;
+		break;
+
+	case NFSPROC_RMDIR:
+		printf(" rmdir");
+		if ((dp = parsereq(rp, length)) != NULL &&
+		    parsefhn(dp, v3) != NULL)
 			return;
 		break;
 
 	case NFSPROC_RENAME:
 		printf(" rename");
 		if ((dp = parsereq(rp, length)) != NULL &&
-		    (dp = parsefhn(dp)) != NULL) {
+		    (dp = parsefhn(dp, v3)) != NULL) {
 			fputs(" ->", stdout);
-			if (parsefhn(dp) != NULL)
+			if (parsefhn(dp, v3) != NULL)
 				return;
 		}
 		break;
@@ -292,61 +589,97 @@ nfsreq_print(register const u_char *bp, u_int length,
 	case NFSPROC_LINK:
 		printf(" link");
 		if ((dp = parsereq(rp, length)) != NULL &&
-		    (dp = parsefh(dp)) != NULL) {
+		    (dp = parsefh(dp, v3)) != NULL) {
 			fputs(" ->", stdout);
-			if (parsefhn(dp) != NULL)
+			if (parsefhn(dp, v3) != NULL)
 				return;
 		}
 		break;
 
-	case NFSPROC_SYMLINK:
-		printf(" symlink");
+	case NFSPROC_READDIR:
+		printf(" readdir");
 		if ((dp = parsereq(rp, length)) != NULL &&
-		    (dp = parsefhn(dp)) != NULL) {
-			fputs(" -> ", stdout);
-			if (parsefn(dp) != NULL)
-				return;
+		    (dp = parsefh(dp, v3)) != NULL) {
+			if (v3) {
+				TCHECK(dp[4]);
+				/*
+				 * We shouldn't really try to interpret the
+				 * offset cookie here.
+				 */
+				printf(" %u bytes @ ",
+				    (u_int32_t) ntohl(dp[4]));
+				print_int64(dp, SIGNED);
+				if (vflag)
+					printf(" verf %08x%08x", dp[2],
+					       dp[3]);
+			} else {
+				TCHECK(dp[1]);
+				/*
+				 * Print the offset as signed, since -1 is
+				 * common, but offsets > 2^31 aren't.
+				 */
+				printf(" %u bytes @ %d",
+				    (u_int32_t)ntohl(dp[1]),
+				    (u_int32_t)ntohl(dp[0]));
+			}
+			return;
 		}
 		break;
 
-	case NFSPROC_MKDIR:
-		printf(" mkdir");
-		if ((dp = parsereq(rp, length)) != NULL && parsefhn(dp) != NULL)
+	case NFSPROC_READDIRPLUS:
+		printf(" readdirplus");
+		if ((dp = parsereq(rp, length)) != NULL &&
+		    (dp = parsefh(dp, v3)) != NULL) {
+			TCHECK(dp[4]);
+			/*
+			 * We don't try to interpret the offset
+			 * cookie here.
+			 */
+			printf(" %u bytes @ ", (u_int32_t) ntohl(dp[4]));
+			print_int64(dp, SIGNED);
+			if (vflag)
+				printf(" max %u verf %08x%08x",
+				       (u_int32_t) ntohl(dp[5]), dp[2], dp[3]);
 			return;
+		}
 		break;
 
-	case NFSPROC_RMDIR:
-		printf(" rmdir");
-		if ((dp = parsereq(rp, length)) != NULL && parsefhn(dp) != NULL)
+	case NFSPROC_FSSTAT:
+		printf(" fsstat");
+		if ((dp = parsereq(rp, length)) != NULL &&
+		    parsefh(dp, v3) != NULL)
 			return;
 		break;
 
-	case NFSPROC_READDIR:
-		printf(" readdir");
+	case NFSPROC_FSINFO:
+		printf(" fsinfo");
 		if ((dp = parsereq(rp, length)) != NULL &&
-		    (dp = parsefh(dp)) != NULL) {
-			TCHECK2(dp[0], 2 * sizeof(*dp));
-			/*
-			 * Print the offset as signed, since -1 is common,
-			 * but offsets > 2^31 aren't.
-			 */
-			printf(" %u bytes @ %d",
-			    (u_int32_t)ntohl(dp[1]),
-			    (u_int32_t)ntohl(dp[0]));
+		    parsefh(dp, v3) != NULL)
 			return;
-		}
 		break;
 
-	case NFSPROC_STATFS:
-		printf(" statfs");
-		if ((dp = parsereq(rp, length)) != NULL && parsefh(dp) != NULL)
+	case NFSPROC_PATHCONF:
+		printf(" pathconf");
+		if ((dp = parsereq(rp, length)) != NULL &&
+		    parsefh(dp, v3) != NULL)
 			return;
 		break;
 
+	case NFSPROC_COMMIT:
+		printf(" commit");
+		if ((dp = parsereq(rp, length)) != NULL &&
+		    (dp = parsefh(dp, v3)) != NULL) {
+			printf(" %u bytes @ ", (u_int32_t) ntohl(dp[2]));
+			print_int64(dp, UNSIGNED);
+			return;
+		}
+		break;
+
 	default:
 		printf(" proc-%u", (u_int32_t)ntohl(rp->rm_call.cb_proc));
 		return;
 	}
+
 trunc:
 	if (!nfserr)
 		fputs(" [|nfs]", stdout);
@@ -362,7 +695,7 @@ trunc:
  * additional hacking on the parser code.
  */
 static void
-nfs_printfh(register const u_int32_t *dp)
+nfs_printfh(register const u_int32_t *dp, const u_int len)
 {
 	my_fsid fsid;
 	ino_t ino;
@@ -372,7 +705,7 @@ nfs_printfh(register const u_int32_t *dp)
 
 	if (sfsname) {
 		/* file system ID is ASCII, not numeric, for this server OS */
-		static char temp[NFS_FHSIZE+1];
+		static char temp[NFSX_V3FHMAX+1];
 
 		/* Make sure string is null-terminated */
 		strlcpy(temp, sfsname, sizeof(temp));
@@ -395,10 +728,12 @@ nfs_printfh(register const u_int32_t *dp)
  */
 
 struct xid_map_entry {
-	u_int32_t		xid;		/* transaction ID (net order) */
+	u_int32_t	xid;		/* transaction ID (net order) */
+	int ipver;			/* IP version (4 or 6) */
 	struct in_addr	client;		/* client IP address (net order) */
 	struct in_addr	server;		/* server IP address (net order) */
-	u_int32_t		proc;		/* call proc number (host order) */
+	u_int32_t	proc;		/* call proc number (host order) */
+	u_int32_t	vers;		/* program version (host order) */
 };
 
 /*
@@ -415,48 +750,74 @@ int	xid_map_next = 0;
 int	xid_map_hint = 0;
 
 static void
-xid_map_enter(const struct rpc_msg *rp, const struct ip *ip)
+xid_map_enter(const struct rpc_msg *rp, const u_char *bp)
 {
+	struct ip *ip = NULL;
 	struct xid_map_entry *xmep;
 
+	ip = (struct ip *)bp;
+
 	xmep = &xid_map[xid_map_next];
 
 	if (++xid_map_next >= XIDMAPSIZE)
 		xid_map_next = 0;
 
 	xmep->xid = rp->rm_xid;
-	xmep->client = ip->ip_src;
-	xmep->server = ip->ip_dst;
+	xmep->ipver = 4;
+	memcpy(&xmep->client, &ip->ip_src, sizeof(ip->ip_src));
+	memcpy(&xmep->server, &ip->ip_dst, sizeof(ip->ip_dst));
 	xmep->proc = ntohl(rp->rm_call.cb_proc);
+	xmep->vers = ntohl(rp->rm_call.cb_vers);
 }
 
-/* Returns true and sets proc success or false on failure */
-static u_int32_t
-xid_map_find(const struct rpc_msg *rp, const struct ip *ip, u_int32_t *proc)
+/*
+ * Returns 0 and puts NFSPROC_xxx in proc return and
+ * version in vers return, or returns -1 on failure
+ */
+static int
+xid_map_find(const struct rpc_msg *rp, const u_char *bp, u_int32_t *proc,
+	     u_int32_t *vers)
 {
 	int i;
 	struct xid_map_entry *xmep;
 	u_int32_t xid = rp->rm_xid;
-	u_int32_t clip = ip->ip_dst.s_addr;
-	u_int32_t sip = ip->ip_src.s_addr;
+	struct ip *ip = (struct ip *)bp;
+	int cmp;
 
 	/* Start searching from where we last left off */
-	i = xid_map_hint;
+	i = xid_map_hint; 
 	do {
 		xmep = &xid_map[i];
-		if (xmep->xid == xid && xmep->client.s_addr == clip &&
-		    xmep->server.s_addr == sip) {
+		cmp = 1;
+		if (xmep->ipver != ip->ip_v || xmep->xid != xid)
+			goto nextitem;
+		switch (xmep->ipver) {
+		case 4:
+			if (memcmp(&ip->ip_src, &xmep->server,
+				   sizeof(ip->ip_src)) != 0 ||
+			    memcmp(&ip->ip_dst, &xmep->client,
+				   sizeof(ip->ip_dst)) != 0) {
+				cmp = 0;
+			}
+			break;
+		default:
+			cmp = 0;
+			break;
+		}
+		if (cmp) {
 			/* match */
 			xid_map_hint = i;
 			*proc = xmep->proc;
-			return (1);
+			*vers = xmep->vers;
+			return 0;
 		}
+	nextitem:
 		if (++i >= XIDMAPSIZE)
 			i = 0;
 	} while (i != xid_map_hint);
 
 	/* search failed */
-	return (0);
+	return (-1);
 }
 
 /*
@@ -490,7 +851,7 @@ parserep(register const struct rpc_msg *rp, register u_int length)
 	 * which is an "enum" and so occupies one 32-bit word.
 	 */
 	dp = ((const u_int32_t *)&rp->rm_reply) + 1;
-	TCHECK2(dp[0], 1);
+	TCHECK(dp[1]);
 	len = ntohl(dp[1]);
 	if (len >= length)
 		return (NULL);
@@ -540,138 +901,198 @@ parserep(register const struct rpc_msg *rp, register u_int length)
 		return (NULL);
 	}
 	/* successful return */
-	if ((sizeof(astat) + ((u_char *)dp)) < snapend)
-		return ((u_int32_t *) (sizeof(astat) + ((char *)dp)));
-
+	TCHECK2(*dp, sizeof(astat));
+	return ((u_int32_t *) (sizeof(astat) + ((char *)dp)));
 trunc:
-	return (NULL);
+	return (0);
 }
 
 static const u_int32_t *
-parsestatus(const u_int32_t *dp)
+parsestatus(const u_int32_t *dp, int *er)
 {
-	register int errnum;
+	int errnum;
 
 	TCHECK(dp[0]);
+
 	errnum = ntohl(dp[0]);
+	if (er)
+		*er = errnum;
 	if (errnum != 0) {
 		if (!qflag)
-			printf(" ERROR: %s", pcap_strerror(errnum));
-		nfserr = 1;		/* suppress trunc string */
-		return (NULL);
+			printf(" ERROR: %s",
+			    tok2str(status2str, "unk %d", errnum));
+		nfserr = 1;
 	}
 	return (dp + 1);
 trunc:
-	return (NULL);
+	return NULL;
 }
 
-static struct tok type2str[] = {
-	{ NFNON,	"NON" },
-	{ NFREG,	"REG" },
-	{ NFDIR,	"DIR" },
-	{ NFBLK,	"BLK" },
-	{ NFCHR,	"CHR" },
-	{ NFLNK,	"LNK" },
-	{ 0,		NULL }
-};
-
 static const u_int32_t *
-parsefattr(const u_int32_t *dp, int verbose)
+parsefattr(const u_int32_t *dp, int verbose, int v3)
 {
-	const struct nfsv2_fattr *fap;
+	const struct nfs_fattr *fap;
 
-	fap = (const struct nfsv2_fattr *)dp;
+	fap = (const struct nfs_fattr *)dp;
+	TCHECK(fap->fa_gid);
 	if (verbose) {
-		TCHECK(fap->fa_nfssize);
-		printf(" %s %o ids %u/%u sz %u ",
+		printf(" %s %o ids %d/%d",
 		    tok2str(type2str, "unk-ft %d ",
 		    (u_int32_t)ntohl(fap->fa_type)),
 		    (u_int32_t)ntohl(fap->fa_mode),
 		    (u_int32_t)ntohl(fap->fa_uid),
-		    (u_int32_t)ntohl(fap->fa_gid),
-		    (u_int32_t)ntohl(fap->fa_nfssize));
+		    (u_int32_t) ntohl(fap->fa_gid));
+		if (v3) {
+			TCHECK(fap->fa3_size);
+			printf(" sz ");
+			print_int64((u_int32_t *)&fap->fa3_size, UNSIGNED);
+		} else {
+			TCHECK(fap->fa2_size);
+			printf(" sz %d", (u_int32_t) ntohl(fap->fa2_size));
+		}
 	}
 	/* print lots more stuff */
 	if (verbose > 1) {
-		TCHECK(fap->fa_nfsfileid);
-		printf("nlink %u rdev %x fsid %x nodeid %x a/m/ctime ",
-		    (u_int32_t)ntohl(fap->fa_nlink),
-		    (u_int32_t)ntohl(fap->fa_nfsrdev),
-		    (u_int32_t)ntohl(fap->fa_nfsfsid),
-		    (u_int32_t)ntohl(fap->fa_nfsfileid));
-		TCHECK(fap->fa_nfsatime);
-		printf("%u.%06u ",
-		    (u_int32_t)ntohl(fap->fa_nfsatime.nfs_sec),
-		    (u_int32_t)ntohl(fap->fa_nfsatime.nfs_usec));
-		TCHECK(fap->fa_nfsmtime);
-		printf("%u.%06u ",
-		    (u_int32_t)ntohl(fap->fa_nfsmtime.nfs_sec),
-		    (u_int32_t)ntohl(fap->fa_nfsmtime.nfs_usec));
-		TCHECK(fap->fa_nfsctime);
-		printf("%u.%06u ",
-		    (u_int32_t)ntohl(fap->fa_nfsctime.nfs_sec),
-		    (u_int32_t)ntohl(fap->fa_nfsctime.nfs_usec));
+		if (v3) {
+			TCHECK(fap->fa3_ctime);
+			printf(" nlink %d rdev %d/%d",
+			       (u_int32_t)ntohl(fap->fa_nlink),
+			       (u_int32_t) ntohl(fap->fa3_rdev.specdata1),
+			       (u_int32_t) ntohl(fap->fa3_rdev.specdata2));
+			printf(" fsid ");
+			print_int64((u_int32_t *)&fap->fa3_fsid, HEX);
+			printf(" fileid ");
+			print_int64((u_int32_t *)&fap->fa3_fileid, HEX);
+			printf(" a/m/ctime %u.%06u",
+			       (u_int32_t) ntohl(fap->fa3_atime.nfsv3_sec),
+			       (u_int32_t) ntohl(fap->fa3_atime.nfsv3_nsec));
+			printf(" %u.%06u",
+			       (u_int32_t) ntohl(fap->fa3_mtime.nfsv3_sec),
+			       (u_int32_t) ntohl(fap->fa3_mtime.nfsv3_nsec));
+			printf(" %u.%06u",
+			       (u_int32_t) ntohl(fap->fa3_ctime.nfsv3_sec),
+			       (u_int32_t) ntohl(fap->fa3_ctime.nfsv3_nsec));
+		} else {
+			TCHECK(fap->fa2_ctime);
+			printf("nlink %d rdev %x fsid %x fileid %x a/m/ctime",
+			       (u_int32_t) ntohl(fap->fa_nlink),
+			       (u_int32_t) ntohl(fap->fa2_rdev),
+			       (u_int32_t) ntohl(fap->fa2_fsid),
+			       (u_int32_t) ntohl(fap->fa2_fileid));
+			printf(" %u.%06u",
+			       (u_int32_t) ntohl(fap->fa2_atime.nfsv2_sec),
+			       (u_int32_t) ntohl(fap->fa2_atime.nfsv2_usec));
+			printf(" %u.%06u",
+			       (u_int32_t) ntohl(fap->fa2_mtime.nfsv2_sec),
+			       (u_int32_t) ntohl(fap->fa2_mtime.nfsv2_usec));
+			printf(" %u.%06u",
+			       (u_int32_t) ntohl(fap->fa2_ctime.nfsv2_sec),
+			       (u_int32_t) ntohl(fap->fa2_ctime.nfsv2_usec));
+		}
 	}
-	return ((const u_int32_t *)&fap[1]);
+	return ((const u_int32_t *)((unsigned char *)dp +
+		(v3 ? NFSX_V3FATTR : NFSX_V2FATTR)));
 trunc:
 	return (NULL);
 }
 
 static int
-parseattrstat(const u_int32_t *dp, int verbose)
+parseattrstat(const u_int32_t *dp, int verbose, int v3)
 {
+	int er;
 
-	dp = parsestatus(dp);
+	dp = parsestatus(dp, &er);
 	if (dp == NULL)
 		return (0);
+	if (er)
+		return (1);
 
-	return (parsefattr(dp, verbose) != NULL);
+	return (parsefattr(dp, verbose, v3) != NULL);
 }
 
 static int
 parsediropres(const u_int32_t *dp)
 {
+	int er;
 
-	dp = parsestatus(dp);
-	if (dp == NULL)
+	if (!(dp = parsestatus(dp, &er)))
 		return (0);
+	if (er)
+		return (1);
 
-	dp = parsefh(dp);
+	dp = parsefh(dp, 0);
 	if (dp == NULL)
 		return (0);
 
-	return (parsefattr(dp, vflag) != NULL);
+	return (parsefattr(dp, vflag, 0) != NULL);
 }
 
 static int
-parselinkres(const u_int32_t *dp)
+parselinkres(const u_int32_t *dp, int v3)
 {
-	dp = parsestatus(dp);
+	int er;
+
+	dp = parsestatus(dp, &er);
 	if (dp == NULL)
+		return(0);
+	if (er)
+		return(1);
+	if (v3 && !(dp = parse_post_op_attr(dp, vflag)))
 		return (0);
-
 	putchar(' ');
 	return (parsefn(dp) != NULL);
 }
 
 static int
-parsestatfs(const u_int32_t *dp)
+parsestatfs(const u_int32_t *dp, int v3)
 {
-	const struct nfsv2_statfs *sfsp;
+	const struct nfs_statfs *sfsp;
+	int er;
 
-	dp = parsestatus(dp);
+	dp = parsestatus(dp, &er);
 	if (dp == NULL)
 		return (0);
+	if (!v3 && er)
+		return (1);
+
+	if (qflag)
+		return(1);
+
+	if (v3) {
+		if (vflag)
+			printf(" POST:");
+		if (!(dp = parse_post_op_attr(dp, vflag)))
+			return (0);
+	}
 
-	if (!qflag) {
-		sfsp = (const struct nfsv2_statfs *)dp;
-		TCHECK(sfsp->sf_bavail);
-		printf(" tsize %u bsize %u blocks %u bfree %u bavail %u",
-		    (u_int32_t)ntohl(sfsp->sf_tsize),
-		    (u_int32_t)ntohl(sfsp->sf_bsize),
-		    (u_int32_t)ntohl(sfsp->sf_blocks),
-		    (u_int32_t)ntohl(sfsp->sf_bfree),
-		    (u_int32_t)ntohl(sfsp->sf_bavail));
+	TCHECK2(*dp, (v3 ? NFSX_V3STATFS : NFSX_V2STATFS));
+
+	sfsp = (const struct nfs_statfs *)dp;
+
+	if (v3) {
+		printf(" tbytes ");
+		print_int64((u_int32_t *)&sfsp->sf_tbytes, UNSIGNED);
+		printf(" fbytes ");
+		print_int64((u_int32_t *)&sfsp->sf_fbytes, UNSIGNED);
+		printf(" abytes ");
+		print_int64((u_int32_t *)&sfsp->sf_abytes, UNSIGNED);
+		if (vflag) {
+			printf(" tfiles ");
+			print_int64((u_int32_t *)&sfsp->sf_tfiles, UNSIGNED);
+			printf(" ffiles ");
+			print_int64((u_int32_t *)&sfsp->sf_ffiles, UNSIGNED);
+			printf(" afiles ");
+			print_int64((u_int32_t *)&sfsp->sf_afiles, UNSIGNED);
+			printf(" invar %u",
+			       (u_int32_t) ntohl(sfsp->sf_invarsec));
+		}
+	} else {
+		printf(" tsize %d bsize %d blocks %d bfree %d bavail %d",
+			(u_int32_t)ntohl(sfsp->sf_tsize),
+			(u_int32_t)ntohl(sfsp->sf_bsize),
+			(u_int32_t)ntohl(sfsp->sf_blocks),
+			(u_int32_t)ntohl(sfsp->sf_bfree),
+			(u_int32_t)ntohl(sfsp->sf_bavail));
 	}
 
 	return (1);
@@ -682,38 +1103,238 @@ trunc:
 static int
 parserddires(const u_int32_t *dp)
 {
-	dp = parsestatus(dp);
+	int er;
+
+	dp = parsestatus(dp, &er);
 	if (dp == NULL)
 		return (0);
-	if (!qflag) {
+	if (er)
+		return (1);
+	if (qflag)
+		return (1);
+
+	TCHECK(dp[2]);
+	printf(" offset %x size %d ",
+	       (u_int32_t)ntohl(dp[0]), (u_int32_t)ntohl(dp[1]));
+	if (dp[2] != 0)
+		printf(" eof");
+
+	return (1);
+trunc:
+	return (0);
+}
+
+static const u_int32_t *
+parse_wcc_attr(const u_int32_t *dp)
+{
+	printf(" sz ");
+	print_int64(dp, UNSIGNED);
+	printf(" mtime %u.%06u ctime %u.%06u",
+	       (u_int32_t)ntohl(dp[2]), (u_int32_t)ntohl(dp[3]),
+	       (u_int32_t)ntohl(dp[4]), (u_int32_t)ntohl(dp[5]));
+	return (dp + 6);
+}
+
+/*
+ * Pre operation attributes. Print only if vflag > 1.
+ */
+static const u_int32_t *
+parse_pre_op_attr(const u_int32_t *dp, int verbose)
+{
+	TCHECK(dp[0]);
+	if (!ntohl(dp[0]))
+		return (dp + 1);
+	dp++;
+	TCHECK2(*dp, 24);
+	if (verbose > 1) {
+		return parse_wcc_attr(dp);
+	} else {
+		/* If not verbose enough, just skip over wcc_attr */
+		return (dp + 6);
+	}
+trunc:
+	return (NULL);
+}
+
+/*
+ * Post operation attributes are printed if vflag >= 1
+ */
+static const u_int32_t *
+parse_post_op_attr(const u_int32_t *dp, int verbose)
+{
+	TCHECK(dp[0]);
+	if (!ntohl(dp[0]))
+		return (dp + 1);
+	dp++;
+	if (verbose) {
+		return parsefattr(dp, verbose, 1);
+	} else
+		return (dp + (NFSX_V3FATTR / sizeof (u_int32_t)));
+trunc:
+	return (NULL);
+}
+
+static const u_int32_t *
+parse_wcc_data(const u_int32_t *dp, int verbose)
+{
+	if (verbose > 1)
+		printf(" PRE:");
+	if (!(dp = parse_pre_op_attr(dp, verbose)))
+		return (0);
+
+	if (verbose)
+		printf(" POST:");
+	return parse_post_op_attr(dp, verbose);
+}
+
+static const u_int32_t *
+parsecreateopres(const u_int32_t *dp, int verbose)
+{
+	int er;
+
+	if (!(dp = parsestatus(dp, &er)))
+		return (0);
+	if (er)
+		dp = parse_wcc_data(dp, verbose);
+	else {
 		TCHECK(dp[0]);
-		printf(" offset %x", (u_int32_t)ntohl(dp[0]));
+		if (!ntohl(dp[0]))
+			return (dp + 1);
+		dp++;
+		if (!(dp = parsefh(dp, 1)))
+			return (0);
+		if (verbose) {
+			if (!(dp = parse_post_op_attr(dp, verbose)))
+				return (0);
+			if (vflag > 1) {
+				printf(" dir attr:");
+				dp = parse_wcc_data(dp, verbose);
+			}
+		}
+	}
+	return (dp);
+trunc:
+	return (NULL);
+}
+
+static int
+parsewccres(const u_int32_t *dp, int verbose)
+{
+	int er;
+
+	if (!(dp = parsestatus(dp, &er)))
+		return (0);
+	return parse_wcc_data(dp, verbose) != 0;
+}
+
+static const u_int32_t *
+parsev3rddirres(const u_int32_t *dp, int verbose)
+{
+	int er;
+
+	if (!(dp = parsestatus(dp, &er)))
+		return (0);
+	if (vflag)
+		printf(" POST:");
+	if (!(dp = parse_post_op_attr(dp, verbose)))
+		return (0);
+	if (er)
+		return dp;
+	if (vflag) {
 		TCHECK(dp[1]);
-		printf(" size %u", (u_int32_t)ntohl(dp[1]));
-		TCHECK(dp[2]);
-		if (dp[2] != 0)
-			printf(" eof");
+		printf(" verf %08x%08x", dp[0], dp[1]);
+		dp += 2;
+	}
+	return dp;
+trunc:
+	return (NULL);
+}
+
+static int
+parsefsinfo(const u_int32_t *dp)
+{
+	struct nfsv3_fsinfo *sfp;
+	int er;
+
+	if (!(dp = parsestatus(dp, &er)))
+		return (0);
+	if (vflag)
+		printf(" POST:");
+	if (!(dp = parse_post_op_attr(dp, vflag)))
+		return (0);
+	if (er)
+		return (1);
+
+	sfp = (struct nfsv3_fsinfo *)dp;
+	TCHECK(*sfp);
+	printf(" rtmax %u rtpref %u wtmax %u wtpref %u dtpref %u",
+	       (u_int32_t) ntohl(sfp->fs_rtmax),
+	       (u_int32_t) ntohl(sfp->fs_rtpref),
+	       (u_int32_t) ntohl(sfp->fs_wtmax),
+	       (u_int32_t) ntohl(sfp->fs_wtpref),
+	       (u_int32_t) ntohl(sfp->fs_dtpref));
+	if (vflag) {
+		printf(" rtmult %u wtmult %u maxfsz ",
+		       (u_int32_t) ntohl(sfp->fs_rtmult),
+		       (u_int32_t) ntohl(sfp->fs_wtmult));
+		print_int64((u_int32_t *)&sfp->fs_maxfilesize, UNSIGNED);
+		printf(" delta %u.%06u ",
+		       (u_int32_t) ntohl(sfp->fs_timedelta.nfsv3_sec),
+		       (u_int32_t) ntohl(sfp->fs_timedelta.nfsv3_nsec));
 	}
+	return (1);
+trunc:
+	return (0);
+}
+
+static int
+parsepathconf(const u_int32_t *dp)
+{
+	int er;
+	struct nfsv3_pathconf *spp;
 
+	if (!(dp = parsestatus(dp, &er)))
+		return (0);
+	if (vflag)
+		printf(" POST:");
+	if (!(dp = parse_post_op_attr(dp, vflag)))
+		return (0);
+	if (er)
+		return (1);
+
+	spp = (struct nfsv3_pathconf *)dp;
+	TCHECK(*spp);
+
+	printf(" linkmax %u namemax %u %s %s %s %s",
+	       (u_int32_t) ntohl(spp->pc_linkmax),
+	       (u_int32_t) ntohl(spp->pc_namemax),
+	       ntohl(spp->pc_notrunc) ? "notrunc" : "",
+	       ntohl(spp->pc_chownrestricted) ? "chownres" : "",
+	       ntohl(spp->pc_caseinsensitive) ? "igncase" : "",
+	       ntohl(spp->pc_casepreserving) ? "keepcase" : "");
 	return (1);
 trunc:
 	return (0);
 }
 
 static void
-interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int length)
+interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int length)
 {
 	register const u_int32_t *dp;
+	register int v3;
+	int er;
+
+	v3 = (vers == NFS_VER3);
+
+	if (!v3 && proc < NFS_NPROCS)
+		proc = nfsv3_procid[proc];
 
 	switch (proc) {
 
-#ifdef NFSPROC_NOOP
 	case NFSPROC_NOOP:
 		printf(" nop");
 		return;
-#else
-#define NFSPROC_NOOP -1
-#endif
+
 	case NFSPROC_NULL:
 		printf(" null");
 		return;
@@ -721,115 +1342,288 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int length)
 	case NFSPROC_GETATTR:
 		printf(" getattr");
 		dp = parserep(rp, length);
-		if (dp != NULL && parseattrstat(dp, !qflag) != 0)
+		if (dp != NULL && parseattrstat(dp, !qflag, v3) != 0)
 			return;
 		break;
 
 	case NFSPROC_SETATTR:
 		printf(" setattr");
-		dp = parserep(rp, length);
-		if (dp != NULL && parseattrstat(dp, !qflag) != 0)
+		if (!(dp = parserep(rp, length)))
 			return;
+		if (v3) {
+			if (parsewccres(dp, vflag))
+				return;
+		} else {
+			if (parseattrstat(dp, !qflag, 0) != 0)
+				return;
+		}
 		break;
 
-#if NFSPROC_ROOT != NFSPROC_NOOP
-	case NFSPROC_ROOT:
-		printf(" root");
-		break;
-#endif
 	case NFSPROC_LOOKUP:
 		printf(" lookup");
-		dp = parserep(rp, length);
-		if (dp != NULL && parsediropres(dp) != 0)
-			return;
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (v3) {
+			if (!(dp = parsestatus(dp, &er)))
+				break;
+			if (er) {
+				if (vflag > 1) {
+					printf(" post dattr:");
+					dp = parse_post_op_attr(dp, vflag);
+				}
+			} else {
+				if (!(dp = parsefh(dp, v3)))
+					break;
+				if ((dp = parse_post_op_attr(dp, vflag)) &&
+				    vflag > 1) {
+					printf(" post dattr:");
+					dp = parse_post_op_attr(dp, vflag);
+				}
+			}
+			if (dp)
+				return;
+		} else {
+			if (parsediropres(dp) != 0)
+				return;
+		}
 		break;
 
+	case NFSPROC_ACCESS:
+		printf(" access");
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (!(dp = parsestatus(dp, &er)))
+			break;
+		if (vflag)
+			printf(" attr:");
+		if (!(dp = parse_post_op_attr(dp, vflag)))
+			break;
+		if (!er)
+			printf(" c %04x", (u_int32_t)ntohl(dp[0]));
+		return;
+
 	case NFSPROC_READLINK:
 		printf(" readlink");
 		dp = parserep(rp, length);
-		if (dp != NULL && parselinkres(dp) != 0)
+		if (dp != NULL && parselinkres(dp, v3) != 0)
 			return;
 		break;
 
 	case NFSPROC_READ:
 		printf(" read");
-		dp = parserep(rp, length);
-		if (dp != NULL && parseattrstat(dp, vflag) != 0)
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (v3) {
+			if (!(dp = parsestatus(dp, &er)))
+				break;
+			if (!(dp = parse_post_op_attr(dp, vflag)))
+				break;
+			if (er)
+				return;
+			if (vflag) {
+				TCHECK(dp[1]);
+				printf(" %u bytes", (u_int32_t) ntohl(dp[0]));
+				if (ntohl(dp[1]))
+					printf(" EOF");
+			}
 			return;
+		} else {
+			if (parseattrstat(dp, vflag, 0) != 0)
+				return;
+		}
 		break;
 
-#if NFSPROC_WRITECACHE != NFSPROC_NOOP
-	case NFSPROC_WRITECACHE:
-		printf(" writecache");
-		break;
-#endif
 	case NFSPROC_WRITE:
 		printf(" write");
-		dp = parserep(rp, length);
-		if (dp != NULL && parseattrstat(dp, vflag) != 0)
-			return;
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (v3) {
+			if (!(dp = parsestatus(dp, &er)))
+				break;
+			if (!(dp = parse_wcc_data(dp, vflag)))
+				break;
+			if (er)
+				return;
+			if (vflag) {
+				TCHECK(dp[0]);
+				printf(" %u bytes", (u_int32_t) ntohl(dp[0]));
+				if (vflag > 1) {
+					TCHECK(dp[1]);
+					printf(" <%s>",
+						tok2str(nfsv3_writemodes,
+							NULL, ntohl(dp[1])));
+				}
+				return;
+			}
+		} else {
+			if (parseattrstat(dp, vflag, v3) != 0)
+				return;
+		}
 		break;
 
 	case NFSPROC_CREATE:
 		printf(" create");
-		dp = parserep(rp, length);
-		if (dp != NULL && parsediropres(dp) != 0)
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (v3) {
+			if (parsecreateopres(dp, vflag) != 0)
+				return;
+		} else {
+			if (parsediropres(dp) != 0)
+				return;
+		}
+		break;
+
+	case NFSPROC_MKDIR:
+		printf(" mkdir");
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (v3) {
+			if (parsecreateopres(dp, vflag) != 0)
+				return;
+		} else {
+			if (parsediropres(dp) != 0)
+				return;
+		}
+		break;
+
+	case NFSPROC_SYMLINK:
+		printf(" symlink");
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (v3) {
+			if (parsecreateopres(dp, vflag) != 0)
+				return;
+		} else {
+			if (parsestatus(dp, &er) != 0)
+				return;
+		}
+		break;
+
+	case NFSPROC_MKNOD:
+		printf(" mknod");
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (parsecreateopres(dp, vflag) != 0)
 			return;
 		break;
 
 	case NFSPROC_REMOVE:
 		printf(" remove");
-		dp = parserep(rp, length);
-		if (dp != NULL && parsestatus(dp) != 0)
-			return;
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (v3) {
+			if (parsewccres(dp, vflag))
+				return;
+		} else {
+			if (parsestatus(dp, &er) != 0)
+				return;
+		}
+		break;
+
+	case NFSPROC_RMDIR:
+		printf(" rmdir");
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (v3) {
+			if (parsewccres(dp, vflag))
+				return;
+		} else {
+			if (parsestatus(dp, &er) != 0)
+				return;
+		}
 		break;
 
 	case NFSPROC_RENAME:
 		printf(" rename");
-		dp = parserep(rp, length);
-		if (dp != NULL && parsestatus(dp) != 0)
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (v3) {
+			if (!(dp = parsestatus(dp, &er)))
+				break;
+			if (vflag) {
+				printf(" from:");
+				if (!(dp = parse_wcc_data(dp, vflag)))
+					break;
+				printf(" to:");
+				if (!(dp = parse_wcc_data(dp, vflag)))
+					break;
+			}
 			return;
+		} else {
+			if (parsestatus(dp, &er) != 0)
+				return;
+		}
 		break;
 
 	case NFSPROC_LINK:
 		printf(" link");
-		dp = parserep(rp, length);
-		if (dp != NULL && parsestatus(dp) != 0)
-			return;
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (v3) {
+			if (!(dp = parsestatus(dp, &er)))
+				break;
+			if (vflag) {
+				printf(" file POST:");
+				if (!(dp = parse_post_op_attr(dp, vflag)))
+					break;
+				printf(" dir:");
+				if (!(dp = parse_wcc_data(dp, vflag)))
+					break;
+				return;
+			}
+		} else {
+			if (parsestatus(dp, &er) != 0)
+				return;
+		}
 		break;
 
-	case NFSPROC_SYMLINK:
-		printf(" symlink");
-		dp = parserep(rp, length);
-		if (dp != NULL && parsestatus(dp) != 0)
+	case NFSPROC_READDIR:
+		printf(" readdir");
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (v3) {
+			if (parsev3rddirres(dp, vflag))
+				return;
+		} else {
+			if (parserddires(dp) != 0)
+				return;
+		}
+		break;
+
+	case NFSPROC_READDIRPLUS:
+		printf(" readdirplus");
+		if (!(dp = parserep(rp, length)))
+			break;
+		if (parsev3rddirres(dp, vflag))
 			return;
 		break;
 
-	case NFSPROC_MKDIR:
-		printf(" mkdir");
+	case NFSPROC_FSSTAT:
+		printf(" fsstat");
 		dp = parserep(rp, length);
-		if (dp != NULL && parsediropres(dp) != 0)
+		if (dp != NULL && parsestatfs(dp, v3) != 0)
 			return;
 		break;
 
-	case NFSPROC_RMDIR:
-		printf(" rmdir");
+	case NFSPROC_FSINFO:
+		printf(" fsinfo");
 		dp = parserep(rp, length);
-		if (dp != NULL && parsestatus(dp) != 0)
+		if (dp != NULL && parsefsinfo(dp) != 0)
 			return;
 		break;
 
-	case NFSPROC_READDIR:
-		printf(" readdir");
+	case NFSPROC_PATHCONF:
+		printf(" pathconf");
 		dp = parserep(rp, length);
-		if (dp != NULL && parserddires(dp) != 0)
+		if (dp != NULL && parsepathconf(dp) != 0)
 			return;
 		break;
 
-	case NFSPROC_STATFS:
-		printf(" statfs");
+	case NFSPROC_COMMIT:
+		printf(" commit");
 		dp = parserep(rp, length);
-		if (dp != NULL && parsestatfs(dp) != 0)
+		if (dp != NULL && parsewccres(dp, vflag) != 0)
 			return;
 		break;
 
@@ -837,6 +1631,7 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int length)
 		printf(" proc-%u", proc);
 		return;
 	}
+trunc:
 	if (!nfserr)
 		fputs(" [|nfs]", stdout);
 }