X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d6a7593fd9e109c273c980337c494ef2b6016f23..a890c4489fa1bcee9f455ee28d772bb1ccf590bf:/print-nfs.c

diff --git a/print-nfs.c b/print-nfs.c
index ee3f9629..dd2f7f12 100644
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -45,17 +45,17 @@
 
 static const char tstr[] = " [|nfs]";
 
-static void nfs_printfh(netdissect_options *, const u_int32_t *, const u_int);
+static void nfs_printfh(netdissect_options *, const uint32_t *, const u_int);
 static int xid_map_enter(netdissect_options *, const struct sunrpc_msg *, const u_char *);
 static int xid_map_find(const struct sunrpc_msg *, const u_char *,
-			    u_int32_t *, u_int32_t *);
-static void interp_reply(netdissect_options *, const struct sunrpc_msg *, u_int32_t, u_int32_t, int);
-static const u_int32_t *parse_post_op_attr(netdissect_options *, const u_int32_t *, int);
+			    uint32_t *, uint32_t *);
+static void interp_reply(netdissect_options *, const struct sunrpc_msg *, uint32_t, uint32_t, int);
+static const uint32_t *parse_post_op_attr(netdissect_options *, const uint32_t *, int);
 
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */
-u_int32_t nfsv3_procid[NFS_NPROCS] = {
+uint32_t nfsv3_procid[NFS_NPROCS] = {
 	NFSPROC_NULL,
 	NFSPROC_GETATTR,
 	NFSPROC_SETATTR,
@@ -84,6 +84,33 @@ u_int32_t nfsv3_procid[NFS_NPROCS] = {
 	NFSPROC_NOOP
 };
 
+static const struct tok nfsproc_str[] = {
+	{ NFSPROC_NOOP,        "nop"         },
+	{ NFSPROC_NULL,        "null"        },
+	{ NFSPROC_GETATTR,     "getattr"     },
+	{ NFSPROC_SETATTR,     "setattr"     },
+	{ NFSPROC_LOOKUP,      "lookup"      },
+	{ NFSPROC_ACCESS,      "access"      },
+	{ NFSPROC_READLINK,    "readlink"    },
+	{ NFSPROC_READ,        "read"        },
+	{ NFSPROC_WRITE,       "write"       },
+	{ NFSPROC_CREATE,      "create"      },
+	{ NFSPROC_MKDIR,       "mkdir"       },
+	{ NFSPROC_SYMLINK,     "symlink"     },
+	{ NFSPROC_MKNOD,       "mknod"       },
+	{ NFSPROC_REMOVE,      "remove"      },
+	{ NFSPROC_RMDIR,       "rmdir"       },
+	{ NFSPROC_RENAME,      "rename"      },
+	{ NFSPROC_LINK,        "link"        },
+	{ NFSPROC_READDIR,     "readdir"     },
+	{ NFSPROC_READDIRPLUS, "readdirplus" },
+	{ NFSPROC_FSSTAT,      "fsstat"      },
+	{ NFSPROC_FSINFO,      "fsinfo"      },
+	{ NFSPROC_PATHCONF,    "pathconf"    },
+	{ NFSPROC_COMMIT,      "commit"      },
+	{ 0, NULL }
+};
+
 /*
  * NFS V2 and V3 status values.
  *
@@ -151,6 +178,27 @@ static const struct tok type2str[] = {
 	{ 0,		NULL }
 };
 
+static const struct tok sunrpc_auth_str[] = {
+	{ SUNRPC_AUTH_OK,           "OK"                                                     },
+	{ SUNRPC_AUTH_BADCRED,      "Bogus Credentials (seal broken)"                        },
+	{ SUNRPC_AUTH_REJECTEDCRED, "Rejected Credentials (client should begin new session)" },
+	{ SUNRPC_AUTH_BADVERF,      "Bogus Verifier (seal broken)"                           },
+	{ SUNRPC_AUTH_REJECTEDVERF, "Verifier expired or was replayed"                       },
+	{ SUNRPC_AUTH_TOOWEAK,      "Credentials are too weak"                               },
+	{ SUNRPC_AUTH_INVALIDRESP,  "Bogus response verifier"                                },
+	{ SUNRPC_AUTH_FAILED,       "Unknown failure"                                        },
+	{ 0, NULL }
+};
+
+static const struct tok sunrpc_str[] = {
+	{ SUNRPC_PROG_UNAVAIL,  "PROG_UNAVAIL"  },
+	{ SUNRPC_PROG_MISMATCH, "PROG_MISMATCH" },
+	{ SUNRPC_PROC_UNAVAIL,  "PROC_UNAVAIL"  },
+	{ SUNRPC_GARBAGE_ARGS,  "GARBAGE_ARGS"  },
+	{ SUNRPC_SYSTEM_ERR,    "SYSTEM_ERR"    },
+	{ 0, NULL }
+};
+
 static void
 print_nfsaddr(netdissect_options *ndo,
               const u_char *bp, const char *s, const char *d)
@@ -191,9 +239,9 @@ print_nfsaddr(netdissect_options *ndo,
 	ND_PRINT((ndo, "%s.%s > %s.%s: ", srcaddr, s, dstaddr, d));
 }
 
-static const u_int32_t *
+static const uint32_t *
 parse_sattr3(netdissect_options *ndo,
-             const u_int32_t *dp, struct nfsv3_sattr *sa3)
+             const uint32_t *dp, struct nfsv3_sattr *sa3)
 {
 	ND_TCHECK(dp[0]);
 	sa3->sa_modeset = EXTRACT_32BITS(dp);
@@ -317,10 +365,10 @@ nfsreply_print_noaddr(netdissect_options *ndo,
                       register const u_char *bp2)
 {
 	register const struct sunrpc_msg *rp;
-	u_int32_t proc, vers, reply_stat;
+	uint32_t proc, vers, reply_stat;
 	enum sunrpc_reject_stat rstat;
-	u_int32_t rlow;
-	u_int32_t rhigh;
+	uint32_t rlow;
+	uint32_t rhigh;
 	enum sunrpc_auth_stat rwhy;
 
 	nfserr = 0;		/* assume no error */
@@ -352,45 +400,7 @@ nfsreply_print_noaddr(netdissect_options *ndo,
 		case SUNRPC_AUTH_ERROR:
 			ND_TCHECK(rp->rm_reply.rp_reject.rj_why);
 			rwhy = EXTRACT_32BITS(&rp->rm_reply.rp_reject.rj_why);
-			ND_PRINT((ndo, "Auth "));
-			switch (rwhy) {
-
-			case SUNRPC_AUTH_OK:
-				ND_PRINT((ndo, "OK"));
-				break;
-
-			case SUNRPC_AUTH_BADCRED:
-				ND_PRINT((ndo, "Bogus Credentials (seal broken)"));
-				break;
-
-			case SUNRPC_AUTH_REJECTEDCRED:
-				ND_PRINT((ndo, "Rejected Credentials (client should begin new session)"));
-				break;
-
-			case SUNRPC_AUTH_BADVERF:
-				ND_PRINT((ndo, "Bogus Verifier (seal broken)"));
-				break;
-
-			case SUNRPC_AUTH_REJECTEDVERF:
-				ND_PRINT((ndo, "Verifier expired or was replayed"));
-				break;
-
-			case SUNRPC_AUTH_TOOWEAK:
-				ND_PRINT((ndo, "Credentials are too weak"));
-				break;
-
-			case SUNRPC_AUTH_INVALIDRESP:
-				ND_PRINT((ndo, "Bogus response verifier"));
-				break;
-
-			case SUNRPC_AUTH_FAILED:
-				ND_PRINT((ndo, "Unknown failure"));
-				break;
-
-			default:
-				ND_PRINT((ndo, "Invalid failure code %u", (unsigned int)rwhy));
-				break;
-			}
+			ND_PRINT((ndo, "Auth %s", tok2str(sunrpc_auth_str, "Invalid failure code %u", rwhy)));
 			break;
 
 		default:
@@ -414,17 +424,17 @@ trunc:
  * Return a pointer to the first file handle in the packet.
  * If the packet was truncated, return 0.
  */
-static const u_int32_t *
+static const uint32_t *
 parsereq(netdissect_options *ndo,
          register const struct sunrpc_msg *rp, register u_int length)
 {
-	register const u_int32_t *dp;
+	register const uint32_t *dp;
 	register u_int len;
 
 	/*
 	 * find the start of the req data (if we captured it)
 	 */
-	dp = (u_int32_t *)&rp->rm_call.cb_cred;
+	dp = (uint32_t *)&rp->rm_call.cb_cred;
 	ND_TCHECK(dp[1]);
 	len = EXTRACT_32BITS(&dp[1]);
 	if (len < length) {
@@ -445,9 +455,9 @@ trunc:
  * Print out an NFS file handle and return a pointer to following word.
  * If packet was truncated, return 0.
  */
-static const u_int32_t *
+static const uint32_t *
 parsefh(netdissect_options *ndo,
-        register const u_int32_t *dp, int v3)
+        register const uint32_t *dp, int v3)
 {
 	u_int len;
 
@@ -470,11 +480,11 @@ trunc:
  * Print out a file name and return pointer to 32-bit word past it.
  * If packet was truncated, return 0.
  */
-static const u_int32_t *
+static const uint32_t *
 parsefn(netdissect_options *ndo,
-        register const u_int32_t *dp)
+        register const uint32_t *dp)
 {
-	register u_int32_t len;
+	register uint32_t len;
 	register const u_char *cp;
 
 	/* Bail if we don't have the string length */
@@ -490,7 +500,7 @@ parsefn(netdissect_options *ndo,
 	/* Update 32-bit pointer (NFS filenames padded to 32-bit boundaries) */
 	dp += ((len + 3) & ~3) / sizeof(*dp);
 	ND_PRINT((ndo, "\""));
-	if (fn_printn(cp, len, ndo->ndo_snapend)) {
+	if (fn_printn(ndo, cp, len, ndo->ndo_snapend)) {
 		ND_PRINT((ndo, "\""));
 		goto trunc;
 	}
@@ -506,9 +516,9 @@ trunc:
  * Return pointer to 32-bit word past file name.
  * If packet was truncated (or there was some other error), return 0.
  */
-static const u_int32_t *
+static const uint32_t *
 parsefhn(netdissect_options *ndo,
-         register const u_int32_t *dp, int v3)
+         register const uint32_t *dp, int v3)
 {
 	dp = parsefh(ndo, dp, v3);
 	if (dp == NULL)
@@ -523,11 +533,11 @@ nfsreq_print_noaddr(netdissect_options *ndo,
                     register const u_char *bp2)
 {
 	register const struct sunrpc_msg *rp;
-	register const u_int32_t *dp;
+	register const uint32_t *dp;
 	nfs_type type;
 	int v3;
-	u_int32_t proc;
-	u_int32_t access_flags;
+	uint32_t proc;
+	uint32_t access_flags;
 	struct nfsv3_sattr sa3;
 
 	ND_PRINT((ndo, "%d", length));
@@ -543,37 +553,31 @@ nfsreq_print_noaddr(netdissect_options *ndo,
 	if (!v3 && proc < NFS_NPROCS)
 		proc =  nfsv3_procid[proc];
 
+	ND_PRINT((ndo, " %s", tok2str(nfsproc_str, "proc-%u", proc)));
 	switch (proc) {
-	case NFSPROC_NOOP:
-		ND_PRINT((ndo, " nop"));
-		return;
-	case NFSPROC_NULL:
-		ND_PRINT((ndo, " null"));
-		return;
 
 	case NFSPROC_GETATTR:
-		ND_PRINT((ndo, " getattr"));
-		if ((dp = parsereq(ndo, rp, length)) != NULL &&
-		    parsefh(ndo, dp, v3) != NULL)
-			return;
-		break;
-
 	case NFSPROC_SETATTR:
-		ND_PRINT((ndo, " setattr"));
+	case NFSPROC_READLINK:
+	case NFSPROC_FSSTAT:
+	case NFSPROC_FSINFO:
+	case NFSPROC_PATHCONF:
 		if ((dp = parsereq(ndo, rp, length)) != NULL &&
 		    parsefh(ndo, dp, v3) != NULL)
 			return;
 		break;
 
 	case NFSPROC_LOOKUP:
-		ND_PRINT((ndo, " lookup"));
+	case NFSPROC_CREATE:
+	case NFSPROC_MKDIR:
+	case NFSPROC_REMOVE:
+	case NFSPROC_RMDIR:
 		if ((dp = parsereq(ndo, rp, length)) != NULL &&
 		    parsefhn(ndo, dp, v3) != NULL)
 			return;
 		break;
 
 	case NFSPROC_ACCESS:
-		ND_PRINT((ndo, " access"));
 		if ((dp = parsereq(ndo, rp, length)) != NULL &&
 		    (dp = parsefh(ndo, dp, v3)) != NULL) {
 			ND_TCHECK(dp[0]);
@@ -612,15 +616,7 @@ nfsreq_print_noaddr(netdissect_options *ndo,
 		}
 		break;
 
-	case NFSPROC_READLINK:
-		ND_PRINT((ndo, " readlink"));
-		if ((dp = parsereq(ndo, rp, length)) != NULL &&
-		    parsefh(ndo, dp, v3) != NULL)
-			return;
-		break;
-
 	case NFSPROC_READ:
-		ND_PRINT((ndo, " read"));
 		if ((dp = parsereq(ndo, rp, length)) != NULL &&
 		    (dp = parsefh(ndo, dp, v3)) != NULL) {
 			if (v3) {
@@ -639,7 +635,6 @@ nfsreq_print_noaddr(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_WRITE:
-		ND_PRINT((ndo, " write"));
 		if ((dp = parsereq(ndo, rp, length)) != NULL &&
 		    (dp = parsefh(ndo, dp, v3)) != NULL) {
 			if (v3) {
@@ -667,21 +662,7 @@ nfsreq_print_noaddr(netdissect_options *ndo,
 		}
 		break;
 
-	case NFSPROC_CREATE:
-		ND_PRINT((ndo, " create"));
-		if ((dp = parsereq(ndo, rp, length)) != NULL &&
-		    parsefhn(ndo, dp, v3) != NULL)
-			return;
-		break;
-
-	case NFSPROC_MKDIR:
-		ND_PRINT((ndo, " mkdir"));
-		if ((dp = parsereq(ndo, rp, length)) != 0 && parsefhn(ndo, dp, v3) != 0)
-			return;
-		break;
-
 	case NFSPROC_SYMLINK:
-		ND_PRINT((ndo, " symlink"));
 		if ((dp = parsereq(ndo, rp, length)) != 0 &&
 		    (dp = parsefhn(ndo, dp, v3)) != 0) {
 			ND_PRINT((ndo, " ->"));
@@ -696,7 +677,6 @@ nfsreq_print_noaddr(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_MKNOD:
-		ND_PRINT((ndo, " mknod"));
 		if ((dp = parsereq(ndo, rp, length)) != 0 &&
 		    (dp = parsefhn(ndo, dp, v3)) != 0) {
 			ND_TCHECK(*dp);
@@ -718,22 +698,7 @@ nfsreq_print_noaddr(netdissect_options *ndo,
 		}
 		break;
 
-	case NFSPROC_REMOVE:
-		ND_PRINT((ndo, " remove"));
-		if ((dp = parsereq(ndo, rp, length)) != NULL &&
-		    parsefhn(ndo, dp, v3) != NULL)
-			return;
-		break;
-
-	case NFSPROC_RMDIR:
-		ND_PRINT((ndo, " rmdir"));
-		if ((dp = parsereq(ndo, rp, length)) != NULL &&
-		    parsefhn(ndo, dp, v3) != NULL)
-			return;
-		break;
-
 	case NFSPROC_RENAME:
-		ND_PRINT((ndo, " rename"));
 		if ((dp = parsereq(ndo, rp, length)) != NULL &&
 		    (dp = parsefhn(ndo, dp, v3)) != NULL) {
 			ND_PRINT((ndo, " ->"));
@@ -743,7 +708,6 @@ nfsreq_print_noaddr(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_LINK:
-		ND_PRINT((ndo, " link"));
 		if ((dp = parsereq(ndo, rp, length)) != NULL &&
 		    (dp = parsefh(ndo, dp, v3)) != NULL) {
 			ND_PRINT((ndo, " ->"));
@@ -753,7 +717,6 @@ nfsreq_print_noaddr(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_READDIR:
-		ND_PRINT((ndo, " readdir"));
 		if ((dp = parsereq(ndo, rp, length)) != NULL &&
 		    (dp = parsefh(ndo, dp, v3)) != NULL) {
 			if (v3) {
@@ -782,7 +745,6 @@ nfsreq_print_noaddr(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_READDIRPLUS:
-		ND_PRINT((ndo, " readdirplus"));
 		if ((dp = parsereq(ndo, rp, length)) != NULL &&
 		    (dp = parsefh(ndo, dp, v3)) != NULL) {
 			ND_TCHECK(dp[4]);
@@ -802,29 +764,7 @@ nfsreq_print_noaddr(netdissect_options *ndo,
 		}
 		break;
 
-	case NFSPROC_FSSTAT:
-		ND_PRINT((ndo, " fsstat"));
-		if ((dp = parsereq(ndo, rp, length)) != NULL &&
-		    parsefh(ndo, dp, v3) != NULL)
-			return;
-		break;
-
-	case NFSPROC_FSINFO:
-		ND_PRINT((ndo, " fsinfo"));
-		if ((dp = parsereq(ndo, rp, length)) != NULL &&
-		    parsefh(ndo, dp, v3) != NULL)
-			return;
-		break;
-
-	case NFSPROC_PATHCONF:
-		ND_PRINT((ndo, " pathconf"));
-		if ((dp = parsereq(ndo, rp, length)) != NULL &&
-		    parsefh(ndo, dp, v3) != NULL)
-			return;
-		break;
-
 	case NFSPROC_COMMIT:
-		ND_PRINT((ndo, " commit"));
 		if ((dp = parsereq(ndo, rp, length)) != NULL &&
 		    (dp = parsefh(ndo, dp, v3)) != NULL) {
 			ND_TCHECK(dp[2]);
@@ -836,7 +776,6 @@ nfsreq_print_noaddr(netdissect_options *ndo,
 		break;
 
 	default:
-		ND_PRINT((ndo, " proc-%u", EXTRACT_32BITS(&rp->rm_call.cb_proc)));
 		return;
 	}
 
@@ -856,10 +795,10 @@ trunc:
  */
 static void
 nfs_printfh(netdissect_options *ndo,
-            register const u_int32_t *dp, const u_int len)
+            register const uint32_t *dp, const u_int len)
 {
 	my_fsid fsid;
-	u_int32_t ino;
+	uint32_t ino;
 	const char *sfsname = NULL;
 	char *spacep;
 
@@ -910,7 +849,7 @@ nfs_printfh(netdissect_options *ndo,
  */
 
 struct xid_map_entry {
-	u_int32_t	xid;		/* transaction ID (net order) */
+	uint32_t	xid;		/* transaction ID (net order) */
 	int ipver;			/* IP version (4 or 6) */
 #ifdef INET6
 	struct in6_addr	client;		/* client IP address (net order) */
@@ -919,8 +858,8 @@ struct xid_map_entry {
 	struct in_addr	client;		/* client IP address (net order) */
 	struct in_addr	server;		/* server IP address (net order) */
 #endif
-	u_int32_t	proc;		/* call proc number (host order) */
-	u_int32_t	vers;		/* program version (host order) */
+	uint32_t	proc;		/* call proc number (host order) */
+	uint32_t	vers;		/* program version (host order) */
 };
 
 /*
@@ -966,7 +905,7 @@ xid_map_enter(netdissect_options *ndo,
 	if (++xid_map_next >= XIDMAPSIZE)
 		xid_map_next = 0;
 
-	xmep->xid = rp->rm_xid;
+	UNALIGNED_MEMCPY(&xmep->xid, &rp->rm_xid, sizeof(xmep->xid));
 	if (ip) {
 		xmep->ipver = 4;
 		UNALIGNED_MEMCPY(&xmep->client, &ip->ip_src, sizeof(ip->ip_src));
@@ -989,12 +928,12 @@ xid_map_enter(netdissect_options *ndo,
  * version in vers return, or returns -1 on failure
  */
 static int
-xid_map_find(const struct sunrpc_msg *rp, const u_char *bp, u_int32_t *proc,
-	     u_int32_t *vers)
+xid_map_find(const struct sunrpc_msg *rp, const u_char *bp, uint32_t *proc,
+	     uint32_t *vers)
 {
 	int i;
 	struct xid_map_entry *xmep;
-	u_int32_t xid = rp->rm_xid;
+	uint32_t xid = rp->rm_xid;
 	struct ip *ip = (struct ip *)bp;
 #ifdef INET6
 	struct ip6_hdr *ip6 = (struct ip6_hdr *)bp;
@@ -1055,11 +994,11 @@ xid_map_find(const struct sunrpc_msg *rp, const u_char *bp, u_int32_t *proc,
  * Return a pointer to the beginning of the actual results.
  * If the packet was truncated, return 0.
  */
-static const u_int32_t *
+static const uint32_t *
 parserep(netdissect_options *ndo,
          register const struct sunrpc_msg *rp, register u_int length)
 {
-	register const u_int32_t *dp;
+	register const uint32_t *dp;
 	u_int len;
 	enum sunrpc_accept_stat astat;
 
@@ -1067,7 +1006,7 @@ parserep(netdissect_options *ndo,
 	 * Portability note:
 	 * Here we find the address of the ar_verf credentials.
 	 * Originally, this calculation was
-	 *	dp = (u_int32_t *)&rp->rm_reply.rp_acpt.ar_verf
+	 *	dp = (uint32_t *)&rp->rm_reply.rp_acpt.ar_verf
 	 * On the wire, the rp_acpt field starts immediately after
 	 * the (32 bit) rp_stat field.  However, rp_acpt (which is a
 	 * "struct accepted_reply") contains a "struct opaque_auth",
@@ -1078,7 +1017,7 @@ parserep(netdissect_options *ndo,
 	 * representation.  Instead, we skip past the rp_stat field,
 	 * which is an "enum" and so occupies one 32-bit word.
 	 */
-	dp = ((const u_int32_t *)&rp->rm_reply) + 1;
+	dp = ((const uint32_t *)&rp->rm_reply) + 1;
 	ND_TCHECK(dp[1]);
 	len = EXTRACT_32BITS(&dp[1]);
 	if (len >= length)
@@ -1086,58 +1025,28 @@ parserep(netdissect_options *ndo,
 	/*
 	 * skip past the ar_verf credentials.
 	 */
-	dp += (len + (2*sizeof(u_int32_t) + 3)) / sizeof(u_int32_t);
+	dp += (len + (2*sizeof(uint32_t) + 3)) / sizeof(uint32_t);
 	ND_TCHECK2(dp[0], 0);
 
 	/*
 	 * now we can check the ar_stat field
 	 */
 	astat = (enum sunrpc_accept_stat) EXTRACT_32BITS(dp);
-	switch (astat) {
-
-	case SUNRPC_SUCCESS:
-		break;
-
-	case SUNRPC_PROG_UNAVAIL:
-		ND_PRINT((ndo, " PROG_UNAVAIL"));
-		nfserr = 1;		/* suppress trunc string */
-		return (NULL);
-
-	case SUNRPC_PROG_MISMATCH:
-		ND_PRINT((ndo, " PROG_MISMATCH"));
-		nfserr = 1;		/* suppress trunc string */
-		return (NULL);
-
-	case SUNRPC_PROC_UNAVAIL:
-		ND_PRINT((ndo, " PROC_UNAVAIL"));
-		nfserr = 1;		/* suppress trunc string */
-		return (NULL);
-
-	case SUNRPC_GARBAGE_ARGS:
-		ND_PRINT((ndo, " GARBAGE_ARGS"));
-		nfserr = 1;		/* suppress trunc string */
-		return (NULL);
-
-	case SUNRPC_SYSTEM_ERR:
-		ND_PRINT((ndo, " SYSTEM_ERR"));
-		nfserr = 1;		/* suppress trunc string */
-		return (NULL);
-
-	default:
-		ND_PRINT((ndo, " ar_stat %d", astat));
+	if (astat != SUNRPC_SUCCESS) {
+		ND_PRINT((ndo, " %s", tok2str(sunrpc_str, "ar_stat %d", astat)));
 		nfserr = 1;		/* suppress trunc string */
 		return (NULL);
 	}
 	/* successful return */
 	ND_TCHECK2(*dp, sizeof(astat));
-	return ((u_int32_t *) (sizeof(astat) + ((char *)dp)));
+	return ((uint32_t *) (sizeof(astat) + ((char *)dp)));
 trunc:
 	return (0);
 }
 
-static const u_int32_t *
+static const uint32_t *
 parsestatus(netdissect_options *ndo,
-            const u_int32_t *dp, int *er)
+            const uint32_t *dp, int *er)
 {
 	int errnum;
 
@@ -1157,9 +1066,9 @@ trunc:
 	return NULL;
 }
 
-static const u_int32_t *
+static const uint32_t *
 parsefattr(netdissect_options *ndo,
-           const u_int32_t *dp, int verbose, int v3)
+           const uint32_t *dp, int verbose, int v3)
 {
 	const struct nfs_fattr *fap;
 
@@ -1175,7 +1084,7 @@ parsefattr(netdissect_options *ndo,
 		if (v3) {
 			ND_TCHECK(fap->fa3_size);
 			ND_PRINT((ndo, " sz %" PRIu64,
-				EXTRACT_64BITS((u_int32_t *)&fap->fa3_size)));
+				EXTRACT_64BITS((uint32_t *)&fap->fa3_size)));
 		} else {
 			ND_TCHECK(fap->fa2_size);
 			ND_PRINT((ndo, " sz %d", EXTRACT_32BITS(&fap->fa2_size)));
@@ -1190,9 +1099,9 @@ parsefattr(netdissect_options *ndo,
 			       EXTRACT_32BITS(&fap->fa3_rdev.specdata1),
 			       EXTRACT_32BITS(&fap->fa3_rdev.specdata2)));
 			ND_PRINT((ndo, " fsid %" PRIx64,
-				EXTRACT_64BITS((u_int32_t *)&fap->fa3_fsid)));
+				EXTRACT_64BITS((uint32_t *)&fap->fa3_fsid)));
 			ND_PRINT((ndo, " fileid %" PRIx64,
-				EXTRACT_64BITS((u_int32_t *)&fap->fa3_fileid)));
+				EXTRACT_64BITS((uint32_t *)&fap->fa3_fileid)));
 			ND_PRINT((ndo, " a/m/ctime %u.%06u",
 			       EXTRACT_32BITS(&fap->fa3_atime.nfsv3_sec),
 			       EXTRACT_32BITS(&fap->fa3_atime.nfsv3_nsec)));
@@ -1204,7 +1113,7 @@ parsefattr(netdissect_options *ndo,
 			       EXTRACT_32BITS(&fap->fa3_ctime.nfsv3_nsec)));
 		} else {
 			ND_TCHECK(fap->fa2_ctime);
-			ND_PRINT((ndo, " nlink %d rdev %x fsid %x nodeid %x a/m/ctime",
+			ND_PRINT((ndo, " nlink %d rdev 0x%x fsid 0x%x nodeid 0x%x a/m/ctime",
 			       EXTRACT_32BITS(&fap->fa_nlink),
 			       EXTRACT_32BITS(&fap->fa2_rdev),
 			       EXTRACT_32BITS(&fap->fa2_fsid),
@@ -1220,7 +1129,7 @@ parsefattr(netdissect_options *ndo,
 			       EXTRACT_32BITS(&fap->fa2_ctime.nfsv2_usec)));
 		}
 	}
-	return ((const u_int32_t *)((unsigned char *)dp +
+	return ((const uint32_t *)((unsigned char *)dp +
 		(v3 ? NFSX_V3FATTR : NFSX_V2FATTR)));
 trunc:
 	return (NULL);
@@ -1228,7 +1137,7 @@ trunc:
 
 static int
 parseattrstat(netdissect_options *ndo,
-              const u_int32_t *dp, int verbose, int v3)
+              const uint32_t *dp, int verbose, int v3)
 {
 	int er;
 
@@ -1243,7 +1152,7 @@ parseattrstat(netdissect_options *ndo,
 
 static int
 parsediropres(netdissect_options *ndo,
-              const u_int32_t *dp)
+              const uint32_t *dp)
 {
 	int er;
 
@@ -1261,7 +1170,7 @@ parsediropres(netdissect_options *ndo,
 
 static int
 parselinkres(netdissect_options *ndo,
-             const u_int32_t *dp, int v3)
+             const uint32_t *dp, int v3)
 {
 	int er;
 
@@ -1278,7 +1187,7 @@ parselinkres(netdissect_options *ndo,
 
 static int
 parsestatfs(netdissect_options *ndo,
-            const u_int32_t *dp, int v3)
+            const uint32_t *dp, int v3)
 {
 	const struct nfs_statfs *sfsp;
 	int er;
@@ -1305,14 +1214,14 @@ parsestatfs(netdissect_options *ndo,
 
 	if (v3) {
 		ND_PRINT((ndo, " tbytes %" PRIu64 " fbytes %" PRIu64 " abytes %" PRIu64,
-			EXTRACT_64BITS((u_int32_t *)&sfsp->sf_tbytes),
-			EXTRACT_64BITS((u_int32_t *)&sfsp->sf_fbytes),
-			EXTRACT_64BITS((u_int32_t *)&sfsp->sf_abytes)));
+			EXTRACT_64BITS((uint32_t *)&sfsp->sf_tbytes),
+			EXTRACT_64BITS((uint32_t *)&sfsp->sf_fbytes),
+			EXTRACT_64BITS((uint32_t *)&sfsp->sf_abytes)));
 		if (ndo->ndo_vflag) {
 			ND_PRINT((ndo, " tfiles %" PRIu64 " ffiles %" PRIu64 " afiles %" PRIu64 " invar %u",
-			       EXTRACT_64BITS((u_int32_t *)&sfsp->sf_tfiles),
-			       EXTRACT_64BITS((u_int32_t *)&sfsp->sf_ffiles),
-			       EXTRACT_64BITS((u_int32_t *)&sfsp->sf_afiles),
+			       EXTRACT_64BITS((uint32_t *)&sfsp->sf_tfiles),
+			       EXTRACT_64BITS((uint32_t *)&sfsp->sf_ffiles),
+			       EXTRACT_64BITS((uint32_t *)&sfsp->sf_afiles),
 			       EXTRACT_32BITS(&sfsp->sf_invarsec)));
 		}
 	} else {
@@ -1331,7 +1240,7 @@ trunc:
 
 static int
 parserddires(netdissect_options *ndo,
-             const u_int32_t *dp)
+             const uint32_t *dp)
 {
 	int er;
 
@@ -1344,7 +1253,7 @@ parserddires(netdissect_options *ndo,
 		return (1);
 
 	ND_TCHECK(dp[2]);
-	ND_PRINT((ndo, " offset %x size %d ",
+	ND_PRINT((ndo, " offset 0x%x size %d ",
 	       EXTRACT_32BITS(&dp[0]), EXTRACT_32BITS(&dp[1])));
 	if (dp[2] != 0)
 		ND_PRINT((ndo, " eof"));
@@ -1354,9 +1263,9 @@ trunc:
 	return (0);
 }
 
-static const u_int32_t *
+static const uint32_t *
 parse_wcc_attr(netdissect_options *ndo,
-               const u_int32_t *dp)
+               const uint32_t *dp)
 {
 	ND_PRINT((ndo, " sz %" PRIu64, EXTRACT_64BITS(&dp[0])));
 	ND_PRINT((ndo, " mtime %u.%06u ctime %u.%06u",
@@ -1368,9 +1277,9 @@ parse_wcc_attr(netdissect_options *ndo,
 /*
  * Pre operation attributes. Print only if vflag > 1.
  */
-static const u_int32_t *
+static const uint32_t *
 parse_pre_op_attr(netdissect_options *ndo,
-                  const u_int32_t *dp, int verbose)
+                  const uint32_t *dp, int verbose)
 {
 	ND_TCHECK(dp[0]);
 	if (!EXTRACT_32BITS(&dp[0]))
@@ -1390,9 +1299,9 @@ trunc:
 /*
  * Post operation attributes are printed if vflag >= 1
  */
-static const u_int32_t *
+static const uint32_t *
 parse_post_op_attr(netdissect_options *ndo,
-                   const u_int32_t *dp, int verbose)
+                   const uint32_t *dp, int verbose)
 {
 	ND_TCHECK(dp[0]);
 	if (!EXTRACT_32BITS(&dp[0]))
@@ -1401,14 +1310,14 @@ parse_post_op_attr(netdissect_options *ndo,
 	if (verbose) {
 		return parsefattr(ndo, dp, verbose, 1);
 	} else
-		return (dp + (NFSX_V3FATTR / sizeof (u_int32_t)));
+		return (dp + (NFSX_V3FATTR / sizeof (uint32_t)));
 trunc:
 	return (NULL);
 }
 
-static const u_int32_t *
+static const uint32_t *
 parse_wcc_data(netdissect_options *ndo,
-               const u_int32_t *dp, int verbose)
+               const uint32_t *dp, int verbose)
 {
 	if (verbose > 1)
 		ND_PRINT((ndo, " PRE:"));
@@ -1420,9 +1329,9 @@ parse_wcc_data(netdissect_options *ndo,
 	return parse_post_op_attr(ndo, dp, verbose);
 }
 
-static const u_int32_t *
+static const uint32_t *
 parsecreateopres(netdissect_options *ndo,
-                 const u_int32_t *dp, int verbose)
+                 const uint32_t *dp, int verbose)
 {
 	int er;
 
@@ -1453,7 +1362,7 @@ trunc:
 
 static int
 parsewccres(netdissect_options *ndo,
-            const u_int32_t *dp, int verbose)
+            const uint32_t *dp, int verbose)
 {
 	int er;
 
@@ -1462,9 +1371,9 @@ parsewccres(netdissect_options *ndo,
 	return parse_wcc_data(ndo, dp, verbose) != 0;
 }
 
-static const u_int32_t *
+static const uint32_t *
 parsev3rddirres(netdissect_options *ndo,
-                const u_int32_t *dp, int verbose)
+                const uint32_t *dp, int verbose)
 {
 	int er;
 
@@ -1488,7 +1397,7 @@ trunc:
 
 static int
 parsefsinfo(netdissect_options *ndo,
-            const u_int32_t *dp)
+            const uint32_t *dp)
 {
 	struct nfsv3_fsinfo *sfp;
 	int er;
@@ -1514,7 +1423,7 @@ parsefsinfo(netdissect_options *ndo,
 		ND_PRINT((ndo, " rtmult %u wtmult %u maxfsz %" PRIu64,
 		       EXTRACT_32BITS(&sfp->fs_rtmult),
 		       EXTRACT_32BITS(&sfp->fs_wtmult),
-		       EXTRACT_64BITS((u_int32_t *)&sfp->fs_maxfilesize)));
+		       EXTRACT_64BITS((uint32_t *)&sfp->fs_maxfilesize)));
 		ND_PRINT((ndo, " delta %u.%06u ",
 		       EXTRACT_32BITS(&sfp->fs_timedelta.nfsv3_sec),
 		       EXTRACT_32BITS(&sfp->fs_timedelta.nfsv3_nsec)));
@@ -1526,7 +1435,7 @@ trunc:
 
 static int
 parsepathconf(netdissect_options *ndo,
-              const u_int32_t *dp)
+              const uint32_t *dp)
 {
 	int er;
 	struct nfsv3_pathconf *spp;
@@ -1557,9 +1466,9 @@ trunc:
 
 static void
 interp_reply(netdissect_options *ndo,
-             const struct sunrpc_msg *rp, u_int32_t proc, u_int32_t vers, int length)
+             const struct sunrpc_msg *rp, uint32_t proc, uint32_t vers, int length)
 {
-	register const u_int32_t *dp;
+	register const uint32_t *dp;
 	register int v3;
 	int er;
 
@@ -1568,25 +1477,16 @@ interp_reply(netdissect_options *ndo,
 	if (!v3 && proc < NFS_NPROCS)
 		proc = nfsv3_procid[proc];
 
+	ND_PRINT((ndo, " %s", tok2str(nfsproc_str, "proc-%u", proc)));
 	switch (proc) {
 
-	case NFSPROC_NOOP:
-		ND_PRINT((ndo, " nop"));
-		return;
-
-	case NFSPROC_NULL:
-		ND_PRINT((ndo, " null"));
-		return;
-
 	case NFSPROC_GETATTR:
-		ND_PRINT((ndo, " getattr"));
 		dp = parserep(ndo, rp, length);
 		if (dp != NULL && parseattrstat(ndo, dp, !ndo->ndo_qflag, v3) != 0)
 			return;
 		break;
 
 	case NFSPROC_SETATTR:
-		ND_PRINT((ndo, " setattr"));
 		if (!(dp = parserep(ndo, rp, length)))
 			return;
 		if (v3) {
@@ -1599,7 +1499,6 @@ interp_reply(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_LOOKUP:
-		ND_PRINT((ndo, " lookup"));
 		if (!(dp = parserep(ndo, rp, length)))
 			break;
 		if (v3) {
@@ -1628,7 +1527,6 @@ interp_reply(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_ACCESS:
-		ND_PRINT((ndo, " access"));
 		if (!(dp = parserep(ndo, rp, length)))
 			break;
 		if (!(dp = parsestatus(ndo, dp, &er)))
@@ -1642,14 +1540,12 @@ interp_reply(netdissect_options *ndo,
 		return;
 
 	case NFSPROC_READLINK:
-		ND_PRINT((ndo, " readlink"));
 		dp = parserep(ndo, rp, length);
 		if (dp != NULL && parselinkres(ndo, dp, v3) != 0)
 			return;
 		break;
 
 	case NFSPROC_READ:
-		ND_PRINT((ndo, " read"));
 		if (!(dp = parserep(ndo, rp, length)))
 			break;
 		if (v3) {
@@ -1673,7 +1569,6 @@ interp_reply(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_WRITE:
-		ND_PRINT((ndo, " write"));
 		if (!(dp = parserep(ndo, rp, length)))
 			break;
 		if (v3) {
@@ -1701,20 +1596,7 @@ interp_reply(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_CREATE:
-		ND_PRINT((ndo, " create"));
-		if (!(dp = parserep(ndo, rp, length)))
-			break;
-		if (v3) {
-			if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != 0)
-				return;
-		} else {
-			if (parsediropres(ndo, dp) != 0)
-				return;
-		}
-		break;
-
 	case NFSPROC_MKDIR:
-		ND_PRINT((ndo, " mkdir"));
 		if (!(dp = parserep(ndo, rp, length)))
 			break;
 		if (v3) {
@@ -1727,7 +1609,6 @@ interp_reply(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_SYMLINK:
-		ND_PRINT((ndo, " symlink"));
 		if (!(dp = parserep(ndo, rp, length)))
 			break;
 		if (v3) {
@@ -1740,7 +1621,6 @@ interp_reply(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_MKNOD:
-		ND_PRINT((ndo, " mknod"));
 		if (!(dp = parserep(ndo, rp, length)))
 			break;
 		if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != 0)
@@ -1748,20 +1628,7 @@ interp_reply(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_REMOVE:
-		ND_PRINT((ndo, " remove"));
-		if (!(dp = parserep(ndo, rp, length)))
-			break;
-		if (v3) {
-			if (parsewccres(ndo, dp, ndo->ndo_vflag))
-				return;
-		} else {
-			if (parsestatus(ndo, dp, &er) != 0)
-				return;
-		}
-		break;
-
 	case NFSPROC_RMDIR:
-		ND_PRINT((ndo, " rmdir"));
 		if (!(dp = parserep(ndo, rp, length)))
 			break;
 		if (v3) {
@@ -1774,7 +1641,6 @@ interp_reply(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_RENAME:
-		ND_PRINT((ndo, " rename"));
 		if (!(dp = parserep(ndo, rp, length)))
 			break;
 		if (v3) {
@@ -1796,7 +1662,6 @@ interp_reply(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_LINK:
-		ND_PRINT((ndo, " link"));
 		if (!(dp = parserep(ndo, rp, length)))
 			break;
 		if (v3) {
@@ -1818,7 +1683,6 @@ interp_reply(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_READDIR:
-		ND_PRINT((ndo, " readdir"));
 		if (!(dp = parserep(ndo, rp, length)))
 			break;
 		if (v3) {
@@ -1831,7 +1695,6 @@ interp_reply(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_READDIRPLUS:
-		ND_PRINT((ndo, " readdirplus"));
 		if (!(dp = parserep(ndo, rp, length)))
 			break;
 		if (parsev3rddirres(ndo, dp, ndo->ndo_vflag))
@@ -1839,35 +1702,30 @@ interp_reply(netdissect_options *ndo,
 		break;
 
 	case NFSPROC_FSSTAT:
-		ND_PRINT((ndo, " fsstat"));
 		dp = parserep(ndo, rp, length);
 		if (dp != NULL && parsestatfs(ndo, dp, v3) != 0)
 			return;
 		break;
 
 	case NFSPROC_FSINFO:
-		ND_PRINT((ndo, " fsinfo"));
 		dp = parserep(ndo, rp, length);
 		if (dp != NULL && parsefsinfo(ndo, dp) != 0)
 			return;
 		break;
 
 	case NFSPROC_PATHCONF:
-		ND_PRINT((ndo, " pathconf"));
 		dp = parserep(ndo, rp, length);
 		if (dp != NULL && parsepathconf(ndo, dp) != 0)
 			return;
 		break;
 
 	case NFSPROC_COMMIT:
-		ND_PRINT((ndo, " commit"));
 		dp = parserep(ndo, rp, length);
 		if (dp != NULL && parsewccres(ndo, dp, ndo->ndo_vflag) != 0)
 			return;
 		break;
 
 	default:
-		ND_PRINT((ndo, " proc-%u", proc));
 		return;
 	}
 trunc: