]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-nfs.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use the EXTRACT_U_1() macro in some utility functions
[tcpdump] / print-nfs.c
diff --git a/print-nfs.c b/print-nfs.c
index 45b42787be0f4f8e36922892aac157558af32523..3407961f4000f41d05243bee91eec6554fc06a16 100644 (file)
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -22,10 +22,10 @@
 /* \summary: Network File System (NFS) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Network File System (NFS) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -226,65 +226,65 @@ print_nfsaddr(netdissect_options *ndo,
                break;
        }
 
                break;
        }
 
-       ND_PRINT((ndo, "%s.%s > %s.%s: ", srcaddr, s, dstaddr, d));
+       ND_PRINT("%s.%s > %s.%s: ", srcaddr, s, dstaddr, d);
 }
 
 static const uint32_t *
 parse_sattr3(netdissect_options *ndo,
              const uint32_t *dp, struct nfsv3_sattr *sa3)
 {
 }
 
 static const uint32_t *
 parse_sattr3(netdissect_options *ndo,
              const uint32_t *dp, struct nfsv3_sattr *sa3)
 {
-       ND_TCHECK(dp[0]);
+       ND_TCHECK_4(dp);
        sa3->sa_modeset = EXTRACT_BE_U_4(dp);
        dp++;
        if (sa3->sa_modeset) {
        sa3->sa_modeset = EXTRACT_BE_U_4(dp);
        dp++;
        if (sa3->sa_modeset) {
-               ND_TCHECK(dp[0]);
+               ND_TCHECK_4(dp);
                sa3->sa_mode = EXTRACT_BE_U_4(dp);
                dp++;
        }
 
                sa3->sa_mode = EXTRACT_BE_U_4(dp);
                dp++;
        }
 
-       ND_TCHECK(dp[0]);
+       ND_TCHECK_4(dp);
        sa3->sa_uidset = EXTRACT_BE_U_4(dp);
        dp++;
        if (sa3->sa_uidset) {
        sa3->sa_uidset = EXTRACT_BE_U_4(dp);
        dp++;
        if (sa3->sa_uidset) {
-               ND_TCHECK(dp[0]);
+               ND_TCHECK_4(dp);
                sa3->sa_uid = EXTRACT_BE_U_4(dp);
                dp++;
        }
 
                sa3->sa_uid = EXTRACT_BE_U_4(dp);
                dp++;
        }
 
-       ND_TCHECK(dp[0]);
+       ND_TCHECK_4(dp);
        sa3->sa_gidset = EXTRACT_BE_U_4(dp);
        dp++;
        if (sa3->sa_gidset) {
        sa3->sa_gidset = EXTRACT_BE_U_4(dp);
        dp++;
        if (sa3->sa_gidset) {
-               ND_TCHECK(dp[0]);
+               ND_TCHECK_4(dp);
                sa3->sa_gid = EXTRACT_BE_U_4(dp);
                dp++;
        }
 
                sa3->sa_gid = EXTRACT_BE_U_4(dp);
                dp++;
        }
 
-       ND_TCHECK(dp[0]);
+       ND_TCHECK_4(dp);
        sa3->sa_sizeset = EXTRACT_BE_U_4(dp);
        dp++;
        if (sa3->sa_sizeset) {
        sa3->sa_sizeset = EXTRACT_BE_U_4(dp);
        dp++;
        if (sa3->sa_sizeset) {
-               ND_TCHECK(dp[0]);
+               ND_TCHECK_4(dp);
                sa3->sa_size = EXTRACT_BE_U_4(dp);
                dp++;
        }
 
                sa3->sa_size = EXTRACT_BE_U_4(dp);
                dp++;
        }
 
-       ND_TCHECK(dp[0]);
+       ND_TCHECK_4(dp);
        sa3->sa_atimetype = EXTRACT_BE_U_4(dp);
        dp++;
        if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT) {
        sa3->sa_atimetype = EXTRACT_BE_U_4(dp);
        dp++;
        if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT) {
-               ND_TCHECK(dp[1]);
+               ND_TCHECK_4(dp + 1);
                sa3->sa_atime.nfsv3_sec = EXTRACT_BE_U_4(dp);
                dp++;
                sa3->sa_atime.nfsv3_nsec = EXTRACT_BE_U_4(dp);
                dp++;
        }
 
                sa3->sa_atime.nfsv3_sec = EXTRACT_BE_U_4(dp);
                dp++;
                sa3->sa_atime.nfsv3_nsec = EXTRACT_BE_U_4(dp);
                dp++;
        }
 
-       ND_TCHECK(dp[0]);
+       ND_TCHECK_4(dp);
        sa3->sa_mtimetype = EXTRACT_BE_U_4(dp);
        dp++;
        if (sa3->sa_mtimetype == NFSV3SATTRTIME_TOCLIENT) {
        sa3->sa_mtimetype = EXTRACT_BE_U_4(dp);
        dp++;
        if (sa3->sa_mtimetype == NFSV3SATTRTIME_TOCLIENT) {
-               ND_TCHECK(dp[1]);
+               ND_TCHECK_4(dp + 1);
                sa3->sa_mtime.nfsv3_sec = EXTRACT_BE_U_4(dp);
                dp++;
                sa3->sa_mtime.nfsv3_nsec = EXTRACT_BE_U_4(dp);
                sa3->sa_mtime.nfsv3_sec = EXTRACT_BE_U_4(dp);
                dp++;
                sa3->sa_mtime.nfsv3_nsec = EXTRACT_BE_U_4(dp);
@@ -303,18 +303,18 @@ print_sattr3(netdissect_options *ndo,
              const struct nfsv3_sattr *sa3, int verbose)
 {
        if (sa3->sa_modeset)
              const struct nfsv3_sattr *sa3, int verbose)
 {
        if (sa3->sa_modeset)
-               ND_PRINT((ndo, " mode %o", sa3->sa_mode));
+               ND_PRINT(" mode %o", sa3->sa_mode);
        if (sa3->sa_uidset)
        if (sa3->sa_uidset)
-               ND_PRINT((ndo, " uid %u", sa3->sa_uid));
+               ND_PRINT(" uid %u", sa3->sa_uid);
        if (sa3->sa_gidset)
        if (sa3->sa_gidset)
-               ND_PRINT((ndo, " gid %u", sa3->sa_gid));
+               ND_PRINT(" gid %u", sa3->sa_gid);
        if (verbose > 1) {
                if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT)
        if (verbose > 1) {
                if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT)
-                       ND_PRINT((ndo, " atime %u.%06u", sa3->sa_atime.nfsv3_sec,
-                              sa3->sa_atime.nfsv3_nsec));
+                       ND_PRINT(" atime %u.%06u", sa3->sa_atime.nfsv3_sec,
+                              sa3->sa_atime.nfsv3_nsec);
                if (sa3->sa_mtimetype == NFSV3SATTRTIME_TOCLIENT)
                if (sa3->sa_mtimetype == NFSV3SATTRTIME_TOCLIENT)
-                       ND_PRINT((ndo, " mtime %u.%06u", sa3->sa_mtime.nfsv3_sec,
-                              sa3->sa_mtime.nfsv3_nsec));
+                       ND_PRINT(" mtime %u.%06u", sa3->sa_mtime.nfsv3_sec,
+                              sa3->sa_mtime.nfsv3_nsec);
        }
 }
 
        }
 }
 
@@ -329,15 +329,15 @@ nfsreply_print(netdissect_options *ndo,
        nfserr = 0;             /* assume no error */
        rp = (const struct sunrpc_msg *)bp;
 
        nfserr = 0;             /* assume no error */
        rp = (const struct sunrpc_msg *)bp;
 
-       ND_TCHECK(rp->rm_xid);
+       ND_TCHECK_4(rp->rm_xid);
        if (!ndo->ndo_nflag) {
                strlcpy(srcid, "nfs", sizeof(srcid));
                snprintf(dstid, sizeof(dstid), "%u",
        if (!ndo->ndo_nflag) {
                strlcpy(srcid, "nfs", sizeof(srcid));
                snprintf(dstid, sizeof(dstid), "%u",
-                   EXTRACT_BE_U_4(&rp->rm_xid));
+                   EXTRACT_BE_U_4(rp->rm_xid));
        } else {
                snprintf(srcid, sizeof(srcid), "%u", NFS_PORT);
                snprintf(dstid, sizeof(dstid), "%u",
        } else {
                snprintf(srcid, sizeof(srcid), "%u", NFS_PORT);
                snprintf(dstid, sizeof(dstid), "%u",
-                   EXTRACT_BE_U_4(&rp->rm_xid));
+                   EXTRACT_BE_U_4(rp->rm_xid));
        }
        print_nfsaddr(ndo, bp2, srcid, dstid);
 
        }
        print_nfsaddr(ndo, bp2, srcid, dstid);
 
