summaryrefslogtreecommitdiffstats
path: root/contrib/tcpdump/print-nfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/tcpdump/print-nfs.c')
-rw-r--r--contrib/tcpdump/print-nfs.c1185
1 files changed, 938 insertions, 247 deletions
diff --git a/contrib/tcpdump/print-nfs.c b/contrib/tcpdump/print-nfs.c
index a8e371e..fd71a46 100644
--- a/contrib/tcpdump/print-nfs.c
+++ b/contrib/tcpdump/print-nfs.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
+ * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -21,21 +21,17 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: print-nfs.c,v 1.65 97/08/17 13:24:22 leres Exp $ (LBL)";
+ "@(#) $Header: print-nfs.c,v 1.63 96/12/10 23:18:07 leres Exp $ (LBL)";
#endif
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
#include <net/if.h>
#include <netinet/in.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>
@@ -49,32 +45,209 @@ struct rtentry;
#include "interface.h"
#include "addrtoname.h"
+#include "extract.h" /* must come after interface.h */
-#include "nfsv2.h"
+#include "nfs.h"
#include "nfsfh.h"
-static void nfs_printfh(const u_int32_t *);
+static void nfs_printfh(const u_int32_t *, const int);
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 int32_t xid_map_find(const struct rpc_msg *, const struct ip *, 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 int nfserr; /* true if we error rather than trunc */
+/*
+ * 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
+};
+
+const char *nfsv3_writemodes[NFSV3WRITE_NMODES] = {
+ "unstable",
+ "datasync",
+ "filesync"
+};
+
+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
+
+#define INT64_FORMAT "%qd"
+#define U_INT64_FORMAT "%qu"
+#define HEX_INT64_FORMAT "%qx"
+
+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
+ /*
+ * XXX - throw upper 32 bits away.
+ * Could also go for hex: printf("0x%x%x", dp[0], dp[1]);
+ */
+ if (how == SIGNED)
+ printf("%ld", (int)dp[1]);
+ else
+ printf("%lu", (unsigned int)dp[1]);
+#endif
+ return 1;
+}
+
+static const u_int32_t *
+parse_sattr3(const u_int32_t *dp, struct nfsv3_sattr *sa3)
+{
+ register const u_int32_t *ep = (u_int32_t *)snapend;
+
+ if (dp + 1 > ep)
+ return (NULL);
+ if ((sa3->sa_modeset = ntohl(*dp++))) {
+ if (dp + 1 > ep)
+ return (NULL);
+ sa3->sa_mode = ntohl(*dp++);
+ }
+
+ if (dp + 1 > ep)
+ return (NULL);
+ if ((sa3->sa_uidset = ntohl(*dp++))) {
+ if (dp + 1 > ep)
+ return (NULL);
+ sa3->sa_uid = ntohl(*dp++);
+ }
+
+ if (dp + 1 > ep)
+ return (NULL);
+ if ((sa3->sa_gidset = ntohl(*dp++))) {
+ if (dp + 1 > ep)
+ return (NULL);
+ sa3->sa_gid = ntohl(*dp++);
+ }
+
+ if (dp + 1 > ep)
+ return (NULL);
+ if ((sa3->sa_sizeset = ntohl(*dp++))) {
+ if (dp + 1 > ep)
+ return (NULL);
+ sa3->sa_size = ntohl(*dp++);
+ }
+
+ if (dp + 1 > ep)
+ return (NULL);
+ if ((sa3->sa_atimetype = ntohl(*dp++)) == NFSV3SATTRTIME_TOCLIENT) {
+ if (dp + 2 > ep)
+ return (NULL);
+ sa3->sa_atime.nfsv3_sec = ntohl(*dp++);
+ sa3->sa_atime.nfsv3_nsec = ntohl(*dp++);
+ }
+
+ if (dp + 1 > ep)
+ return (NULL);
+ if ((sa3->sa_mtimetype = ntohl(*dp++)) == NFSV3SATTRTIME_TOCLIENT) {
+ if (dp + 2 > ep)
+ return (NULL);
+ sa3->sa_mtime.nfsv3_sec = ntohl(*dp++);
+ sa3->sa_mtime.nfsv3_nsec = ntohl(*dp++);
+ }
+
+ return dp;
+}
+
+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;
if (!nflag)
- (void)printf("%s.nfs > %s.%u: reply %s %d",
+ (void)printf("%s.nfs > %s.%x: reply %s %d",
ipaddr_string(&ip->ip_src),
ipaddr_string(&ip->ip_dst),
(u_int32_t)ntohl(rp->rm_xid),
@@ -82,7 +255,7 @@ nfsreply_print(register const u_char *bp, u_int length,
"ok":"ERR",
length);
else
- (void)printf("%s.%u > %s.%u: reply %s %d",
+ (void)printf("%s.%x > %s.%x: reply %s %d",
ipaddr_string(&ip->ip_src),
NFS_PORT,
ipaddr_string(&ip->ip_dst),
@@ -91,16 +264,16 @@ nfsreply_print(register const u_char *bp, u_int length,
"ok":"ERR",
length);
- if (xid_map_find(rp, ip, &proc))
- interp_reply(rp, proc, length);
+ if (xid_map_find(rp, ip, &proc, &vers) >= 0)
+ interp_reply(rp, proc, vers, length);
}
/*
* Return a pointer to the first file handle in the packet.
- * If the packet was truncated, return 0.
+ * If the packet was truncated, return NULL.
*/
static const u_int32_t *
-parsereq(register const struct rpc_msg *rp, register u_int length)
+parsereq(register const struct rpc_msg *rp, register int length)
{
register const u_int32_t *dp;
register u_int len;
@@ -127,21 +300,31 @@ trunc:
/*
* Print out an NFS file handle and return a pointer to following word.
- * If packet was truncated, return 0.
+ * If packet was truncated, return NULL.
*/
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);
}
/*
* Print out a file name and return pointer to 32-bit word past it.
- * If packet was truncated, return 0.
+ * If packet was truncated, return NULL.
*/
static const u_int32_t *
parsefn(register const u_int32_t *dp)
@@ -173,12 +356,12 @@ parsefn(register const u_int32_t *dp)
/*
* Print out file handle and file name.
* Return pointer to 32-bit word past file name.
- * If packet was truncated (or there was some other error), return 0.
+ * If packet was truncated (or there was some other error), return NULL.
*/
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(' ');
@@ -192,18 +375,21 @@ nfsreq_print(register const u_char *bp, u_int length,
register const struct rpc_msg *rp;
register const struct ip *ip;
register const u_int32_t *dp;
+ nfstype type;
+ int proc, v3;
+ struct nfsv3_sattr sa3;
nfserr = 0; /* assume no error */
rp = (const struct rpc_msg *)bp;
ip = (const struct ip *)bp2;
if (!nflag)
- (void)printf("%s.%u > %s.nfs: %d",
+ (void)printf("%s.%x > %s.nfs: %d",
ipaddr_string(&ip->ip_src),
(u_int32_t)ntohl(rp->rm_xid),
ipaddr_string(&ip->ip_dst),
length);
else
- (void)printf("%s.%u > %s.%u: %d",
+ (void)printf("%s.%x > %s.%x: %d",
ipaddr_string(&ip->ip_src),
(u_int32_t)ntohl(rp->rm_xid),
ipaddr_string(&ip->ip_dst),
@@ -212,106 +398,162 @@ nfsreq_print(register const u_char *bp, u_int length,
xid_map_enter(rp, ip); /* record proc number for later on */
- switch (ntohl(rp->rm_call.cb_proc)) {
-#ifdef NFSPROC_NOOP
+ 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 (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);
+ printf(" %04lx", 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) {
+ TCHECK2(*dp, 3 * sizeof(*dp));
+ printf(" %lu bytes @ ", ntohl(dp[2]));
+ print_int64(dp, UNSIGNED);
+ } else {
+ TCHECK2(*dp, 2 * sizeof(*dp));
+ printf(" %lu bytes @ %lu",
+ ntohl(dp[1]), 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) {
+ TCHECK2(*dp, 3 * sizeof(*dp));
+ printf(" %lu bytes @ ", ntohl(dp[4]));
+ print_int64(dp, UNSIGNED);
+ if (vflag) {
+ dp += 3;
+ TCHECK2(*dp, sizeof(*dp));
+ printf(" <%s>",
+ nfsv3_writemodes[ntohl(*dp)]);
+ }
+ } else {
+ TCHECK2(*dp, 4 * sizeof(*dp));
+ printf(" %lu (%lu) bytes @ %lu (%lu)",
+ ntohl(dp[3]), ntohl(dp[2]),
+ ntohl(dp[1]), 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)) != NULL && parsefhn(dp, v3) != NULL)
+ return;
+ break;
+
+ case NFSPROC_SYMLINK:
+ printf(" symlink");
+ if ((dp = parsereq(rp, length)) != NULL &&
+ (dp = parsefhn(dp, v3)) != NULL) {
+ fputs(" -> ", stdout);
+ if (v3 && (dp = parse_sattr3(dp, &sa3)) == NULL)
+ break;
+ if (parsefn(dp) == NULL)
+ break;
+ if (v3 && vflag)
+ print_sattr3(&sa3, vflag);
+ return;
+ }
+ break;
+
+ case NFSPROC_MKNOD:
+ printf(" mknod");
+ if ((dp = parsereq(rp, length)) != NULL &&
+ (dp = parsefhn(dp, v3)) != NULL) {
+ if (dp + 1 > (u_int32_t *)snapend)
+ break;
+ type = (nfstype)ntohl(*dp++);
+ if ((dp = parse_sattr3(dp, &sa3)) == NULL)
+ break;
+ printf(" %s", tok2str(type2str, "unk-ft %d", type));
+ if (vflag && (type == NFCHR || type == NFBLK)) {
+ if (dp + 2 > (u_int32_t *)snapend)
+ break;
+ printf(" %lu/%lu", ntohl(dp[0]), 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;
@@ -319,59 +561,85 @@ 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) {
+ TCHECK2(*dp, 20);
+ /*
+ * We shouldn't really try to interpret the
+ * offset cookie here.
+ */
+ printf(" %lu bytes @ ", ntohl(dp[4]));
+ print_int64(dp, SIGNED);
+ if (vflag)
+ printf(" verf %08x%08x", dp[2],
+ dp[3]);
+ } else {
+ TCHECK2(*dp, 2 * sizeof(*dp));
+ /*
+ * Print the offset as signed, since -1 is
+ * common, but offsets > 2^31 aren't.
+ */
+ printf(" %lu bytes @ %ld", ntohl(dp[1]),
+ 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) {
+ TCHECK2(*dp, 20);
+ /*
+ * We don't try to interpret the offset
+ * cookie here.
+ */
+ printf(" %lu bytes @ ", ntohl(dp[4]));
+ print_int64(dp, SIGNED);
+ if (vflag)
+ printf(" max %lu verf %08x%08x",
+ 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");
- 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]));
- return;
- }
+ case NFSPROC_FSINFO:
+ printf(" fsinfo");
break;
- case NFSPROC_STATFS:
- printf(" statfs");
- if ((dp = parsereq(rp, length)) != NULL && parsefh(dp) != NULL)
+ case NFSPROC_PATHCONF:
+ printf(" pathconf");
+ break;
+
+ case NFSPROC_COMMIT:
+ printf(" commit");
+ if ((dp = parsereq(rp, length)) != NULL &&
+ (dp = parsefh(dp, v3)) != NULL) {
+ printf(" %lu bytes @ ", ntohl(dp[2]));
+ print_int64(dp, UNSIGNED);
return;
+ }
break;
default:
- printf(" proc-%u", (u_int32_t)ntohl(rp->rm_call.cb_proc));
+ printf(" proc-%lu", ntohl(rp->rm_call.cb_proc));
return;
}
trunc:
@@ -389,20 +657,20 @@ 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 int len)
{
my_fsid fsid;
ino_t ino;
char *sfsname = NULL;
- Parse_fh((caddr_t *)dp, &fsid, &ino, NULL, &sfsname, 0);
+ Parse_fh((caddr_t *)dp, len, &fsid, &ino, NULL, &sfsname, 0);
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 */
- strncpy(temp, sfsname, NFS_FHSIZE);
+ strncpy(temp, sfsname, NFSX_V3FHMAX);
/* Remove trailing spaces */
sfsname = strchr(temp, ' ');
if (sfsname)
@@ -426,6 +694,7 @@ struct xid_map_entry {
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 vers; /* program version (host order) */
};
/*
@@ -455,11 +724,16 @@ xid_map_enter(const struct rpc_msg *rp, const struct ip *ip)
xmep->client = ip->ip_src;
xmep->server = 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 struct ip *ip, u_int32_t *proc,
+ u_int32_t *vers)
{
int i;
struct xid_map_entry *xmep;
@@ -476,14 +750,15 @@ xid_map_find(const struct rpc_msg *rp, const struct ip *ip, u_int32_t *proc)
/* match */
xid_map_hint = i;
*proc = xmep->proc;
- return (1);
+ *vers = xmep->vers;
+ return 0;
}
if (++i >= XIDMAPSIZE)
i = 0;
} while (i != xid_map_hint);
/* search failed */
- return (0);
+ return (-1);
}
/*
@@ -492,13 +767,13 @@ xid_map_find(const struct rpc_msg *rp, const struct ip *ip, u_int32_t *proc)
/*
* Return a pointer to the beginning of the actual results.
- * If the packet was truncated, return 0.
+ * If the packet was truncated, return NULL.
*/
static const u_int32_t *
-parserep(register const struct rpc_msg *rp, register u_int length)
+parserep(register const struct rpc_msg *rp, register int length)
{
register const u_int32_t *dp;
- u_int len;
+ int len;
enum accept_stat astat;
/*
@@ -574,17 +849,20 @@ trunc:
return (NULL);
}
+
static const u_int32_t *
-parsestatus(const u_int32_t *dp)
+parsestatus(const u_int32_t *dp, int *er)
{
register 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 */
+ nfserr = 1;
return (NULL);
}
return (dp + 1);
@@ -592,89 +870,109 @@ trunc:
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 ",
- 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));
+ printf(" %s %lo ids %ld/%ld",
+ tok2str(type2str, "unk-ft %d ", ntohl(fap->fa_type)),
+ ntohl(fap->fa_mode), ntohl(fap->fa_uid),
+ ntohl(fap->fa_gid));
+ if (v3) {
+ TCHECK(fap->fa3_size);
+ printf(" sz ");
+ print_int64((u_int32_t *)&fap->fa3_size, UNSIGNED);
+ putchar(' ');
+ } else {
+ TCHECK(fap->fa2_size);
+ printf(" sz %ld ", 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 %ld rdev %ld/%ld ",
+ ntohl(fap->fa_nlink),
+ ntohl(fap->fa3_rdev.specdata1),
+ ntohl(fap->fa3_rdev.specdata2));
+ printf("fsid ");
+ print_int64((u_int32_t *)&fap->fa2_fsid, HEX);
+ printf(" nodeid ");
+ print_int64((u_int32_t *)&fap->fa2_fileid, HEX);
+ printf(" a/m/ctime %lu.%06lu ",
+ ntohl(fap->fa3_atime.nfsv3_sec),
+ ntohl(fap->fa3_atime.nfsv3_nsec));
+ printf("%lu.%06lu ",
+ ntohl(fap->fa3_mtime.nfsv3_sec),
+ ntohl(fap->fa3_mtime.nfsv3_nsec));
+ printf("%lu.%06lu ",
+ ntohl(fap->fa3_ctime.nfsv3_sec),
+ ntohl(fap->fa3_ctime.nfsv3_nsec));
+ } else {
+ TCHECK(fap->fa2_ctime);
+ printf("nlink %ld rdev %lx fsid %lx nodeid %lx a/m/ctime ",
+ ntohl(fap->fa_nlink), ntohl(fap->fa2_rdev),
+ ntohl(fap->fa2_fsid), ntohl(fap->fa2_fileid));
+ printf("%lu.%06lu ",
+ ntohl(fap->fa2_atime.nfsv2_sec),
+ ntohl(fap->fa2_atime.nfsv2_usec));
+ printf("%lu.%06lu ",
+ ntohl(fap->fa2_mtime.nfsv2_sec),
+ ntohl(fap->fa2_mtime.nfsv2_usec));
+ printf("%lu.%06lu ",
+ ntohl(fap->fa2_ctime.nfsv2_sec),
+ 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);
- if (dp == NULL)
+ dp = parsestatus(dp, &er);
+ if (dp == NULL || er)
return (0);
- 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)
+ dp = parsestatus(dp, &er);
+ if (dp == NULL || er)
return (0);
- 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);
- if (dp == NULL)
+ int er;
+
+ dp = parsestatus(dp, &er);
+ if (dp == NULL || er)
+ return(0);
+
+ if (v3 && ((dp = parse_post_op_attr(dp, vflag)) != NULL))
return (0);
putchar(' ');
@@ -682,23 +980,50 @@ parselinkres(const u_int32_t *dp)
}
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);
- if (dp == NULL)
- return (0);
+ dp = parsestatus(dp, &er);
+ if (dp == NULL || (!v3 && er))
+ return(0);
+
+ if (qflag)
+ return(1);
+
+ if (v3) {
+ if (vflag)
+ printf(" POST:");
+ if ((dp = parse_post_op_attr(dp, vflag)) == NULL)
+ 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 %lu", ntohl(sfsp->sf_invarsec));
+ }
+ } else {
+ printf(" tsize %ld bsize %ld blocks %ld bfree %ld bavail %ld",
+ ntohl(sfsp->sf_tsize), ntohl(sfsp->sf_bsize),
+ ntohl(sfsp->sf_blocks), ntohl(sfsp->sf_bfree),
+ ntohl(sfsp->sf_bavail));
}
return (1);
@@ -709,38 +1034,231 @@ trunc:
static int
parserddires(const u_int32_t *dp)
{
- dp = parsestatus(dp);
- if (dp == NULL)
+ int er;
+
+ dp = parsestatus(dp, &er);
+ if (dp == NULL || er)
return (0);
- if (!qflag) {
+ if (qflag)
+ return (1);
+
+ TCHECK(dp[2]);
+ printf(" offset %lx size %ld ", ntohl(dp[0]), 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 %lu.%06lu ctime %lu.%06lu", ntohl(dp[2]), ntohl(dp[3]),
+ ntohl(dp[4]), 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)) == NULL)
+ return (NULL);
+
+ 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)) == NULL)
+ return (NULL);
+ 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)) == NULL)
+ return (NULL);
+ if (verbose) {
+ if ((dp = parse_post_op_attr(dp, verbose)) == NULL)
+ return (NULL);
+ 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)) == NULL)
+ return (0);
+ return parse_wcc_data(dp, verbose) != NULL;
+}
+
+static const u_int32_t *
+parsev3rddirres(const u_int32_t *dp, int verbose)
+{
+ int er;
+
+ if ((dp = parsestatus(dp, &er)) == NULL)
+ return (NULL);
+ if (vflag)
+ printf(" POST:");
+ if ((dp = parse_post_op_attr(dp, verbose)) == NULL)
+ return (NULL);
+ 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)) == NULL)
+ return (0);
+ if (vflag)
+ printf(" POST:");
+ if ((dp = parse_post_op_attr(dp, vflag)) == NULL)
+ return (0);
+ if (er)
+ return (1);
+
+ sfp = (struct nfsv3_fsinfo *)dp;
+ TCHECK(*sfp);
+ printf(" rtmax %lu rtpref %lu wtmax %lu wtpref %lu dtpref %lu",
+ ntohl(sfp->fs_rtmax), ntohl(sfp->fs_rtpref),
+ ntohl(sfp->fs_wtmax), ntohl(sfp->fs_wtpref),
+ ntohl(sfp->fs_dtpref));
+ if (vflag) {
+ printf(" rtmult %lu wtmult %lu maxfsz ",
+ ntohl(sfp->fs_rtmult), ntohl(sfp->fs_wtmult));
+ print_int64((u_int32_t *)&sfp->fs_maxfilesize, UNSIGNED);
+ printf(" delta %lu.%06lu ", ntohl(sfp->fs_timedelta.nfsv3_sec),
+ 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)) == NULL)
+ return (0);
+ if (vflag)
+ printf(" POST:");
+ if ((dp = parse_post_op_attr(dp, vflag)) == NULL)
+ return (0);
+ if (er)
+ return (1);
+
+ spp = (struct nfsv3_pathconf *)dp;
+ TCHECK(*spp);
+
+ printf(" linkmax %lu namemax %lu %s %s %s %s",
+ ntohl(spp->pc_linkmax),
+ 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;
@@ -748,115 +1266,286 @@ 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)) == NULL)
return;
+ if (v3) {
+ if (parsewccres(dp, vflag) != 0)
+ 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)) == NULL)
+ break;
+ if (v3) {
+ if ((dp = parsestatus(dp, &er)) == NULL)
+ break;
+ if (er) {
+ if (vflag > 1) {
+ printf(" post dattr:");
+ dp = parse_post_op_attr(dp, vflag);
+ }
+ } else {
+ if ((dp = parsefh(dp, v3)) == NULL)
+ break;
+ if (((dp = parse_post_op_attr(dp, vflag)) != NULL) &&
+ (vflag > 1)) {
+ printf(" post dattr:");
+ dp = parse_post_op_attr(dp, vflag);
+ }
+ }
+ if (dp != NULL)
+ return;
+ } else {
+ if (parsediropres(dp) != 0)
+ return;
+ }
break;
+ case NFSPROC_ACCESS:
+ printf(" access");
+ dp = parserep(rp, length);
+ if ((dp = parsestatus(dp, &er)) == NULL)
+ break;
+ if (vflag)
+ printf(" attr:");
+ if ((dp = parse_post_op_attr(dp, vflag)) == NULL)
+ break;
+ if (!er)
+ printf(" c %04lx", 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)) == NULL)
+ break;
+ if (v3) {
+ if ((dp = parsestatus(dp, &er)) == NULL)
+ break;
+ if ((dp = parse_post_op_attr(dp, vflag)) == NULL)
+ break;
+ if (er)
+ return;
+ if (vflag) {
+ TCHECK2(*dp, 8);
+ printf("%lu bytes", 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)) == NULL)
+ break;
+ if (v3) {
+ if ((dp = parsestatus(dp, &er)) == NULL)
+ break;
+ if ((dp = parse_wcc_data(dp, vflag)) == NULL)
+ break;
+ if (er)
+ return;
+ if (vflag) {
+ TCHECK2(*dp, 4);
+ printf("%lu bytes", ntohl(dp[0]));
+ if (vflag > 1) {
+ TCHECK2(*dp, 4);
+ printf(" <%s>",
+ nfsv3_writemodes[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)) == NULL)
+ break;
+ if (v3) {
+ if (parsecreateopres(dp, vflag) != NULL)
+ return;
+ } else {
+ if (parsediropres(dp) != 0)
+ return;
+ }
+ break;
+
+ case NFSPROC_MKDIR:
+ printf(" mkdir");
+ if ((dp = parserep(rp, length)) == NULL)
+ break;
+ if (v3) {
+ if (parsecreateopres(dp, vflag) != NULL)
+ return;
+ } else {
+ if (parsediropres(dp) != 0)
+ return;
+ }
+ break;
+
+ case NFSPROC_SYMLINK:
+ printf(" symlink");
+ if ((dp = parserep(rp, length)) == NULL)
+ break;
+ if (v3) {
+ if (parsecreateopres(dp, vflag) != NULL)
+ return;
+ } else {
+ if (parsestatus(dp, &er) != NULL)
+ return;
+ }
+ break;
+
+ case NFSPROC_MKNOD:
+ printf(" mknod");
+ if ((dp = parserep(rp, length)) == NULL)
+ break;
+ if (parsecreateopres(dp, vflag) != NULL)
return;
break;
case NFSPROC_REMOVE:
printf(" remove");
- dp = parserep(rp, length);
- if (dp != NULL && parsestatus(dp) != 0)
- return;
+ if ((dp = parserep(rp, length)) == NULL)
+ break;
+ if (v3) {
+ if (parsewccres(dp, vflag) != 0)
+ return;
+ } else {
+ if (parsestatus(dp, &er) != NULL)
+ return;
+ }
+ break;
+
+ case NFSPROC_RMDIR:
+ printf(" rmdir");
+ if ((dp = parserep(rp, length)) == NULL)
+ break;
+ if (v3) {
+ if (parsewccres(dp, vflag) != 0)
+ return;
+ } else {
+ if (parsestatus(dp, &er) != NULL)
+ return;
+ }
break;
case NFSPROC_RENAME:
printf(" rename");
- dp = parserep(rp, length);
- if (dp != NULL && parsestatus(dp) != 0)
+ if ((dp = parserep(rp, length)) == NULL)
+ break;
+ if (v3) {
+ if ((dp = parsestatus(dp, &er)) == NULL)
+ break;
+ if (vflag) {
+ printf(" from:");
+ if ((dp = parse_wcc_data(dp, vflag)) == NULL)
+ break;
+ printf(" to:");
+ if ((dp = parse_wcc_data(dp, vflag)) == NULL)
+ break;
+ }
return;
+ } else {
+ if (parsestatus(dp, &er) != NULL)
+ return;
+ }
break;
case NFSPROC_LINK:
printf(" link");
- dp = parserep(rp, length);
- if (dp != NULL && parsestatus(dp) != 0)
- return;
+ if ((dp = parserep(rp, length)) == NULL)
+ break;
+ if (v3) {
+ if ((dp = parsestatus(dp, &er)) == NULL)
+ break;
+ if (vflag) {
+ printf(" file POST:");
+ if ((dp = parse_post_op_attr(dp, vflag)) == NULL)
+ break;
+ printf(" dir:");
+ if ((dp = parse_wcc_data(dp, vflag)) == NULL)
+ break;
+ return;
+ }
+ } else {
+ if (parsestatus(dp, &er) != NULL)
+ 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)) == NULL)
+ break;
+ if (v3) {
+ if (parsev3rddirres(dp, vflag) != NULL)
+ return;
+ } else {
+ if (parserddires(dp) != 0)
+ return;
+ }
+ break;
+
+ case NFSPROC_READDIRPLUS:
+ printf(" readdirplus");
+ if ((dp = parserep(rp, length)) == NULL)
+ break;
+ if (parsev3rddirres(dp, vflag) != NULL)
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) != NULL)
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) != NULL)
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;
@@ -864,6 +1553,8 @@ 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);
}
OpenPOWER on IntegriCloud