@@ -346,7 +346,7 @@ nfsreply_print(netdissect_options *ndo,
 
 trunc:
        if (!nfserr)
 
 trunc:
        if (!nfserr)
-               ND_PRINT((ndo, "%s", tstr));
+               ND_PRINT("%s", tstr);
 }
 
 void
 }
 
 void
@@ -364,50 +364,50 @@ nfsreply_noaddr_print(netdissect_options *ndo,
        nfserr = 0;             /* assume no error */
        rp = (const struct sunrpc_msg *)bp;
 
        nfserr = 0;             /* assume no error */
        rp = (const struct sunrpc_msg *)bp;
 
-       ND_TCHECK(rp->rm_reply.rp_stat);
+       ND_TCHECK_4(rp->rm_reply.rp_stat);
        reply_stat = EXTRACT_BE_U_4(&rp->rm_reply.rp_stat);
        switch (reply_stat) {
 
        case SUNRPC_MSG_ACCEPTED:
        reply_stat = EXTRACT_BE_U_4(&rp->rm_reply.rp_stat);
        switch (reply_stat) {
 
        case SUNRPC_MSG_ACCEPTED:
-               ND_PRINT((ndo, "reply ok %u", length));
+               ND_PRINT("reply ok %u", length);
                if (xid_map_find(rp, bp2, &proc, &vers) >= 0)
                        interp_reply(ndo, rp, proc, vers, length);
                break;
 
        case SUNRPC_MSG_DENIED:
                if (xid_map_find(rp, bp2, &proc, &vers) >= 0)
                        interp_reply(ndo, rp, proc, vers, length);
                break;
 
        case SUNRPC_MSG_DENIED:
-               ND_PRINT((ndo, "reply ERR %u: ", length));
-               ND_TCHECK(rp->rm_reply.rp_reject.rj_stat);
+               ND_PRINT("reply ERR %u: ", length);
+               ND_TCHECK_4(rp->rm_reply.rp_reject.rj_stat);
                rstat = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_stat);
                switch (rstat) {
 
                case SUNRPC_RPC_MISMATCH:
                rstat = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_stat);
                switch (rstat) {
 
                case SUNRPC_RPC_MISMATCH:
-                       ND_TCHECK(rp->rm_reply.rp_reject.rj_vers.high);
+                       ND_TCHECK_4(rp->rm_reply.rp_reject.rj_vers.high);
                        rlow = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_vers.low);
                        rhigh = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_vers.high);
                        rlow = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_vers.low);
                        rhigh = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_vers.high);
-                       ND_PRINT((ndo, "RPC Version mismatch (%u-%u)", rlow, rhigh));
+                       ND_PRINT("RPC Version mismatch (%u-%u)", rlow, rhigh);
                        break;
 
                case SUNRPC_AUTH_ERROR:
                        break;
 
                case SUNRPC_AUTH_ERROR:
-                       ND_TCHECK(rp->rm_reply.rp_reject.rj_why);
+                       ND_TCHECK_4(rp->rm_reply.rp_reject.rj_why);
                        rwhy = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_why);
                        rwhy = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_why);
-                       ND_PRINT((ndo, "Auth %s", tok2str(sunrpc_auth_str, "Invalid failure code %u", rwhy)));
+                       ND_PRINT("Auth %s", tok2str(sunrpc_auth_str, "Invalid failure code %u", rwhy));
                        break;
 
                default:
                        break;
 
                default:
-                       ND_PRINT((ndo, "Unknown reason for rejecting rpc message %u", (unsigned int)rstat));
+                       ND_PRINT("Unknown reason for rejecting rpc message %u", (unsigned int)rstat);
                        break;
                }
                break;
 
        default:
                        break;
                }
                break;
 
        default:
-               ND_PRINT((ndo, "reply Unknown rpc response code=%u %u", reply_stat, length));
+               ND_PRINT("reply Unknown rpc response code=%u %u", reply_stat, length);
                break;
        }
        return;
 
 trunc:
        if (!nfserr)
                break;
        }
        return;
 
 trunc:
        if (!nfserr)
-               ND_PRINT((ndo, "%s", tstr));
+               ND_PRINT("%s", tstr);
 }
 
 /*
 }
 
 /*
@@ -425,11 +425,11 @@ parsereq(netdissect_options *ndo,
         * find the start of the req data (if we captured it)
         */
        dp = (const uint32_t *)&rp->rm_call.cb_cred;
         * find the start of the req data (if we captured it)
         */
        dp = (const uint32_t *)&rp->rm_call.cb_cred;
-       ND_TCHECK(dp[1]);
+       ND_TCHECK_4(dp + 1);
        len = EXTRACT_BE_U_4(dp + 1);
        if (len < length) {
                dp += (len + (2 * sizeof(*dp) + 3)) / sizeof(*dp);
        len = EXTRACT_BE_U_4(dp + 1);
        if (len < length) {
                dp += (len + (2 * sizeof(*dp) + 3)) / sizeof(*dp);
-               ND_TCHECK(dp[1]);
+               ND_TCHECK_4(dp + 1);
                len = EXTRACT_BE_U_4(dp + 1);
                if (len < length) {
                        dp += (len + (2 * sizeof(*dp) + 3)) / sizeof(*dp);
                len = EXTRACT_BE_U_4(dp + 1);
                if (len < length) {
                        dp += (len + (2 * sizeof(*dp) + 3)) / sizeof(*dp);
@@ -452,7 +452,7 @@ parsefh(netdissect_options *ndo,
        u_int len;
 
        if (v3) {
        u_int len;
 
        if (v3) {
-               ND_TCHECK(dp[0]);
+               ND_TCHECK_4(dp);
                len = EXTRACT_BE_U_4(dp) / 4;
                dp++;
        } else
                len = EXTRACT_BE_U_4(dp) / 4;
                dp++;
        } else
@@ -478,23 +478,23 @@ parsefn(netdissect_options *ndo,
        const u_char *cp;
 
        /* Bail if we don't have the string length */
        const u_char *cp;
 
        /* Bail if we don't have the string length */
-       ND_TCHECK(*dp);
+       ND_TCHECK_4(dp);
 
 
-       /* Fetch string length; convert to host order */
-       len = *dp++;
-       NTOHL(len);
+       /* Fetch big-endian string length */
+       len = EXTRACT_BE_U_4(dp);
+       dp++;
 
        ND_TCHECK_LEN(dp, ((len + 3) & ~3));
 
        cp = (const u_char *)dp;
        /* Update 32-bit pointer (NFS filenames padded to 32-bit boundaries) */
        dp += ((len + 3) & ~3) / sizeof(*dp);
 
        ND_TCHECK_LEN(dp, ((len + 3) & ~3));
 
        cp = (const u_char *)dp;
        /* Update 32-bit pointer (NFS filenames padded to 32-bit boundaries) */
        dp += ((len + 3) & ~3) / sizeof(*dp);
-       ND_PRINT((ndo, "\""));
+       ND_PRINT("\"");
        if (fn_printn(ndo, cp, len, ndo->ndo_snapend)) {
        if (fn_printn(ndo, cp, len, ndo->ndo_snapend)) {
-               ND_PRINT((ndo, "\""));
+               ND_PRINT("\"");
                goto trunc;
        }
                goto trunc;
        }
-       ND_PRINT((ndo, "\""));
+       ND_PRINT("\"");
 
        return (dp);
 trunc:
 
        return (dp);
 trunc:
@@ -513,7 +513,7 @@ parsefhn(netdissect_options *ndo,
        dp = parsefh(ndo, dp, v3);
        if (dp == NULL)
                return (NULL);
        dp = parsefh(ndo, dp, v3);
        if (dp == NULL)
                return (NULL);
-       ND_PRINT((ndo, " "));
+       ND_PRINT(" ");
        return (parsefn(ndo, dp));
 }
 
        return (parsefn(ndo, dp));
 }
 
@@ -530,7 +530,7 @@ nfsreq_noaddr_print(netdissect_options *ndo,
        uint32_t access_flags;
        struct nfsv3_sattr sa3;
 
        uint32_t access_flags;
        struct nfsv3_sattr sa3;
 
-       ND_PRINT((ndo, "%d", length));
+       ND_PRINT("%u", length);
        nfserr = 0;             /* assume no error */
        rp = (const struct sunrpc_msg *)bp;
 
        nfserr = 0;             /* assume no error */
        rp = (const struct sunrpc_msg *)bp;
 
@@ -543,7 +543,7 @@ nfsreq_noaddr_print(netdissect_options *ndo,
        if (!v3 && proc < NFS_NPROCS)
                proc =  nfsv3_procid[proc];
 
        if (!v3 && proc < NFS_NPROCS)
                proc =  nfsv3_procid[proc];
 
-       ND_PRINT((ndo, " %s", tok2str(nfsproc_str, "proc-%u", proc)));
+       ND_PRINT(" %s", tok2str(nfsproc_str, "proc-%u", proc));
        switch (proc) {
 
        case NFSPROC_GETATTR:
        switch (proc) {
 
        case NFSPROC_GETATTR:
@@ -570,37 +570,37 @@ nfsreq_noaddr_print(netdissect_options *ndo,
        case NFSPROC_ACCESS:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
        case NFSPROC_ACCESS:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
-                       ND_TCHECK(dp[0]);
+                       ND_TCHECK_4(dp);
                        access_flags = EXTRACT_BE_U_4(dp);
                        if (access_flags & ~NFSV3ACCESS_FULL) {
                                /* NFSV3ACCESS definitions aren't up to date */
                        access_flags = EXTRACT_BE_U_4(dp);
                        if (access_flags & ~NFSV3ACCESS_FULL) {
                                /* NFSV3ACCESS definitions aren't up to date */
-                               ND_PRINT((ndo, " %04x", access_flags));
+                               ND_PRINT(" %04x", access_flags);
                        } else if ((access_flags & NFSV3ACCESS_FULL) == NFSV3ACCESS_FULL) {
                        } else if ((access_flags & NFSV3ACCESS_FULL) == NFSV3ACCESS_FULL) {
-                               ND_PRINT((ndo, " NFS_ACCESS_FULL"));
+                               ND_PRINT(" NFS_ACCESS_FULL");
                        } else {
                                char separator = ' ';
                                if (access_flags & NFSV3ACCESS_READ) {
                        } else {
                                char separator = ' ';
                                if (access_flags & NFSV3ACCESS_READ) {
-                                       ND_PRINT((ndo, " NFS_ACCESS_READ"));
+                                       ND_PRINT(" NFS_ACCESS_READ");
                                        separator = '|';
                                }
                                if (access_flags & NFSV3ACCESS_LOOKUP) {
                                        separator = '|';
                                }
                                if (access_flags & NFSV3ACCESS_LOOKUP) {
-                                       ND_PRINT((ndo, "%cNFS_ACCESS_LOOKUP", separator));
+                                       ND_PRINT("%cNFS_ACCESS_LOOKUP", separator);
                                        separator = '|';
                                }
                                if (access_flags & NFSV3ACCESS_MODIFY) {
                                        separator = '|';
                                }
                                if (access_flags & NFSV3ACCESS_MODIFY) {
-                                       ND_PRINT((ndo, "%cNFS_ACCESS_MODIFY", separator));
+                                       ND_PRINT("%cNFS_ACCESS_MODIFY", separator);
                                        separator = '|';
                                }
                                if (access_flags & NFSV3ACCESS_EXTEND) {
                                        separator = '|';
                                }
                                if (access_flags & NFSV3ACCESS_EXTEND) {
-                                       ND_PRINT((ndo, "%cNFS_ACCESS_EXTEND", separator));
+                                       ND_PRINT("%cNFS_ACCESS_EXTEND", separator);
                                        separator = '|';
                                }
                                if (access_flags & NFSV3ACCESS_DELETE) {
                                        separator = '|';
                                }
                                if (access_flags & NFSV3ACCESS_DELETE) {
-                                       ND_PRINT((ndo, "%cNFS_ACCESS_DELETE", separator));
+                                       ND_PRINT("%cNFS_ACCESS_DELETE", separator);
                                        separator = '|';
                                }
                                if (access_flags & NFSV3ACCESS_EXECUTE)
                                        separator = '|';
                                }
                                if (access_flags & NFSV3ACCESS_EXECUTE)
-                                       ND_PRINT((ndo, "%cNFS_ACCESS_EXECUTE", separator));
+                                       ND_PRINT("%cNFS_ACCESS_EXECUTE", separator);
                        }
                        return;
                }
                        }
                        return;
                }
@@ -610,15 +610,15 @@ nfsreq_noaddr_print(netdissect_options *ndo,
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
                        if (v3) {
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
                        if (v3) {
-                               ND_TCHECK(dp[2]);
-                               ND_PRINT((ndo, " %u bytes @ %" PRIu64,
+                               ND_TCHECK_4(dp + 2);
+                               ND_PRINT(" %u bytes @ %" PRIu64,
                                       EXTRACT_BE_U_4(dp + 2),
                                       EXTRACT_BE_U_4(dp + 2),
-                                      EXTRACT_BE_U_8(dp)));
+                                      EXTRACT_BE_U_8(dp));
                        } else {
                        } else {
-                               ND_TCHECK(dp[1]);
-                               ND_PRINT((ndo, " %u bytes @ %u",
+                               ND_TCHECK_4(dp + 1);
+                               ND_PRINT(" %u bytes @ %u",
                                    EXTRACT_BE_U_4(dp + 1),
                                    EXTRACT_BE_U_4(dp + 1),
-                                   EXTRACT_BE_U_4(dp)));
+                                   EXTRACT_BE_U_4(dp));
                        }
                        return;
                }
                        }
                        return;
                }
@@ -628,23 +628,23 @@ nfsreq_noaddr_print(netdissect_options *ndo,
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
                        if (v3) {
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
                        if (v3) {
-                               ND_TCHECK(dp[4]);
-                               ND_PRINT((ndo, " %u (%u) bytes @ %" PRIu64,
+                               ND_TCHECK_4(dp + 4);
+                               ND_PRINT(" %u (%u) bytes @ %" PRIu64,
                                                EXTRACT_BE_U_4(dp + 4),
                                                EXTRACT_BE_U_4(dp + 2),
                                                EXTRACT_BE_U_4(dp + 4),
                                                EXTRACT_BE_U_4(dp + 2),
-                                               EXTRACT_BE_U_8(dp)));
+                                               EXTRACT_BE_U_8(dp));
                                if (ndo->ndo_vflag) {
                                if (ndo->ndo_vflag) {
-                                       ND_PRINT((ndo, " <%s>",
+                                       ND_PRINT(" <%s>",
                                                tok2str(nfsv3_writemodes,
                                                tok2str(nfsv3_writemodes,
-                                                       NULL, EXTRACT_BE_U_4(dp + 3))));
+                                                       NULL, EXTRACT_BE_U_4(dp + 3)));
                                }
                        } else {
                                }
                        } else {
-                               ND_TCHECK(dp[3]);
-                               ND_PRINT((ndo, " %u (%u) bytes @ %u (%u)",
+                               ND_TCHECK_4(dp + 3);
+                               ND_PRINT(" %u (%u) bytes @ %u (%u)",
                                                EXTRACT_BE_U_4(dp + 3),
                                                EXTRACT_BE_U_4(dp + 2),
                                                EXTRACT_BE_U_4(dp + 1),
                                                EXTRACT_BE_U_4(dp + 3),
                                                EXTRACT_BE_U_4(dp + 2),
                                                EXTRACT_BE_U_4(dp + 1),
-                                               EXTRACT_BE_U_4(dp)));
+                                               EXTRACT_BE_U_4(dp));
                        }
                        return;
                }
                        }
                        return;
                }
@@ -653,7 +653,7 @@ nfsreq_noaddr_print(netdissect_options *ndo,
        case NFSPROC_SYMLINK:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefhn(ndo, dp, v3)) != NULL) {
        case NFSPROC_SYMLINK:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefhn(ndo, dp, v3)) != NULL) {
-                       ND_PRINT((ndo, " ->"));
+                       ND_PRINT(" ->");
                        if (v3 && (dp = parse_sattr3(ndo, dp, &sa3)) == NULL)
                                break;
                        if (parsefn(ndo, dp) == NULL)
                        if (v3 && (dp = parse_sattr3(ndo, dp, &sa3)) == NULL)
                                break;
                        if (parsefn(ndo, dp) == NULL)
@@ -667,17 +667,17 @@ nfsreq_noaddr_print(netdissect_options *ndo,
        case NFSPROC_MKNOD:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefhn(ndo, dp, v3)) != NULL) {
        case NFSPROC_MKNOD:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefhn(ndo, dp, v3)) != NULL) {
-                       ND_TCHECK(*dp);
+                       ND_TCHECK_4(dp);
                        type = (nfs_type) EXTRACT_BE_U_4(dp);
                        dp++;
                        if ((dp = parse_sattr3(ndo, dp, &sa3)) == NULL)
                                break;
                        type = (nfs_type) EXTRACT_BE_U_4(dp);
                        dp++;
                        if ((dp = parse_sattr3(ndo, dp, &sa3)) == NULL)
                                break;
-                       ND_PRINT((ndo, " %s", tok2str(type2str, "unk-ft %d", type)));
+                       ND_PRINT(" %s", tok2str(type2str, "unk-ft %u", type));
                        if (ndo->ndo_vflag && (type == NFCHR || type == NFBLK)) {
                        if (ndo->ndo_vflag && (type == NFCHR || type == NFBLK)) {
-                               ND_TCHECK(dp[1]);
-                               ND_PRINT((ndo, " %u/%u",
+                               ND_TCHECK_4(dp + 1);
+                               ND_PRINT(" %u/%u",
                                       EXTRACT_BE_U_4(dp),
                                       EXTRACT_BE_U_4(dp),
-                                      EXTRACT_BE_U_4(dp + 1)));
+                                      EXTRACT_BE_U_4(dp + 1));
                                dp += 2;
                        }
                        if (ndo->ndo_vflag)
                                dp += 2;
                        }
                        if (ndo->ndo_vflag)
@@ -689,7 +689,7 @@ nfsreq_noaddr_print(netdissect_options *ndo,
        case NFSPROC_RENAME:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefhn(ndo, dp, v3)) != NULL) {
        case NFSPROC_RENAME:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefhn(ndo, dp, v3)) != NULL) {
-                       ND_PRINT((ndo, " ->"));
+                       ND_PRINT(" ->");
                        if (parsefhn(ndo, dp, v3) != NULL)
                                return;
                }
                        if (parsefhn(ndo, dp, v3) != NULL)
                                return;
                }
@@ -698,7 +698,7 @@ nfsreq_noaddr_print(netdissect_options *ndo,
        case NFSPROC_LINK:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
        case NFSPROC_LINK:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
-                       ND_PRINT((ndo, " ->"));
+                       ND_PRINT(" ->");
                        if (parsefhn(ndo, dp, v3) != NULL)
                                return;
                }
                        if (parsefhn(ndo, dp, v3) != NULL)
                                return;
                }
@@ -708,25 +708,34 @@ nfsreq_noaddr_print(netdissect_options *ndo,
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
                        if (v3) {
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
                        if (v3) {
-                               ND_TCHECK(dp[4]);
+                               ND_TCHECK_4(dp + 4);
                                /*
                                 * We shouldn't really try to interpret the
                                 * offset cookie here.
                                 */
                                /*
                                 * We shouldn't really try to interpret the
                                 * offset cookie here.
                                 */
-                               ND_PRINT((ndo, " %u bytes @ %" PRId64,
+                               ND_PRINT(" %u bytes @ %" PRId64,
                                    EXTRACT_BE_U_4(dp + 4),
                                    EXTRACT_BE_U_4(dp + 4),
-                                   EXTRACT_BE_U_8(dp)));
-                               if (ndo->ndo_vflag)
-                                       ND_PRINT((ndo, " verf %08x%08x", dp[2], dp[3]));
+                                   EXTRACT_BE_U_8(dp));
+                               if (ndo->ndo_vflag) {
+                                       /*
+                                        * This displays the 8 bytes
+                                        * of the verifier in order,
+                                        * from the low-order byte
+                                        * to the high-order byte.
+                                        */
+                                       ND_PRINT(" verf %08x%08x",
+                                                 EXTRACT_BE_U_4(dp + 2),
+                                                 EXTRACT_BE_U_4(dp + 3));
+                               }
                        } else {
                        } else {
-                               ND_TCHECK(dp[1]);
+                               ND_TCHECK_4(dp + 1);
                                /*
                                 * Print the offset as signed, since -1 is
                                 * common, but offsets > 2^31 aren't.
                                 */
                                /*
                                 * Print the offset as signed, since -1 is
                                 * common, but offsets > 2^31 aren't.
                                 */
-                               ND_PRINT((ndo, " %u bytes @ %d",
+                               ND_PRINT(" %u bytes @ %u",
                                    EXTRACT_BE_U_4(dp + 1),
                                    EXTRACT_BE_U_4(dp + 1),
-                                   EXTRACT_BE_U_4(dp)));
+                                   EXTRACT_BE_U_4(dp));
                        }
                        return;
                }
                        }
                        return;
                }
@@ -735,18 +744,26 @@ nfsreq_noaddr_print(netdissect_options *ndo,
        case NFSPROC_READDIRPLUS:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
        case NFSPROC_READDIRPLUS:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
-                       ND_TCHECK(dp[4]);
+                       ND_TCHECK_4(dp + 4);
                        /*
                         * We don't try to interpret the offset
                         * cookie here.
                         */
                        /*
                         * We don't try to interpret the offset
                         * cookie here.
                         */
-                       ND_PRINT((ndo, " %u bytes @ %" PRId64,
+                       ND_PRINT(" %u bytes @ %" PRId64,
                                EXTRACT_BE_U_4(dp + 4),
                                EXTRACT_BE_U_4(dp + 4),
-                               EXTRACT_BE_U_8(dp)));
+                               EXTRACT_BE_U_8(dp));
                        if (ndo->ndo_vflag) {
                        if (ndo->ndo_vflag) {
-                               ND_TCHECK(dp[5]);
-                               ND_PRINT((ndo, " max %u verf %08x%08x",
-                                      EXTRACT_BE_U_4(dp + 5), dp[2], dp[3]));
+                               ND_TCHECK_4(dp + 5);
+                               /*
+                                * This displays the 8 bytes
+                                * of the verifier in order,
+                                * from the low-order byte
+                                * to the high-order byte.
+                                */
+                               ND_PRINT(" max %u verf %08x%08x",
+                                         EXTRACT_BE_U_4(dp + 5),
+                                         EXTRACT_BE_U_4(dp + 2),
+                                         EXTRACT_BE_U_4(dp + 3));
                        }
                        return;
                }
                        }
                        return;
                }
@@ -755,10 +772,10 @@ nfsreq_noaddr_print(netdissect_options *ndo,
        case NFSPROC_COMMIT:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
        case NFSPROC_COMMIT:
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
-                       ND_TCHECK(dp[2]);
-                       ND_PRINT((ndo, " %u bytes @ %" PRIu64,
+                       ND_TCHECK_4(dp + 2);
+                       ND_PRINT(" %u bytes @ %" PRIu64,
                                EXTRACT_BE_U_4(dp + 2),
                                EXTRACT_BE_U_4(dp + 2),
-                               EXTRACT_BE_U_8(dp)));
+                               EXTRACT_BE_U_8(dp));
                        return;
                }
                break;
                        return;
                }
                break;
@@ -769,7 +786,7 @@ nfsreq_noaddr_print(netdissect_options *ndo,
 
 trunc:
        if (!nfserr)
 
 trunc:
        if (!nfserr)
-               ND_PRINT((ndo, "%s", tstr));
+               ND_PRINT("%s", tstr);
 }
 
 /*
 }
 
 /*
@@ -794,12 +811,24 @@ nfs_printfh(netdissect_options *ndo,
                u_int i;
                char const *sep = "";
 
                u_int i;
                char const *sep = "";
 
-               ND_PRINT((ndo, " fh["));
+               ND_PRINT(" fh[");
                for (i=0; i<len; i++) {
                for (i=0; i<len; i++) {
-                       ND_PRINT((ndo, "%s%x", sep, dp[i]));
+                       /*
+                        * This displays 4 bytes in big-endian byte
+                        * order.  That's as good a choice as little-
+                        * endian, as there's no guarantee that the
+                        * server is big-endian or little-endian or
+                        * that the file handle contains 4-byte
+                        * integral fields, and is better than "the
+                        * byte order of the host running tcpdump", as
+                        * the latter means that different hosts
+                        * running tcpdump may show the same file
+                        * handle in different ways.
+                        */
+                       ND_PRINT("%s%x", sep, EXTRACT_BE_U_4(dp + i));
                        sep = ":";
                }
                        sep = ":";
                }
-               ND_PRINT((ndo, "]"));
+               ND_PRINT("]");
                return;
        }
 
                return;
        }
 
@@ -821,17 +850,17 @@ nfs_printfh(netdissect_options *ndo,
                if (spacep)
                        *spacep = '\0';
 
                if (spacep)
                        *spacep = '\0';
 
-               ND_PRINT((ndo, " fh %s/", temp));
+               ND_PRINT(" fh %s/", temp);
        } else {
        } else {
-               ND_PRINT((ndo, " fh %d,%d/",
-                            fsid.Fsid_dev.Major, fsid.Fsid_dev.Minor));
+               ND_PRINT(" fh %u,%u/",
+                            fsid.Fsid_dev.Major, fsid.Fsid_dev.Minor);
        }
 
        if(fsid.Fsid_dev.Minor == 257)
                /* Print the undecoded handle */
        }
 
        if(fsid.Fsid_dev.Minor == 257)
                /* Print the undecoded handle */
-               ND_PRINT((ndo, "%s", fsid.Opaque_Handle));
+               ND_PRINT("%s", fsid.Opaque_Handle);
        else
        else
-               ND_PRINT((ndo, "%ld", (long) ino));
+               ND_PRINT("%ld", (long) ino);
 }
 
 /*
 }
 
 /*
@@ -870,7 +899,7 @@ xid_map_enter(netdissect_options *ndo,
        const struct ip6_hdr *ip6 = NULL;
        struct xid_map_entry *xmep;
 
        const struct ip6_hdr *ip6 = NULL;
        struct xid_map_entry *xmep;
 
-       if (!ND_TTEST(rp->rm_call.cb_proc))
+       if (!ND_TTEST_4(rp->rm_call.cb_proc))
                return (0);
        switch (IP_V((const struct ip *)bp)) {
        case 4:
                return (0);
        switch (IP_V((const struct ip *)bp)) {
        case 4:
@@ -996,7 +1025,7 @@ parserep(netdissect_options *ndo,
         * which is an "enum" and so occupies one 32-bit word.
         */
        dp = ((const uint32_t *)&rp->rm_reply) + 1;
         * which is an "enum" and so occupies one 32-bit word.
         */
        dp = ((const uint32_t *)&rp->rm_reply) + 1;
-       ND_TCHECK(dp[1]);
+       ND_TCHECK_4(dp + 1);
        len = EXTRACT_BE_U_4(dp + 1);
        if (len >= length)
                return (NULL);
        len = EXTRACT_BE_U_4(dp + 1);
        if (len >= length)
                return (NULL);
@@ -1008,10 +1037,10 @@ parserep(netdissect_options *ndo,
        /*
         * now we can check the ar_stat field
         */
        /*
         * now we can check the ar_stat field
         */
-       ND_TCHECK(dp[0]);
+       ND_TCHECK_4(dp);
        astat = (enum sunrpc_accept_stat) EXTRACT_BE_U_4(dp);
        if (astat != SUNRPC_SUCCESS) {
        astat = (enum sunrpc_accept_stat) EXTRACT_BE_U_4(dp);
        if (astat != SUNRPC_SUCCESS) {
-               ND_PRINT((ndo, " %s", tok2str(sunrpc_str, "ar_stat %d", astat)));
+               ND_PRINT(" %s", tok2str(sunrpc_str, "ar_stat %u", astat));
                nfserr = 1;             /* suppress trunc string */
                return (NULL);
        }
                nfserr = 1;             /* suppress trunc string */
                return (NULL);
        }
@@ -1024,19 +1053,19 @@ trunc:
 
 static const uint32_t *
 parsestatus(netdissect_options *ndo,
 
 static const uint32_t *
 parsestatus(netdissect_options *ndo,
-            const uint32_t *dp, int *er)
+            const uint32_t *dp, u_int *er)
 {
 {
-       int errnum;
+       u_int errnum;
 
 
-       ND_TCHECK(dp[0]);
+       ND_TCHECK_4(dp);
 
        errnum = EXTRACT_BE_U_4(dp);
        if (er)
                *er = errnum;
        if (errnum != 0) {
                if (!ndo->ndo_qflag)
 
        errnum = EXTRACT_BE_U_4(dp);
        if (er)
                *er = errnum;
        if (errnum != 0) {
                if (!ndo->ndo_qflag)
-                       ND_PRINT((ndo, " ERROR: %s",
-                           tok2str(status2str, "unk %d", errnum)));
+                       ND_PRINT(" ERROR: %s",
+                           tok2str(status2str, "unk %u", errnum));
                nfserr = 1;
        }
        return (dp + 1);
                nfserr = 1;
        }
        return (dp + 1);
@@ -1051,60 +1080,66 @@ parsefattr(netdissect_options *ndo,
        const struct nfs_fattr *fap;
 
        fap = (const struct nfs_fattr *)dp;
        const struct nfs_fattr *fap;
 
        fap = (const struct nfs_fattr *)dp;
-       ND_TCHECK(fap->fa_gid);
+       ND_TCHECK_4(&fap->fa_gid);
        if (verbose) {
        if (verbose) {
-               ND_PRINT((ndo, " %s %o ids %d/%d",
-                   tok2str(type2str, "unk-ft %d ",
+               /*
+                * XXX - UIDs and GIDs are unsigned in NFS and in
+                * at least some UN*Xes, but we'll show them as
+                * signed because -2 has traditionally been the
+                * UID for "nobody", rather than 4294967294.
+                */
+               ND_PRINT(" %s %o ids %d/%d",
+                   tok2str(type2str, "unk-ft %u ",
                    EXTRACT_BE_U_4(&fap->fa_type)),
                    EXTRACT_BE_U_4(&fap->fa_mode),
                    EXTRACT_BE_U_4(&fap->fa_type)),
                    EXTRACT_BE_U_4(&fap->fa_mode),
-                   EXTRACT_BE_U_4(&fap->fa_uid),
-                   EXTRACT_BE_U_4(&fap->fa_gid)));
+                   EXTRACT_BE_S_4(&fap->fa_uid),
+                   EXTRACT_BE_S_4(&fap->fa_gid));
                if (v3) {
                if (v3) {
-                       ND_TCHECK(fap->fa3_size);
-                       ND_PRINT((ndo, " sz %" PRIu64,
-                               EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_size)));
+                       ND_TCHECK_8(&fap->fa3_size);
+                       ND_PRINT(" sz %" PRIu64,
+                               EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_size));
                } else {
                } else {
-                       ND_TCHECK(fap->fa2_size);
-                       ND_PRINT((ndo, " sz %d", EXTRACT_BE_U_4(&fap->fa2_size)));
+                       ND_TCHECK_4(&fap->fa2_size);
+                       ND_PRINT(" sz %u", EXTRACT_BE_U_4(&fap->fa2_size));
                }
        }
        /* print lots more stuff */
        if (verbose > 1) {
                if (v3) {
                }
        }
        /* print lots more stuff */
        if (verbose > 1) {
                if (v3) {
-                       ND_TCHECK(fap->fa3_ctime);
-                       ND_PRINT((ndo, " nlink %d rdev %d/%d",
+                       ND_TCHECK_8(&fap->fa3_ctime);
+                       ND_PRINT(" nlink %u rdev %u/%u",
                               EXTRACT_BE_U_4(&fap->fa_nlink),
                               EXTRACT_BE_U_4(&fap->fa3_rdev.specdata1),
                               EXTRACT_BE_U_4(&fap->fa_nlink),
                               EXTRACT_BE_U_4(&fap->fa3_rdev.specdata1),
-                              EXTRACT_BE_U_4(&fap->fa3_rdev.specdata2)));
-                       ND_PRINT((ndo, " fsid %" PRIx64,
-                               EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_fsid)));
-                       ND_PRINT((ndo, " fileid %" PRIx64,
-                               EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_fileid)));
-                       ND_PRINT((ndo, " a/m/ctime %u.%06u",
+                              EXTRACT_BE_U_4(&fap->fa3_rdev.specdata2));
+                       ND_PRINT(" fsid %" PRIx64,
+                               EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_fsid));
+                       ND_PRINT(" fileid %" PRIx64,
+                               EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_fileid));
+                       ND_PRINT(" a/m/ctime %u.%06u",
                               EXTRACT_BE_U_4(&fap->fa3_atime.nfsv3_sec),
                               EXTRACT_BE_U_4(&fap->fa3_atime.nfsv3_sec),
-                              EXTRACT_BE_U_4(&fap->fa3_atime.nfsv3_nsec)));
-                       ND_PRINT((ndo, " %u.%06u",
+                              EXTRACT_BE_U_4(&fap->fa3_atime.nfsv3_nsec));
+                       ND_PRINT(" %u.%06u",
                               EXTRACT_BE_U_4(&fap->fa3_mtime.nfsv3_sec),
                               EXTRACT_BE_U_4(&fap->fa3_mtime.nfsv3_sec),
-                              EXTRACT_BE_U_4(&fap->fa3_mtime.nfsv3_nsec)));
-                       ND_PRINT((ndo, " %u.%06u",
+                              EXTRACT_BE_U_4(&fap->fa3_mtime.nfsv3_nsec));
+                       ND_PRINT(" %u.%06u",
                               EXTRACT_BE_U_4(&fap->fa3_ctime.nfsv3_sec),
                               EXTRACT_BE_U_4(&fap->fa3_ctime.nfsv3_sec),
-                              EXTRACT_BE_U_4(&fap->fa3_ctime.nfsv3_nsec)));
+                              EXTRACT_BE_U_4(&fap->fa3_ctime.nfsv3_nsec));
                } else {
                } else {
-                       ND_TCHECK(fap->fa2_ctime);
-                       ND_PRINT((ndo, " nlink %d rdev 0x%x fsid 0x%x nodeid 0x%x a/m/ctime",
+                       ND_TCHECK_8(&fap->fa2_ctime);
+                       ND_PRINT(" nlink %u rdev 0x%x fsid 0x%x nodeid 0x%x a/m/ctime",
                               EXTRACT_BE_U_4(&fap->fa_nlink),
                               EXTRACT_BE_U_4(&fap->fa2_rdev),
                               EXTRACT_BE_U_4(&fap->fa2_fsid),
                               EXTRACT_BE_U_4(&fap->fa_nlink),
                               EXTRACT_BE_U_4(&fap->fa2_rdev),
                               EXTRACT_BE_U_4(&fap->fa2_fsid),
-                              EXTRACT_BE_U_4(&fap->fa2_fileid)));
-                       ND_PRINT((ndo, " %u.%06u",
+                              EXTRACT_BE_U_4(&fap->fa2_fileid));
+                       ND_PRINT(" %u.%06u",
                               EXTRACT_BE_U_4(&fap->fa2_atime.nfsv2_sec),
                               EXTRACT_BE_U_4(&fap->fa2_atime.nfsv2_sec),
-                              EXTRACT_BE_U_4(&fap->fa2_atime.nfsv2_usec)));
-                       ND_PRINT((ndo, " %u.%06u",
+                              EXTRACT_BE_U_4(&fap->fa2_atime.nfsv2_usec));
+                       ND_PRINT(" %u.%06u",
                               EXTRACT_BE_U_4(&fap->fa2_mtime.nfsv2_sec),
                               EXTRACT_BE_U_4(&fap->fa2_mtime.nfsv2_sec),
-                              EXTRACT_BE_U_4(&fap->fa2_mtime.nfsv2_usec)));
-                       ND_PRINT((ndo, " %u.%06u",
+                              EXTRACT_BE_U_4(&fap->fa2_mtime.nfsv2_usec));
+                       ND_PRINT(" %u.%06u",
                               EXTRACT_BE_U_4(&fap->fa2_ctime.nfsv2_sec),
                               EXTRACT_BE_U_4(&fap->fa2_ctime.nfsv2_sec),
-                              EXTRACT_BE_U_4(&fap->fa2_ctime.nfsv2_usec)));
+                              EXTRACT_BE_U_4(&fap->fa2_ctime.nfsv2_usec));
                }
        }
        return ((const uint32_t *)((const unsigned char *)dp +
                }
        }
        return ((const uint32_t *)((const unsigned char *)dp +
@@ -1117,7 +1152,7 @@ static int
 parseattrstat(netdissect_options *ndo,
               const uint32_t *dp, int verbose, int v3)
 {
 parseattrstat(netdissect_options *ndo,
               const uint32_t *dp, int verbose, int v3)
 {
-       int er;
+       u_int er;
 
        dp = parsestatus(ndo, dp, &er);
        if (dp == NULL)
 
        dp = parsestatus(ndo, dp, &er);
        if (dp == NULL)
@@ -1132,7 +1167,7 @@ static int
 parsediropres(netdissect_options *ndo,
               const uint32_t *dp)
 {
 parsediropres(netdissect_options *ndo,
               const uint32_t *dp)
 {
-       int er;
+       u_int er;
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
@@ -1150,7 +1185,7 @@ static int
 parselinkres(netdissect_options *ndo,
              const uint32_t *dp, int v3)
 {
 parselinkres(netdissect_options *ndo,
              const uint32_t *dp, int v3)
 {
-       int er;
+       u_int er;
 
        dp = parsestatus(ndo, dp, &er);
        if (dp == NULL)
 
        dp = parsestatus(ndo, dp, &er);
        if (dp == NULL)
@@ -1159,7 +1194,7 @@ parselinkres(netdissect_options *ndo,
                return(1);
        if (v3 && !(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                return (0);
                return(1);
        if (v3 && !(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                return (0);
-       ND_PRINT((ndo, " "));
+       ND_PRINT(" ");
        return (parsefn(ndo, dp) != NULL);
 }
 
        return (parsefn(ndo, dp) != NULL);
 }
 
@@ -1168,7 +1203,7 @@ parsestatfs(netdissect_options *ndo,
             const uint32_t *dp, int v3)
 {
        const struct nfs_statfs *sfsp;
             const uint32_t *dp, int v3)
 {
        const struct nfs_statfs *sfsp;
-       int er;
+       u_int er;
 
        dp = parsestatus(ndo, dp, &er);
        if (dp == NULL)
 
        dp = parsestatus(ndo, dp, &er);
        if (dp == NULL)
@@ -1181,7 +1216,7 @@ parsestatfs(netdissect_options *ndo,
 
        if (v3) {
                if (ndo->ndo_vflag)
 
        if (v3) {
                if (ndo->ndo_vflag)
-                       ND_PRINT((ndo, " POST:"));
+                       ND_PRINT(" POST:");
                if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                        return (0);
        }
                if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                        return (0);
        }
@@ -1191,24 +1226,24 @@ parsestatfs(netdissect_options *ndo,
        sfsp = (const struct nfs_statfs *)dp;
 
        if (v3) {
        sfsp = (const struct nfs_statfs *)dp;
 
        if (v3) {
-               ND_PRINT((ndo, " tbytes %" PRIu64 " fbytes %" PRIu64 " abytes %" PRIu64,
+               ND_PRINT(" tbytes %" PRIu64 " fbytes %" PRIu64 " abytes %" PRIu64,
                        EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_tbytes),
                        EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_fbytes),
                        EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_tbytes),
                        EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_fbytes),
-                       EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_abytes)));
+                       EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_abytes));
                if (ndo->ndo_vflag) {
                if (ndo->ndo_vflag) {
-                       ND_PRINT((ndo, " tfiles %" PRIu64 " ffiles %" PRIu64 " afiles %" PRIu64 " invar %u",
+                       ND_PRINT(" tfiles %" PRIu64 " ffiles %" PRIu64 " afiles %" PRIu64 " invar %u",
                               EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_tfiles),
                               EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_ffiles),
                               EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_afiles),
                               EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_tfiles),
                               EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_ffiles),
                               EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_afiles),
-                              EXTRACT_BE_U_4(&sfsp->sf_invarsec)));
+                              EXTRACT_BE_U_4(&sfsp->sf_invarsec));
                }
        } else {
                }
        } else {
-               ND_PRINT((ndo, " tsize %d bsize %d blocks %d bfree %d bavail %d",
+               ND_PRINT(" tsize %u bsize %u blocks %u bfree %u bavail %u",
                        EXTRACT_BE_U_4(&sfsp->sf_tsize),
                        EXTRACT_BE_U_4(&sfsp->sf_bsize),
                        EXTRACT_BE_U_4(&sfsp->sf_blocks),
                        EXTRACT_BE_U_4(&sfsp->sf_bfree),
                        EXTRACT_BE_U_4(&sfsp->sf_tsize),
                        EXTRACT_BE_U_4(&sfsp->sf_bsize),
                        EXTRACT_BE_U_4(&sfsp->sf_blocks),
                        EXTRACT_BE_U_4(&sfsp->sf_bfree),
-                       EXTRACT_BE_U_4(&sfsp->sf_bavail)));
+                       EXTRACT_BE_U_4(&sfsp->sf_bavail));
        }
 
        return (1);
        }
 
        return (1);
@@ -1220,7 +1255,7 @@ static int
 parserddires(netdissect_options *ndo,
              const uint32_t *dp)
 {
 parserddires(netdissect_options *ndo,
              const uint32_t *dp)
 {
-       int er;
+       u_int er;
 
        dp = parsestatus(ndo, dp, &er);
        if (dp == NULL)
 
        dp = parsestatus(ndo, dp, &er);
        if (dp == NULL)
@@ -1230,11 +1265,11 @@ parserddires(netdissect_options *ndo,
        if (ndo->ndo_qflag)
                return (1);
 
        if (ndo->ndo_qflag)
                return (1);
 
-       ND_TCHECK(dp[2]);
-       ND_PRINT((ndo, " offset 0x%x size %d ",
-              EXTRACT_BE_U_4(dp), EXTRACT_BE_U_4(dp + 1)));
-       if (dp[2] != 0)
-               ND_PRINT((ndo, " eof"));
+       ND_TCHECK_4(dp + 2);
+       ND_PRINT(" offset 0x%x size %u ",
+              EXTRACT_BE_U_4(dp), EXTRACT_BE_U_4(dp + 1));
+       if (EXTRACT_BE_U_4(dp + 2) != 0)
+               ND_PRINT(" eof");
 
        return (1);
 trunc:
 
        return (1);
 trunc:
@@ -1246,10 +1281,10 @@ parse_wcc_attr(netdissect_options *ndo,
                const uint32_t *dp)
 {
        /* Our caller has already checked this */
                const uint32_t *dp)
 {
        /* Our caller has already checked this */
-       ND_PRINT((ndo, " sz %" PRIu64, EXTRACT_BE_U_8(dp)));
-       ND_PRINT((ndo, " mtime %u.%06u ctime %u.%06u",
+       ND_PRINT(" sz %" PRIu64, EXTRACT_BE_U_8(dp));
+       ND_PRINT(" mtime %u.%06u ctime %u.%06u",
               EXTRACT_BE_U_4(dp + 2), EXTRACT_BE_U_4(dp + 3),
               EXTRACT_BE_U_4(dp + 2), EXTRACT_BE_U_4(dp + 3),
-              EXTRACT_BE_U_4(dp + 4), EXTRACT_BE_U_4(dp + 5)));
+              EXTRACT_BE_U_4(dp + 4), EXTRACT_BE_U_4(dp + 5));
        return (dp + 6);
 }
 
        return (dp + 6);
 }
 
@@ -1260,7 +1295,7 @@ static const uint32_t *
 parse_pre_op_attr(netdissect_options *ndo,
                   const uint32_t *dp, int verbose)
 {
 parse_pre_op_attr(netdissect_options *ndo,
                   const uint32_t *dp, int verbose)
 {
-       ND_TCHECK(dp[0]);
+       ND_TCHECK_4(dp);
        if (!EXTRACT_BE_U_4(dp))
                return (dp + 1);
        dp++;
        if (!EXTRACT_BE_U_4(dp))
                return (dp + 1);
        dp++;
@@ -1282,7 +1317,7 @@ static const uint32_t *
 parse_post_op_attr(netdissect_options *ndo,
                    const uint32_t *dp, int verbose)
 {
 parse_post_op_attr(netdissect_options *ndo,
                    const uint32_t *dp, int verbose)
 {
-       ND_TCHECK(dp[0]);
+       ND_TCHECK_4(dp);
        if (!EXTRACT_BE_U_4(dp))
                return (dp + 1);
        dp++;
        if (!EXTRACT_BE_U_4(dp))
                return (dp + 1);
        dp++;
@@ -1299,12 +1334,12 @@ parse_wcc_data(netdissect_options *ndo,
                const uint32_t *dp, int verbose)
 {
        if (verbose > 1)
                const uint32_t *dp, int verbose)
 {
        if (verbose > 1)
-               ND_PRINT((ndo, " PRE:"));
+               ND_PRINT(" PRE:");
        if (!(dp = parse_pre_op_attr(ndo, dp, verbose)))
                return (0);
 
        if (verbose)
        if (!(dp = parse_pre_op_attr(ndo, dp, verbose)))
                return (0);
 
        if (verbose)
-               ND_PRINT((ndo, " POST:"));
+               ND_PRINT(" POST:");
        return parse_post_op_attr(ndo, dp, verbose);
 }
 
        return parse_post_op_attr(ndo, dp, verbose);
 }
 
@@ -1312,14 +1347,14 @@ static const uint32_t *
 parsecreateopres(netdissect_options *ndo,
                  const uint32_t *dp, int verbose)
 {
 parsecreateopres(netdissect_options *ndo,
                  const uint32_t *dp, int verbose)
 {
-       int er;
+       u_int er;
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
        if (er)
                dp = parse_wcc_data(ndo, dp, verbose);
        else {
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
        if (er)
                dp = parse_wcc_data(ndo, dp, verbose);
        else {
-               ND_TCHECK(dp[0]);
+               ND_TCHECK_4(dp);
                if (!EXTRACT_BE_U_4(dp))
                        return (dp + 1);
                dp++;
                if (!EXTRACT_BE_U_4(dp))
                        return (dp + 1);
                dp++;
@@ -1329,7 +1364,7 @@ parsecreateopres(netdissect_options *ndo,
                        if (!(dp = parse_post_op_attr(ndo, dp, verbose)))
                                return (0);
                        if (ndo->ndo_vflag > 1) {
                        if (!(dp = parse_post_op_attr(ndo, dp, verbose)))
                                return (0);
                        if (ndo->ndo_vflag > 1) {
-                               ND_PRINT((ndo, " dir attr:"));
+                               ND_PRINT(" dir attr:");
                                dp = parse_wcc_data(ndo, dp, verbose);
                        }
                }
                                dp = parse_wcc_data(ndo, dp, verbose);
                        }
                }
@@ -1343,7 +1378,7 @@ static int
 parsewccres(netdissect_options *ndo,
             const uint32_t *dp, int verbose)
 {
 parsewccres(netdissect_options *ndo,
             const uint32_t *dp, int verbose)
 {
-       int er;
+       u_int er;
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
@@ -1354,19 +1389,24 @@ static const uint32_t *
 parsev3rddirres(netdissect_options *ndo,
                 const uint32_t *dp, int verbose)
 {
 parsev3rddirres(netdissect_options *ndo,
                 const uint32_t *dp, int verbose)
 {
-       int er;
+       u_int er;
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
        if (ndo->ndo_vflag)
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
        if (ndo->ndo_vflag)
-               ND_PRINT((ndo, " POST:"));
+               ND_PRINT(" POST:");
        if (!(dp = parse_post_op_attr(ndo, dp, verbose)))
                return (0);
        if (er)
                return dp;
        if (ndo->ndo_vflag) {
        if (!(dp = parse_post_op_attr(ndo, dp, verbose)))
                return (0);
        if (er)
                return dp;
        if (ndo->ndo_vflag) {
-               ND_TCHECK(dp[1]);
-               ND_PRINT((ndo, " verf %08x%08x", dp[0], dp[1]));
+               ND_TCHECK_4(dp + 1);
+               /*
+                * This displays the 8 bytes of the verifier in order,
+                * from the low-order byte to the high-order byte.
+                */
+               ND_PRINT(" verf %08x%08x",
+                         EXTRACT_BE_U_4(dp), EXTRACT_BE_U_4(dp + 1));
                dp += 2;
        }
        return dp;
                dp += 2;
        }
        return dp;
@@ -1379,33 +1419,33 @@ parsefsinfo(netdissect_options *ndo,
             const uint32_t *dp)
 {
        const struct nfsv3_fsinfo *sfp;
             const uint32_t *dp)
 {
        const struct nfsv3_fsinfo *sfp;
-       int er;
+       u_int er;
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
        if (ndo->ndo_vflag)
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
        if (ndo->ndo_vflag)
-               ND_PRINT((ndo, " POST:"));
+               ND_PRINT(" POST:");
        if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                return (0);
        if (er)
                return (1);
 
        sfp = (const struct nfsv3_fsinfo *)dp;
        if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                return (0);
        if (er)
                return (1);
 
        sfp = (const struct nfsv3_fsinfo *)dp;
-       ND_TCHECK(*sfp);
-       ND_PRINT((ndo, " rtmax %u rtpref %u wtmax %u wtpref %u dtpref %u",
+       ND_TCHECK_SIZE(sfp);
+       ND_PRINT(" rtmax %u rtpref %u wtmax %u wtpref %u dtpref %u",
               EXTRACT_BE_U_4(&sfp->fs_rtmax),
               EXTRACT_BE_U_4(&sfp->fs_rtpref),
               EXTRACT_BE_U_4(&sfp->fs_wtmax),
               EXTRACT_BE_U_4(&sfp->fs_wtpref),
               EXTRACT_BE_U_4(&sfp->fs_rtmax),
               EXTRACT_BE_U_4(&sfp->fs_rtpref),
               EXTRACT_BE_U_4(&sfp->fs_wtmax),
               EXTRACT_BE_U_4(&sfp->fs_wtpref),
-              EXTRACT_BE_U_4(&sfp->fs_dtpref)));
+              EXTRACT_BE_U_4(&sfp->fs_dtpref));
        if (ndo->ndo_vflag) {
        if (ndo->ndo_vflag) {
-               ND_PRINT((ndo, " rtmult %u wtmult %u maxfsz %" PRIu64,
+               ND_PRINT(" rtmult %u wtmult %u maxfsz %" PRIu64,
                       EXTRACT_BE_U_4(&sfp->fs_rtmult),
                       EXTRACT_BE_U_4(&sfp->fs_wtmult),
                       EXTRACT_BE_U_4(&sfp->fs_rtmult),
                       EXTRACT_BE_U_4(&sfp->fs_wtmult),
-                      EXTRACT_BE_U_8((const uint32_t *)&sfp->fs_maxfilesize)));
-               ND_PRINT((ndo, " delta %u.%06u ",
+                      EXTRACT_BE_U_8((const uint32_t *)&sfp->fs_maxfilesize));
+               ND_PRINT(" delta %u.%06u ",
                       EXTRACT_BE_U_4(&sfp->fs_timedelta.nfsv3_sec),
                       EXTRACT_BE_U_4(&sfp->fs_timedelta.nfsv3_sec),
-                      EXTRACT_BE_U_4(&sfp->fs_timedelta.nfsv3_nsec)));
+                      EXTRACT_BE_U_4(&sfp->fs_timedelta.nfsv3_nsec));
        }
        return (1);
 trunc:
        }
        return (1);
 trunc:
@@ -1416,28 +1456,28 @@ static int
 parsepathconf(netdissect_options *ndo,
               const uint32_t *dp)
 {
 parsepathconf(netdissect_options *ndo,
               const uint32_t *dp)
 {
-       int er;
+       u_int er;
        const struct nfsv3_pathconf *spp;
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
        if (ndo->ndo_vflag)
        const struct nfsv3_pathconf *spp;
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
        if (ndo->ndo_vflag)
-               ND_PRINT((ndo, " POST:"));
+               ND_PRINT(" POST:");
        if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                return (0);
        if (er)
                return (1);
 
        spp = (const struct nfsv3_pathconf *)dp;
        if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                return (0);
        if (er)
                return (1);
 
        spp = (const struct nfsv3_pathconf *)dp;
-       ND_TCHECK(*spp);
+       ND_TCHECK_SIZE(spp);
 
 
-       ND_PRINT((ndo, " linkmax %u namemax %u %s %s %s %s",
+       ND_PRINT(" linkmax %u namemax %u %s %s %s %s",
               EXTRACT_BE_U_4(&spp->pc_linkmax),
               EXTRACT_BE_U_4(&spp->pc_namemax),
               EXTRACT_BE_U_4(&spp->pc_notrunc) ? "notrunc" : "",
               EXTRACT_BE_U_4(&spp->pc_chownrestricted) ? "chownres" : "",
               EXTRACT_BE_U_4(&spp->pc_caseinsensitive) ? "igncase" : "",
               EXTRACT_BE_U_4(&spp->pc_linkmax),
               EXTRACT_BE_U_4(&spp->pc_namemax),
               EXTRACT_BE_U_4(&spp->pc_notrunc) ? "notrunc" : "",
               EXTRACT_BE_U_4(&spp->pc_chownrestricted) ? "chownres" : "",
               EXTRACT_BE_U_4(&spp->pc_caseinsensitive) ? "igncase" : "",
-              EXTRACT_BE_U_4(&spp->pc_casepreserving) ? "keepcase" : ""));
+              EXTRACT_BE_U_4(&spp->pc_casepreserving) ? "keepcase" : "");
        return (1);
 trunc:
        return (0);
        return (1);
 trunc:
        return (0);
@@ -1449,14 +1489,14 @@ interp_reply(netdissect_options *ndo,
 {
        const uint32_t *dp;
        int v3;
 {
        const uint32_t *dp;
        int v3;
-       int er;
+       u_int er;
 
        v3 = (vers == NFS_VER3);
 
        if (!v3 && proc < NFS_NPROCS)
                proc = nfsv3_procid[proc];
 
 
        v3 = (vers == NFS_VER3);
 
        if (!v3 && proc < NFS_NPROCS)
                proc = nfsv3_procid[proc];
 
-       ND_PRINT((ndo, " %s", tok2str(nfsproc_str, "proc-%u", proc)));
+       ND_PRINT(" %s", tok2str(nfsproc_str, "proc-%u", proc));
        switch (proc) {
 
        case NFSPROC_GETATTR:
        switch (proc) {
 
        case NFSPROC_GETATTR:
@@ -1485,7 +1525,7 @@ interp_reply(netdissect_options *ndo,
                                break;
                        if (er) {
                                if (ndo->ndo_vflag > 1) {
                                break;
                        if (er) {
                                if (ndo->ndo_vflag > 1) {
-                                       ND_PRINT((ndo, " post dattr:"));
+                                       ND_PRINT(" post dattr:");
                                        dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag);
                                }
                        } else {
                                        dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag);
                                }
                        } else {
@@ -1493,7 +1533,7 @@ interp_reply(netdissect_options *ndo,
                                        break;
                                if ((dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)) &&
                                    ndo->ndo_vflag > 1) {
                                        break;
                                if ((dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)) &&
                                    ndo->ndo_vflag > 1) {
-                                       ND_PRINT((ndo, " post dattr:"));
+                                       ND_PRINT(" post dattr:");
                                        dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag);
                                }
                        }
                                        dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag);
                                }
                        }
@@ -1511,12 +1551,12 @@ interp_reply(netdissect_options *ndo,
                if (!(dp = parsestatus(ndo, dp, &er)))
                        break;
                if (ndo->ndo_vflag)
                if (!(dp = parsestatus(ndo, dp, &er)))
                        break;
                if (ndo->ndo_vflag)
-                       ND_PRINT((ndo, " attr:"));
+                       ND_PRINT(" attr:");
                if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                        break;
                if (!er) {
                if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                        break;
                if (!er) {
-                       ND_TCHECK(dp[0]);
-                       ND_PRINT((ndo, " c %04x", EXTRACT_BE_U_4(dp)));
+                       ND_TCHECK_4(dp);
+                       ND_PRINT(" c %04x", EXTRACT_BE_U_4(dp));
                }
                return;
 
                }
                return;
 
@@ -1537,10 +1577,10 @@ interp_reply(netdissect_options *ndo,
                        if (er)
                                return;
                        if (ndo->ndo_vflag) {
                        if (er)
                                return;
                        if (ndo->ndo_vflag) {
-                               ND_TCHECK(dp[1]);
-                               ND_PRINT((ndo, " %u bytes", EXTRACT_BE_U_4(dp)));
+                               ND_TCHECK_4(dp + 1);
+                               ND_PRINT(" %u bytes", EXTRACT_BE_U_4(dp));
                                if (EXTRACT_BE_U_4(dp + 1))
                                if (EXTRACT_BE_U_4(dp + 1))
-                                       ND_PRINT((ndo, " EOF"));
+                                       ND_PRINT(" EOF");
                        }
                        return;
                } else {
                        }
                        return;
                } else {
@@ -1560,13 +1600,13 @@ interp_reply(netdissect_options *ndo,
                        if (er)
                                return;
                        if (ndo->ndo_vflag) {
                        if (er)
                                return;
                        if (ndo->ndo_vflag) {
-                               ND_TCHECK(dp[0]);
-                               ND_PRINT((ndo, " %u bytes", EXTRACT_BE_U_4(dp)));
+                               ND_TCHECK_4(dp);
+                               ND_PRINT(" %u bytes", EXTRACT_BE_U_4(dp));
                                if (ndo->ndo_vflag > 1) {
                                if (ndo->ndo_vflag > 1) {
-                                       ND_TCHECK(dp[1]);
-                                       ND_PRINT((ndo, " <%s>",
+                                       ND_TCHECK_4(dp + 1);
+                                       ND_PRINT(" <%s>",
                                                tok2str(nfsv3_writemodes,
                                                tok2str(nfsv3_writemodes,
-                                                       NULL, EXTRACT_BE_U_4(dp + 1))));
+                                                       NULL, EXTRACT_BE_U_4(dp + 1)));
                                }
                                return;
                        }
                                }
                                return;
                        }
@@ -1628,10 +1668,10 @@ interp_reply(netdissect_options *ndo,
                        if (!(dp = parsestatus(ndo, dp, &er)))
                                break;
                        if (ndo->ndo_vflag) {
                        if (!(dp = parsestatus(ndo, dp, &er)))
                                break;
                        if (ndo->ndo_vflag) {
-                               ND_PRINT((ndo, " from:"));
+                               ND_PRINT(" from:");
                                if (!(dp = parse_wcc_data(ndo, dp, ndo->ndo_vflag)))
                                        break;
                                if (!(dp = parse_wcc_data(ndo, dp, ndo->ndo_vflag)))
                                        break;
-                               ND_PRINT((ndo, " to:"));
+                               ND_PRINT(" to:");
                                if (!(dp = parse_wcc_data(ndo, dp, ndo->ndo_vflag)))
                                        break;
                        }
                                if (!(dp = parse_wcc_data(ndo, dp, ndo->ndo_vflag)))
                                        break;
                        }
@@ -1649,10 +1689,10 @@ interp_reply(netdissect_options *ndo,
                        if (!(dp = parsestatus(ndo, dp, &er)))
                                break;
                        if (ndo->ndo_vflag) {
                        if (!(dp = parsestatus(ndo, dp, &er)))
                                break;
                        if (ndo->ndo_vflag) {
-                               ND_PRINT((ndo, " file POST:"));
+                               ND_PRINT(" file POST:");
                                if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                                        break;
                                if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                                        break;
-                               ND_PRINT((ndo, " dir:"));
+                               ND_PRINT(" dir:");
                                if (!(dp = parse_wcc_data(ndo, dp, ndo->ndo_vflag)))
                                        break;
                                return;
                                if (!(dp = parse_wcc_data(ndo, dp, ndo->ndo_vflag)))
                                        break;
                                return;
@@ -1711,5 +1751,5 @@ interp_reply(netdissect_options *ndo,
        }
 trunc:
        if (!nfserr)
        }
 trunc:
        if (!nfserr)
-               ND_PRINT((ndo, "%s", tstr));
+               ND_PRINT("%s", tstr);
 }
 }
[mirror] the TCPdump network dissector