Remove no more used ND_TTEST() macro

[tcpdump] / print-nfs.c

diff --git a/print-nfs.c b/print-nfs.c
index cf3d71ebed90bb55e0f7d6b19e04162652f26443..1ea895bdd2b250a88ebc366501e155379af80831 100644 (file)
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -19,17 +19,18 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED
+/* \summary: Network File System (NFS) printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include <stdio.h>
 #include <string.h>
 
 
 #include <stdio.h>
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "extract.h"
 
 #include "addrtoname.h"
 #include "extract.h"
 


@@ -37,9 +38,7 @@
 #include "nfsfh.h"
 
 #include "ip.h"
 #include "nfsfh.h"
 
 #include "ip.h"

-#ifdef INET6

 #include "ip6.h"
 #include "ip6.h"

-#endif

 #include "rpc_auth.h"
 #include "rpc_msg.h"
 
 #include "rpc_auth.h"
 #include "rpc_msg.h"
 


@@ -55,7 +54,7 @@ static const uint32_t *parse_post_op_attr(netdissect_options *, const uint32_t *
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */

-uint32_t nfsv3_procid[NFS_NPROCS] = {
+static uint32_t nfsv3_procid[NFS_NPROCS] = {

        NFSPROC_NULL,
        NFSPROC_GETATTR,
        NFSPROC_SETATTR,
        NFSPROC_NULL,
        NFSPROC_GETATTR,
        NFSPROC_SETATTR,


@@ -203,101 +202,92 @@ static void
 print_nfsaddr(netdissect_options *ndo,
               const u_char *bp, const char *s, const char *d)
 {
 print_nfsaddr(netdissect_options *ndo,
               const u_char *bp, const char *s, const char *d)
 {

-       struct ip *ip;
-#ifdef INET6
-       struct ip6_hdr *ip6;
+       const struct ip *ip;
+       const struct ip6_hdr *ip6;

        char srcaddr[INET6_ADDRSTRLEN], dstaddr[INET6_ADDRSTRLEN];
        char srcaddr[INET6_ADDRSTRLEN], dstaddr[INET6_ADDRSTRLEN];

-#else
-#ifndef INET_ADDRSTRLEN
-#define INET_ADDRSTRLEN        16
-#endif
-       char srcaddr[INET_ADDRSTRLEN], dstaddr[INET_ADDRSTRLEN];
-#endif

 
        srcaddr[0] = dstaddr[0] = '\0';
 
        srcaddr[0] = dstaddr[0] = '\0';

-       switch (IP_V((struct ip *)bp)) {
+       switch (IP_V((const struct ip *)bp)) {

        case 4:
        case 4:

-               ip = (struct ip *)bp;
+               ip = (const struct ip *)bp;

                strlcpy(srcaddr, ipaddr_string(ndo, &ip->ip_src), sizeof(srcaddr));
                strlcpy(dstaddr, ipaddr_string(ndo, &ip->ip_dst), sizeof(dstaddr));
                break;
                strlcpy(srcaddr, ipaddr_string(ndo, &ip->ip_src), sizeof(srcaddr));
                strlcpy(dstaddr, ipaddr_string(ndo, &ip->ip_dst), sizeof(dstaddr));
                break;

-#ifdef INET6

        case 6:
        case 6:

-               ip6 = (struct ip6_hdr *)bp;
+               ip6 = (const struct ip6_hdr *)bp;

                strlcpy(srcaddr, ip6addr_string(ndo, &ip6->ip6_src),
                    sizeof(srcaddr));
                strlcpy(dstaddr, ip6addr_string(ndo, &ip6->ip6_dst),
                    sizeof(dstaddr));
                break;
                strlcpy(srcaddr, ip6addr_string(ndo, &ip6->ip6_src),
                    sizeof(srcaddr));
                strlcpy(dstaddr, ip6addr_string(ndo, &ip6->ip6_dst),
                    sizeof(dstaddr));
                break;

-#endif

        default:
                strlcpy(srcaddr, "?", sizeof(srcaddr));
                strlcpy(dstaddr, "?", sizeof(dstaddr));
                break;
        }
 
        default:
                strlcpy(srcaddr, "?", sizeof(srcaddr));
                strlcpy(dstaddr, "?", sizeof(dstaddr));
                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]);
-       sa3->sa_modeset = EXTRACT_32BITS(dp);
+       ND_TCHECK_4(dp);
+       sa3->sa_modeset = EXTRACT_BE_U_4(dp);

        dp++;
        if (sa3->sa_modeset) {
        dp++;
        if (sa3->sa_modeset) {

-               ND_TCHECK(dp[0]);
-               sa3->sa_mode = EXTRACT_32BITS(dp);
+               ND_TCHECK_4(dp);
+               sa3->sa_mode = EXTRACT_BE_U_4(dp);

                dp++;
        }
 
                dp++;
        }
 

-       ND_TCHECK(dp[0]);
-       sa3->sa_uidset = EXTRACT_32BITS(dp);
+       ND_TCHECK_4(dp);
+       sa3->sa_uidset = EXTRACT_BE_U_4(dp);

        dp++;
        if (sa3->sa_uidset) {
        dp++;
        if (sa3->sa_uidset) {

-               ND_TCHECK(dp[0]);
-               sa3->sa_uid = EXTRACT_32BITS(dp);
+               ND_TCHECK_4(dp);
+               sa3->sa_uid = EXTRACT_BE_U_4(dp);

                dp++;
        }
 
                dp++;
        }
 

-       ND_TCHECK(dp[0]);
-       sa3->sa_gidset = EXTRACT_32BITS(dp);
+       ND_TCHECK_4(dp);
+       sa3->sa_gidset = EXTRACT_BE_U_4(dp);

        dp++;
        if (sa3->sa_gidset) {
        dp++;
        if (sa3->sa_gidset) {

-               ND_TCHECK(dp[0]);
-               sa3->sa_gid = EXTRACT_32BITS(dp);
+               ND_TCHECK_4(dp);
+               sa3->sa_gid = EXTRACT_BE_U_4(dp);

                dp++;
        }
 
                dp++;
        }
 

-       ND_TCHECK(dp[0]);
-       sa3->sa_sizeset = EXTRACT_32BITS(dp);
+       ND_TCHECK_4(dp);
+       sa3->sa_sizeset = EXTRACT_BE_U_4(dp);

        dp++;
        if (sa3->sa_sizeset) {
        dp++;
        if (sa3->sa_sizeset) {

-               ND_TCHECK(dp[0]);
-               sa3->sa_size = EXTRACT_32BITS(dp);
+               ND_TCHECK_4(dp);
+               sa3->sa_size = EXTRACT_BE_U_4(dp);

                dp++;
        }
 
                dp++;
        }
 

-       ND_TCHECK(dp[0]);
-       sa3->sa_atimetype = EXTRACT_32BITS(dp);
+       ND_TCHECK_4(dp);
+       sa3->sa_atimetype = EXTRACT_BE_U_4(dp);

        dp++;
        if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT) {
        dp++;
        if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT) {

-               ND_TCHECK(dp[1]);
-               sa3->sa_atime.nfsv3_sec = EXTRACT_32BITS(dp);
+               ND_TCHECK_4(dp + 1);
+               sa3->sa_atime.nfsv3_sec = EXTRACT_BE_U_4(dp);

                dp++;
                dp++;

-               sa3->sa_atime.nfsv3_nsec = EXTRACT_32BITS(dp);
+               sa3->sa_atime.nfsv3_nsec = EXTRACT_BE_U_4(dp);

                dp++;
        }
 
                dp++;
        }
 

-       ND_TCHECK(dp[0]);
-       sa3->sa_mtimetype = EXTRACT_32BITS(dp);
+       ND_TCHECK_4(dp);
+       sa3->sa_mtimetype = EXTRACT_BE_U_4(dp);

        dp++;
        if (sa3->sa_mtimetype == NFSV3SATTRTIME_TOCLIENT) {
        dp++;
        if (sa3->sa_mtimetype == NFSV3SATTRTIME_TOCLIENT) {

-               ND_TCHECK(dp[1]);
-               sa3->sa_mtime.nfsv3_sec = EXTRACT_32BITS(dp);
+               ND_TCHECK_4(dp + 1);
+               sa3->sa_mtime.nfsv3_sec = EXTRACT_BE_U_4(dp);

                dp++;
                dp++;

-               sa3->sa_mtime.nfsv3_nsec = EXTRACT_32BITS(dp);
+               sa3->sa_mtime.nfsv3_nsec = EXTRACT_BE_U_4(dp);

                dp++;
        }
 
                dp++;
        }
 


@@ -313,27 +303,27 @@ 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);

        }
 }
 
 void
 nfsreply_print(netdissect_options *ndo,
        }
 }
 
 void
 nfsreply_print(netdissect_options *ndo,

-               register const u_char *bp, u_int length,
-               register const u_char *bp2)
+               const u_char *bp, u_int length,
+               const u_char *bp2)

 {
 {

-       register const struct sunrpc_msg *rp;
+       const struct sunrpc_msg *rp;

        char srcid[20], dstid[20];      /*fits 32bit*/
 
        nfserr = 0;             /* assume no error */
        char srcid[20], dstid[20];      /*fits 32bit*/
 
        nfserr = 0;             /* assume no error */


@@ -343,28 +333,28 @@ nfsreply_print(netdissect_options *ndo,
        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_32BITS(&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_32BITS(&rp->rm_xid));
+                   EXTRACT_BE_U_4(rp->rm_xid));

        }
        print_nfsaddr(ndo, bp2, srcid, dstid);
 
        }
        print_nfsaddr(ndo, bp2, srcid, dstid);
 

-       nfsreply_print_noaddr(ndo, bp, length, bp2);
+       nfsreply_noaddr_print(ndo, bp, length, bp2);

        return;
 
 trunc:
        if (!nfserr)
        return;
 
 trunc:
        if (!nfserr)

-               ND_PRINT((ndo, "%s", tstr));
+               ND_PRINT("%s", tstr);

 }
 
 void
 }
 
 void

-nfsreply_print_noaddr(netdissect_options *ndo,
-                      register const u_char *bp, u_int length,
-                      register const u_char *bp2)
+nfsreply_noaddr_print(netdissect_options *ndo,
+                      const u_char *bp, u_int length,
+                      const u_char *bp2)

 {
 {

-       register const struct sunrpc_msg *rp;
+       const struct sunrpc_msg *rp;

        uint32_t proc, vers, reply_stat;
        enum sunrpc_reject_stat rstat;
        uint32_t rlow;
        uint32_t proc, vers, reply_stat;
        enum sunrpc_reject_stat rstat;
        uint32_t rlow;


@@ -375,49 +365,49 @@ nfsreply_print_noaddr(netdissect_options *ndo,
        rp = (const struct sunrpc_msg *)bp;
 
        ND_TCHECK(rp->rm_reply.rp_stat);
        rp = (const struct sunrpc_msg *)bp;
 
        ND_TCHECK(rp->rm_reply.rp_stat);

-       reply_stat = EXTRACT_32BITS(&rp->rm_reply.rp_stat);
+       reply_stat = EXTRACT_BE_U_4(&rp->rm_reply.rp_stat);

        switch (reply_stat) {
 
        case SUNRPC_MSG_ACCEPTED:
        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_PRINT("reply ERR %u: ", length);

                ND_TCHECK(rp->rm_reply.rp_reject.rj_stat);
                ND_TCHECK(rp->rm_reply.rp_reject.rj_stat);

-               rstat = EXTRACT_32BITS(&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:
                        ND_TCHECK(rp->rm_reply.rp_reject.rj_vers.high);
                switch (rstat) {
 
                case SUNRPC_RPC_MISMATCH:
                        ND_TCHECK(rp->rm_reply.rp_reject.rj_vers.high);

-                       rlow = EXTRACT_32BITS(&rp->rm_reply.rp_reject.rj_vers.low);
-                       rhigh = EXTRACT_32BITS(&rp->rm_reply.rp_reject.rj_vers.high);
-                       ND_PRINT((ndo, "RPC Version mismatch (%u-%u)", rlow, rhigh));
+                       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("RPC Version mismatch (%u-%u)", rlow, rhigh);

                        break;
 
                case SUNRPC_AUTH_ERROR:
                        ND_TCHECK(rp->rm_reply.rp_reject.rj_why);
                        break;
 
                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 %s", tok2str(sunrpc_auth_str, "Invalid failure code %u", rwhy)));
+                       rwhy = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_why);
+                       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);

 }
 
 /*
 }
 
 /*


@@ -426,24 +416,24 @@ trunc:
  */
 static const uint32_t *
 parsereq(netdissect_options *ndo,
  */
 static const uint32_t *
 parsereq(netdissect_options *ndo,

-         register const struct sunrpc_msg *rp, register u_int length)
+         const struct sunrpc_msg *rp, u_int length)

 {
 {

-       register const uint32_t *dp;
-       register u_int len;
+       const uint32_t *dp;
+       u_int len;

 
        /*
         * find the start of the req data (if we captured it)
         */
 
        /*
         * find the start of the req data (if we captured it)
         */

-       dp = (uint32_t *)&rp->rm_call.cb_cred;
-       ND_TCHECK(dp[1]);
-       len = EXTRACT_32BITS(&dp[1]);
+       dp = (const uint32_t *)&rp->rm_call.cb_cred;
+       ND_TCHECK_4(dp + 1);
+       len = EXTRACT_BE_U_4(dp + 1);

        if (len < length) {
                dp += (len + (2 * sizeof(*dp) + 3)) / sizeof(*dp);
        if (len < length) {
                dp += (len + (2 * sizeof(*dp) + 3)) / sizeof(*dp);

-               ND_TCHECK(dp[1]);
-               len = EXTRACT_32BITS(&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);
                if (len < length) {
                        dp += (len + (2 * sizeof(*dp) + 3)) / sizeof(*dp);

-                       ND_TCHECK2(dp[0], 0);
+                       ND_TCHECK_LEN(dp, 0);

                        return (dp);
                }
        }
                        return (dp);
                }
        }


@@ -457,18 +447,18 @@ trunc:
  */
 static const uint32_t *
 parsefh(netdissect_options *ndo,
  */
 static const uint32_t *
 parsefh(netdissect_options *ndo,

-        register const uint32_t *dp, int v3)
+        const uint32_t *dp, int v3)

 {
        u_int len;
 
        if (v3) {
 {
        u_int len;
 
        if (v3) {

-               ND_TCHECK(dp[0]);
-               len = EXTRACT_32BITS(dp) / 4;
+               ND_TCHECK_4(dp);
+               len = EXTRACT_BE_U_4(dp) / 4;

                dp++;
        } else
                len = NFSX_V2FH / 4;
 
                dp++;
        } else
                len = NFSX_V2FH / 4;
 

-       if (ND_TTEST2(*dp, len * sizeof(*dp))) {
+       if (ND_TTEST_LEN(dp, len * sizeof(*dp))) {

                nfs_printfh(ndo, dp, len);
                return (dp + len);
        }
                nfs_printfh(ndo, dp, len);
                return (dp + len);
        }


@@ -482,29 +472,29 @@ trunc:
  */
 static const uint32_t *
 parsefn(netdissect_options *ndo,
  */
 static const uint32_t *
 parsefn(netdissect_options *ndo,

-        register const uint32_t *dp)
+        const uint32_t *dp)

 {
 {

-       register uint32_t len;
-       register const u_char *cp;
+       uint32_t len;
+       const u_char *cp;

 
        /* Bail if we don't have the string length */
 
        /* 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_TCHECK2(*dp, ((len + 3) & ~3));
+       ND_TCHECK_LEN(dp, ((len + 3) & ~3));

 
 

-       cp = (u_char *)dp;
+       cp = (const u_char *)dp;

        /* Update 32-bit pointer (NFS filenames padded to 32-bit boundaries) */
        dp += ((len + 3) & ~3) / sizeof(*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:


@@ -518,42 +508,42 @@ trunc:
  */
 static const uint32_t *
 parsefhn(netdissect_options *ndo,
  */
 static const uint32_t *
 parsefhn(netdissect_options *ndo,

-         register const uint32_t *dp, int v3)
+         const uint32_t *dp, int v3)

 {
        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));
 }
 
 void
        return (parsefn(ndo, dp));
 }
 
 void

-nfsreq_print_noaddr(netdissect_options *ndo,
-                    register const u_char *bp, u_int length,
-                    register const u_char *bp2)
+nfsreq_noaddr_print(netdissect_options *ndo,
+                    const u_char *bp, u_int length,
+                    const u_char *bp2)

 {
 {

-       register const struct sunrpc_msg *rp;
-       register const uint32_t *dp;
+       const struct sunrpc_msg *rp;
+       const uint32_t *dp;

        nfs_type type;
        int v3;
        uint32_t proc;
        uint32_t access_flags;
        struct nfsv3_sattr sa3;
 
        nfs_type type;
        int v3;
        uint32_t proc;
        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;
 
        if (!xid_map_enter(ndo, rp, bp2))       /* record proc number for later on */
                goto trunc;
 
        nfserr = 0;             /* assume no error */
        rp = (const struct sunrpc_msg *)bp;
 
        if (!xid_map_enter(ndo, rp, bp2))       /* record proc number for later on */
                goto trunc;
 

-       v3 = (EXTRACT_32BITS(&rp->rm_call.cb_vers) == NFS_VER3);
-       proc = EXTRACT_32BITS(&rp->rm_call.cb_proc);
+       v3 = (EXTRACT_BE_U_4(&rp->rm_call.cb_vers) == NFS_VER3);
+       proc = EXTRACT_BE_U_4(&rp->rm_call.cb_proc);

 
        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:


@@ -580,37 +570,37 @@ nfsreq_print_noaddr(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]);
-                       access_flags = EXTRACT_32BITS(&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 */
                        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;
                }


@@ -620,15 +610,15 @@ nfsreq_print_noaddr(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,
-                                      EXTRACT_32BITS(&dp[2]),
-                                      EXTRACT_64BITS(&dp[0])));
+                               ND_TCHECK_4(dp + 2);
+                               ND_PRINT(" %u bytes @ %" PRIu64,
+                                      EXTRACT_BE_U_4(dp + 2),
+                                      EXTRACT_BE_U_8(dp));

                        } else {
                        } else {

-                               ND_TCHECK(dp[1]);
-                               ND_PRINT((ndo, " %u bytes @ %u",
-                                   EXTRACT_32BITS(&dp[1]),
-                                   EXTRACT_32BITS(&dp[0])));
+                               ND_TCHECK_4(dp + 1);
+                               ND_PRINT(" %u bytes @ %u",
+                                   EXTRACT_BE_U_4(dp + 1),
+                                   EXTRACT_BE_U_4(dp));

                        }
                        return;
                }
                        }
                        return;
                }


@@ -638,37 +628,35 @@ nfsreq_print_noaddr(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 (%u) bytes @ %" PRIu64,
-                                               EXTRACT_32BITS(&dp[4]),
-                                               EXTRACT_32BITS(&dp[2]),
-                                               EXTRACT_64BITS(&dp[0])));
+                               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_8(dp));

                                if (ndo->ndo_vflag) {
                                if (ndo->ndo_vflag) {

-                                       dp += 3;
-                                       ND_TCHECK(dp[0]);
-                                       ND_PRINT((ndo, " <%s>",
+                                       ND_PRINT(" <%s>",

                                                tok2str(nfsv3_writemodes,
                                                tok2str(nfsv3_writemodes,

-                                                       NULL, EXTRACT_32BITS(dp))));
+                                                       NULL, EXTRACT_BE_U_4(dp + 3)));

                                }
                        } else {
                                }
                        } else {

-                               ND_TCHECK(dp[3]);
-                               ND_PRINT((ndo, " %u (%u) bytes @ %u (%u)",
-                                               EXTRACT_32BITS(&dp[3]),
-                                               EXTRACT_32BITS(&dp[2]),
-                                               EXTRACT_32BITS(&dp[1]),
-                                               EXTRACT_32BITS(&dp[0])));
+                               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));

                        }
                        return;
                }
                break;
 
        case NFSPROC_SYMLINK:
                        }
                        return;
                }
                break;
 
        case NFSPROC_SYMLINK:

-               if ((dp = parsereq(ndo, rp, length)) != 0 &&
-                   (dp = parsefhn(ndo, dp, v3)) != 0) {
-                       ND_PRINT((ndo, " ->"));
-                       if (v3 && (dp = parse_sattr3(ndo, dp, &sa3)) == 0)
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   (dp = parsefhn(ndo, dp, v3)) != NULL) {
+                       ND_PRINT(" ->");
+                       if (v3 && (dp = parse_sattr3(ndo, dp, &sa3)) == NULL)

                                break;
                                break;

-                       if (parsefn(ndo, dp) == 0)
+                       if (parsefn(ndo, dp) == NULL)

                                break;
                        if (v3 && ndo->ndo_vflag)
                                print_sattr3(ndo, &sa3, ndo->ndo_vflag);
                                break;
                        if (v3 && ndo->ndo_vflag)
                                print_sattr3(ndo, &sa3, ndo->ndo_vflag);


@@ -677,19 +665,19 @@ nfsreq_print_noaddr(netdissect_options *ndo,
                break;
 
        case NFSPROC_MKNOD:
                break;
 
        case NFSPROC_MKNOD:

-               if ((dp = parsereq(ndo, rp, length)) != 0 &&
-                   (dp = parsefhn(ndo, dp, v3)) != 0) {
-                       ND_TCHECK(*dp);
-                       type = (nfs_type)EXTRACT_32BITS(dp);
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   (dp = parsefhn(ndo, dp, v3)) != NULL) {
+                       ND_TCHECK_4(dp);
+                       type = (nfs_type) EXTRACT_BE_U_4(dp);

                        dp++;
                        dp++;

-                       if ((dp = parse_sattr3(ndo, dp, &sa3)) == 0)
+                       if ((dp = parse_sattr3(ndo, dp, &sa3)) == NULL)

                                break;
                                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",
-                                      EXTRACT_32BITS(&dp[0]),
-                                      EXTRACT_32BITS(&dp[1])));
+                               ND_TCHECK_4(dp + 1);
+                               ND_PRINT(" %u/%u",
+                                      EXTRACT_BE_U_4(dp),
+                                      EXTRACT_BE_U_4(dp + 1));

                                dp += 2;
                        }
                        if (ndo->ndo_vflag)
                                dp += 2;
                        }
                        if (ndo->ndo_vflag)


@@ -701,7 +689,7 @@ nfsreq_print_noaddr(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;
                }


@@ -710,7 +698,7 @@ nfsreq_print_noaddr(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;
                }


@@ -720,25 +708,34 @@ nfsreq_print_noaddr(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,
-                                   EXTRACT_32BITS(&dp[4]),
-                                   EXTRACT_64BITS(&dp[0])));
-                               if (ndo->ndo_vflag)
-                                       ND_PRINT((ndo, " verf %08x%08x", dp[2], dp[3]));
+                               ND_PRINT(" %u bytes @ %" PRId64,
+                                   EXTRACT_BE_U_4(dp + 4),
+                                   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",
-                                   EXTRACT_32BITS(&dp[1]),
-                                   EXTRACT_32BITS(&dp[0])));
+                               ND_PRINT(" %u bytes @ %u",
+                                   EXTRACT_BE_U_4(dp + 1),
+                                   EXTRACT_BE_U_4(dp));

                        }
                        return;
                }
                        }
                        return;
                }


@@ -747,18 +744,26 @@ nfsreq_print_noaddr(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,
-                               EXTRACT_32BITS(&dp[4]),
-                               EXTRACT_64BITS(&dp[0])));
+                       ND_PRINT(" %u bytes @ %" PRId64,
+                               EXTRACT_BE_U_4(dp + 4),
+                               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_32BITS(&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;
                }


@@ -767,10 +772,10 @@ nfsreq_print_noaddr(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,
-                               EXTRACT_32BITS(&dp[2]),
-                               EXTRACT_64BITS(&dp[0])));
+                       ND_TCHECK_4(dp + 2);
+                       ND_PRINT(" %u bytes @ %" PRIu64,
+                               EXTRACT_BE_U_4(dp + 2),
+                               EXTRACT_BE_U_8(dp));

                        return;
                }
                break;
                        return;
                }
                break;


@@ -781,7 +786,7 @@ nfsreq_print_noaddr(netdissect_options *ndo,
 
 trunc:
        if (!nfserr)
 
 trunc:
        if (!nfserr)

-               ND_PRINT((ndo, "%s", tstr));
+               ND_PRINT("%s", tstr);

 }
 
 /*
 }
 
 /*


@@ -795,7 +800,7 @@ trunc:
  */
 static void
 nfs_printfh(netdissect_options *ndo,
  */
 static void
 nfs_printfh(netdissect_options *ndo,

-            register const uint32_t *dp, const u_int len)
+            const uint32_t *dp, const u_int len)

 {
        my_fsid fsid;
        uint32_t ino;
 {
        my_fsid fsid;
        uint32_t ino;


@@ -806,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;
        }
 


@@ -819,27 +836,31 @@ nfs_printfh(netdissect_options *ndo,
 
        if (sfsname) {
                /* file system ID is ASCII, not numeric, for this server OS */
 
        if (sfsname) {
                /* file system ID is ASCII, not numeric, for this server OS */

-               static char temp[NFSX_V3FHMAX+1];
+               char temp[NFSX_V3FHMAX+1];
+               u_int stringlen;

 
                /* Make sure string is null-terminated */
 
                /* Make sure string is null-terminated */

-               strncpy(temp, sfsname, NFSX_V3FHMAX);
-               temp[sizeof(temp) - 1] = '\0';
+               stringlen = len;
+               if (stringlen > NFSX_V3FHMAX)
+                       stringlen = NFSX_V3FHMAX;
+               strncpy(temp, sfsname, stringlen);
+               temp[stringlen] = '\0';

                /* Remove trailing spaces */
                spacep = strchr(temp, ' ');
                if (spacep)
                        *spacep = '\0';
 
                /* Remove trailing spaces */
                spacep = strchr(temp, ' ');
                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);

 }
 
 /*
 }
 
 /*


@@ -851,13 +872,8 @@ nfs_printfh(netdissect_options *ndo,
 struct xid_map_entry {
        uint32_t        xid;            /* transaction ID (net order) */
        int ipver;                      /* IP version (4 or 6) */
 struct xid_map_entry {
        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) */
        struct in6_addr server;         /* server IP address (net order) */
        struct in6_addr client;         /* client IP address (net order) */
        struct in6_addr server;         /* server IP address (net order) */

-#else
-       struct in_addr  client;         /* client IP address (net order) */
-       struct in_addr  server;         /* server IP address (net order) */
-#endif

        uint32_t        proc;           /* call proc number (host order) */
        uint32_t        vers;           /* program version (host order) */
 };
        uint32_t        proc;           /* call proc number (host order) */
        uint32_t        vers;           /* program version (host order) */
 };


@@ -870,32 +886,28 @@ struct xid_map_entry {
 
 #define        XIDMAPSIZE      64
 
 
 #define        XIDMAPSIZE      64
 

-struct xid_map_entry xid_map[XIDMAPSIZE];
+static struct xid_map_entry xid_map[XIDMAPSIZE];

 
 

-int    xid_map_next = 0;
-int    xid_map_hint = 0;
+static int xid_map_next = 0;
+static int xid_map_hint = 0;

 
 static int
 xid_map_enter(netdissect_options *ndo,
               const struct sunrpc_msg *rp, const u_char *bp)
 {
 
 static int
 xid_map_enter(netdissect_options *ndo,
               const struct sunrpc_msg *rp, const u_char *bp)
 {

-       struct ip *ip = NULL;
-#ifdef INET6
-       struct ip6_hdr *ip6 = NULL;
-#endif
+       const struct ip *ip = NULL;
+       const struct ip6_hdr *ip6 = NULL;

        struct xid_map_entry *xmep;
 
        struct xid_map_entry *xmep;
 

-       if (!ND_TTEST(rp->rm_call.cb_vers))
+       if (!ND_TTEST_4(rp->rm_call.cb_proc))

                return (0);
                return (0);

-       switch (IP_V((struct ip *)bp)) {
+       switch (IP_V((const struct ip *)bp)) {

        case 4:
        case 4:

-               ip = (struct ip *)bp;
+               ip = (const struct ip *)bp;

                break;
                break;

-#ifdef INET6

        case 6:
        case 6:

-               ip6 = (struct ip6_hdr *)bp;
+               ip6 = (const struct ip6_hdr *)bp;

                break;
                break;

-#endif

        default:
                return (1);
        }
        default:
                return (1);
        }


@@ -905,21 +917,19 @@ xid_map_enter(netdissect_options *ndo,
        if (++xid_map_next >= XIDMAPSIZE)
                xid_map_next = 0;
 
        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));
                UNALIGNED_MEMCPY(&xmep->server, &ip->ip_dst, sizeof(ip->ip_dst));
        }
        if (ip) {
                xmep->ipver = 4;
                UNALIGNED_MEMCPY(&xmep->client, &ip->ip_src, sizeof(ip->ip_src));
                UNALIGNED_MEMCPY(&xmep->server, &ip->ip_dst, sizeof(ip->ip_dst));
        }

-#ifdef INET6

        else if (ip6) {
                xmep->ipver = 6;
                UNALIGNED_MEMCPY(&xmep->client, &ip6->ip6_src, sizeof(ip6->ip6_src));
                UNALIGNED_MEMCPY(&xmep->server, &ip6->ip6_dst, sizeof(ip6->ip6_dst));
        }
        else if (ip6) {
                xmep->ipver = 6;
                UNALIGNED_MEMCPY(&xmep->client, &ip6->ip6_src, sizeof(ip6->ip6_src));
                UNALIGNED_MEMCPY(&xmep->server, &ip6->ip6_dst, sizeof(ip6->ip6_dst));
        }

-#endif
-       xmep->proc = EXTRACT_32BITS(&rp->rm_call.cb_proc);
-       xmep->vers = EXTRACT_32BITS(&rp->rm_call.cb_vers);
+       xmep->proc = EXTRACT_BE_U_4(&rp->rm_call.cb_proc);
+       xmep->vers = EXTRACT_BE_U_4(&rp->rm_call.cb_vers);

        return (1);
 }
 
        return (1);
 }
 


@@ -933,13 +943,12 @@ xid_map_find(const struct sunrpc_msg *rp, const u_char *bp, uint32_t *proc,
 {
        int i;
        struct xid_map_entry *xmep;
 {
        int i;
        struct xid_map_entry *xmep;

-       uint32_t xid = rp->rm_xid;
-       struct ip *ip = (struct ip *)bp;
-#ifdef INET6
-       struct ip6_hdr *ip6 = (struct ip6_hdr *)bp;
-#endif
+       uint32_t xid;
+       const struct ip *ip = (const struct ip *)bp;
+       const struct ip6_hdr *ip6 = (const struct ip6_hdr *)bp;

        int cmp;
 
        int cmp;
 

+       UNALIGNED_MEMCPY(&xid, &rp->rm_xid, sizeof(xmep->xid));

        /* Start searching from where we last left off */
        i = xid_map_hint;
        do {
        /* Start searching from where we last left off */
        i = xid_map_hint;
        do {


@@ -956,7 +965,6 @@ xid_map_find(const struct sunrpc_msg *rp, const u_char *bp, uint32_t *proc,
                                cmp = 0;
                        }
                        break;
                                cmp = 0;
                        }
                        break;

-#ifdef INET6

                case 6:
                        if (UNALIGNED_MEMCMP(&ip6->ip6_src, &xmep->server,
                                   sizeof(ip6->ip6_src)) != 0 ||
                case 6:
                        if (UNALIGNED_MEMCMP(&ip6->ip6_src, &xmep->server,
                                   sizeof(ip6->ip6_src)) != 0 ||


@@ -965,7 +973,6 @@ xid_map_find(const struct sunrpc_msg *rp, const u_char *bp, uint32_t *proc,
                                cmp = 0;
                        }
                        break;
                                cmp = 0;
                        }
                        break;

-#endif

                default:
                        cmp = 0;
                        break;
                default:
                        cmp = 0;
                        break;


@@ -996,9 +1003,9 @@ xid_map_find(const struct sunrpc_msg *rp, const u_char *bp, uint32_t *proc,
  */
 static const uint32_t *
 parserep(netdissect_options *ndo,
  */
 static const uint32_t *
 parserep(netdissect_options *ndo,

-         register const struct sunrpc_msg *rp, register u_int length)
+         const struct sunrpc_msg *rp, u_int length)

 {
 {

-       register const uint32_t *dp;
+       const uint32_t *dp;

        u_int len;
        enum sunrpc_accept_stat astat;
 
        u_int len;
        enum sunrpc_accept_stat astat;
 


@@ -1018,47 +1025,47 @@ 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]);
-       len = EXTRACT_32BITS(&dp[1]);
+       ND_TCHECK_4(dp + 1);
+       len = EXTRACT_BE_U_4(dp + 1);

        if (len >= length)
                return (NULL);
        /*
         * skip past the ar_verf credentials.
         */
        dp += (len + (2*sizeof(uint32_t) + 3)) / sizeof(uint32_t);
        if (len >= length)
                return (NULL);
        /*
         * skip past the ar_verf credentials.
         */
        dp += (len + (2*sizeof(uint32_t) + 3)) / sizeof(uint32_t);

-       ND_TCHECK2(dp[0], 0);

 
        /*
         * now we can check the ar_stat field
         */
 
        /*
         * now we can check the ar_stat field
         */

-       astat = (enum sunrpc_accept_stat) EXTRACT_32BITS(dp);
+       ND_TCHECK_4(dp);
+       astat = (enum sunrpc_accept_stat) EXTRACT_BE_U_4(dp);

        if (astat != SUNRPC_SUCCESS) {
        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);
        }
        /* successful return */
                nfserr = 1;             /* suppress trunc string */
                return (NULL);
        }
        /* successful return */

-       ND_TCHECK2(*dp, sizeof(astat));
-       return ((uint32_t *) (sizeof(astat) + ((char *)dp)));
+       ND_TCHECK_LEN(dp, sizeof(astat));
+       return ((const uint32_t *) (sizeof(astat) + ((const char *)dp)));

 trunc:
        return (0);
 }
 
 static const uint32_t *
 parsestatus(netdissect_options *ndo,
 trunc:
        return (0);
 }
 
 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_32BITS(&dp[0]);
+       errnum = EXTRACT_BE_U_4(dp);

        if (er)
                *er = errnum;
        if (errnum != 0) {
                if (!ndo->ndo_qflag)
        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);


@@ -1075,61 +1082,67 @@ parsefattr(netdissect_options *ndo,
        fap = (const struct nfs_fattr *)dp;
        ND_TCHECK(fap->fa_gid);
        if (verbose) {
        fap = (const struct nfs_fattr *)dp;
        ND_TCHECK(fap->fa_gid);
        if (verbose) {

-               ND_PRINT((ndo, " %s %o ids %d/%d",
-                   tok2str(type2str, "unk-ft %d ",
-                   EXTRACT_32BITS(&fap->fa_type)),
-                   EXTRACT_32BITS(&fap->fa_mode),
-                   EXTRACT_32BITS(&fap->fa_uid),
-                   EXTRACT_32BITS(&fap->fa_gid)));
+               /*
+                * 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_S_4(&fap->fa_uid),
+                   EXTRACT_BE_S_4(&fap->fa_gid));

                if (v3) {
                        ND_TCHECK(fap->fa3_size);
                if (v3) {
                        ND_TCHECK(fap->fa3_size);

-                       ND_PRINT((ndo, " sz %" PRIu64,
-                               EXTRACT_64BITS((uint32_t *)&fap->fa3_size)));
+                       ND_PRINT(" sz %" PRIu64,
+                               EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_size));

                } else {
                        ND_TCHECK(fap->fa2_size);
                } else {
                        ND_TCHECK(fap->fa2_size);

-                       ND_PRINT((ndo, " sz %d", EXTRACT_32BITS(&fap->fa2_size)));
+                       ND_PRINT(" sz %u", EXTRACT_BE_U_4(&fap->fa2_size));

                }
        }
        /* print lots more stuff */
        if (verbose > 1) {
                if (v3) {
                        ND_TCHECK(fap->fa3_ctime);
                }
        }
        /* print lots more stuff */
        if (verbose > 1) {
                if (v3) {
                        ND_TCHECK(fap->fa3_ctime);

-                       ND_PRINT((ndo, " nlink %d rdev %d/%d",
-                              EXTRACT_32BITS(&fap->fa_nlink),
-                              EXTRACT_32BITS(&fap->fa3_rdev.specdata1),
-                              EXTRACT_32BITS(&fap->fa3_rdev.specdata2)));
-                       ND_PRINT((ndo, " fsid %" PRIx64,
-                               EXTRACT_64BITS((uint32_t *)&fap->fa3_fsid)));
-                       ND_PRINT((ndo, " fileid %" PRIx64,
-                               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)));
-                       ND_PRINT((ndo, " %u.%06u",
-                              EXTRACT_32BITS(&fap->fa3_mtime.nfsv3_sec),
-                              EXTRACT_32BITS(&fap->fa3_mtime.nfsv3_nsec)));
-                       ND_PRINT((ndo, " %u.%06u",
-                              EXTRACT_32BITS(&fap->fa3_ctime.nfsv3_sec),
-                              EXTRACT_32BITS(&fap->fa3_ctime.nfsv3_nsec)));
+                       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->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_nsec));
+                       ND_PRINT(" %u.%06u",
+                              EXTRACT_BE_U_4(&fap->fa3_mtime.nfsv3_sec),
+                              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_nsec));

                } else {
                        ND_TCHECK(fap->fa2_ctime);
                } else {
                        ND_TCHECK(fap->fa2_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),
-                              EXTRACT_32BITS(&fap->fa2_fileid)));
-                       ND_PRINT((ndo, " %u.%06u",
-                              EXTRACT_32BITS(&fap->fa2_atime.nfsv2_sec),
-                              EXTRACT_32BITS(&fap->fa2_atime.nfsv2_usec)));
-                       ND_PRINT((ndo, " %u.%06u",
-                              EXTRACT_32BITS(&fap->fa2_mtime.nfsv2_sec),
-                              EXTRACT_32BITS(&fap->fa2_mtime.nfsv2_usec)));
-                       ND_PRINT((ndo, " %u.%06u",
-                              EXTRACT_32BITS(&fap->fa2_ctime.nfsv2_sec),
-                              EXTRACT_32BITS(&fap->fa2_ctime.nfsv2_usec)));
+                       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->fa2_fileid));
+                       ND_PRINT(" %u.%06u",
+                              EXTRACT_BE_U_4(&fap->fa2_atime.nfsv2_sec),
+                              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_usec));
+                       ND_PRINT(" %u.%06u",
+                              EXTRACT_BE_U_4(&fap->fa2_ctime.nfsv2_sec),
+                              EXTRACT_BE_U_4(&fap->fa2_ctime.nfsv2_usec));

                }
        }
                }
        }

-       return ((const uint32_t *)((unsigned char *)dp +
+       return ((const uint32_t *)((const unsigned char *)dp +

                (v3 ? NFSX_V3FATTR : NFSX_V2FATTR)));
 trunc:
        return (NULL);
                (v3 ? NFSX_V3FATTR : NFSX_V2FATTR)));
 trunc:
        return (NULL);


@@ -1139,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)


@@ -1154,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);


@@ -1172,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)


@@ -1181,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);
 }
 


@@ -1190,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)


@@ -1203,34 +1216,34 @@ 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);
        }
 

-       ND_TCHECK2(*dp, (v3 ? NFSX_V3STATFS : NFSX_V2STATFS));
+       ND_TCHECK_LEN(dp, (v3 ? NFSX_V3STATFS : NFSX_V2STATFS));

 
        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,
-                       EXTRACT_64BITS((uint32_t *)&sfsp->sf_tbytes),
-                       EXTRACT_64BITS((uint32_t *)&sfsp->sf_fbytes),
-                       EXTRACT_64BITS((uint32_t *)&sfsp->sf_abytes)));
+               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_abytes));

                if (ndo->ndo_vflag) {
                if (ndo->ndo_vflag) {

-                       ND_PRINT((ndo, " tfiles %" PRIu64 " ffiles %" PRIu64 " afiles %" PRIu64 " invar %u",
-                              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)));
+                       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_4(&sfsp->sf_invarsec));

                }
        } else {
                }
        } else {

-               ND_PRINT((ndo, " tsize %d bsize %d blocks %d bfree %d bavail %d",
-                       EXTRACT_32BITS(&sfsp->sf_tsize),
-                       EXTRACT_32BITS(&sfsp->sf_bsize),
-                       EXTRACT_32BITS(&sfsp->sf_blocks),
-                       EXTRACT_32BITS(&sfsp->sf_bfree),
-                       EXTRACT_32BITS(&sfsp->sf_bavail)));
+               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_bavail));

        }
 
        return (1);
        }
 
        return (1);


@@ -1242,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)


@@ -1252,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_32BITS(&dp[0]), EXTRACT_32BITS(&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:


@@ -1267,10 +1280,11 @@ static const uint32_t *
 parse_wcc_attr(netdissect_options *ndo,
                const uint32_t *dp)
 {
 parse_wcc_attr(netdissect_options *ndo,
                const uint32_t *dp)
 {

-       ND_PRINT((ndo, " sz %" PRIu64, EXTRACT_64BITS(&dp[0])));
-       ND_PRINT((ndo, " mtime %u.%06u ctime %u.%06u",
-              EXTRACT_32BITS(&dp[2]), EXTRACT_32BITS(&dp[3]),
-              EXTRACT_32BITS(&dp[4]), EXTRACT_32BITS(&dp[5])));
+       /* Our caller has already checked this */
+       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 + 4), EXTRACT_BE_U_4(dp + 5));

        return (dp + 6);
 }
 
        return (dp + 6);
 }
 


@@ -1281,11 +1295,11 @@ 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]);
-       if (!EXTRACT_32BITS(&dp[0]))
+       ND_TCHECK_4(dp);
+       if (!EXTRACT_BE_U_4(dp))

                return (dp + 1);
        dp++;
                return (dp + 1);
        dp++;

-       ND_TCHECK2(*dp, 24);
+       ND_TCHECK_LEN(dp, 24);

        if (verbose > 1) {
                return parse_wcc_attr(ndo, dp);
        } else {
        if (verbose > 1) {
                return parse_wcc_attr(ndo, dp);
        } else {


@@ -1303,8 +1317,8 @@ 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]);
-       if (!EXTRACT_32BITS(&dp[0]))
+       ND_TCHECK_4(dp);
+       if (!EXTRACT_BE_U_4(dp))

                return (dp + 1);
        dp++;
        if (verbose) {
                return (dp + 1);
        dp++;
        if (verbose) {


@@ -1320,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);
 }
 


@@ -1333,15 +1347,15 @@ 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]);
-               if (!EXTRACT_32BITS(&dp[0]))
+               ND_TCHECK_4(dp);
+               if (!EXTRACT_BE_U_4(dp))

                        return (dp + 1);
                dp++;
                if (!(dp = parsefh(ndo, dp, 1)))
                        return (dp + 1);
                dp++;
                if (!(dp = parsefh(ndo, dp, 1)))


@@ -1350,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);
                        }
                }


@@ -1364,30 +1378,35 @@ 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);

-       return parse_wcc_data(ndo, dp, verbose) != 0;
+       return parse_wcc_data(ndo, dp, verbose) != NULL;

 }
 
 static const uint32_t *
 parsev3rddirres(netdissect_options *ndo,
                 const uint32_t *dp, int verbose)
 {
 }
 
 static const uint32_t *
 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;


@@ -1399,34 +1418,34 @@ static int
 parsefsinfo(netdissect_options *ndo,
             const uint32_t *dp)
 {
 parsefsinfo(netdissect_options *ndo,
             const uint32_t *dp)
 {

-       struct nfsv3_fsinfo *sfp;
-       int er;
+       const struct nfsv3_fsinfo *sfp;
+       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);
 
        if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                return (0);
        if (er)
                return (1);
 

-       sfp = (struct nfsv3_fsinfo *)dp;
-       ND_TCHECK(*sfp);
-       ND_PRINT((ndo, " rtmax %u rtpref %u wtmax %u wtpref %u dtpref %u",
-              EXTRACT_32BITS(&sfp->fs_rtmax),
-              EXTRACT_32BITS(&sfp->fs_rtpref),
-              EXTRACT_32BITS(&sfp->fs_wtmax),
-              EXTRACT_32BITS(&sfp->fs_wtpref),
-              EXTRACT_32BITS(&sfp->fs_dtpref)));
+       sfp = (const struct nfsv3_fsinfo *)dp;
+       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_dtpref));

        if (ndo->ndo_vflag) {
        if (ndo->ndo_vflag) {

-               ND_PRINT((ndo, " rtmult %u wtmult %u maxfsz %" PRIu64,
-                      EXTRACT_32BITS(&sfp->fs_rtmult),
-                      EXTRACT_32BITS(&sfp->fs_wtmult),
-                      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)));
+               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_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_nsec));

        }
        return (1);
 trunc:
        }
        return (1);
 trunc:


@@ -1437,28 +1456,28 @@ static int
 parsepathconf(netdissect_options *ndo,
               const uint32_t *dp)
 {
 parsepathconf(netdissect_options *ndo,
               const uint32_t *dp)
 {

-       int er;
-       struct nfsv3_pathconf *spp;
+       u_int er;
+       const struct nfsv3_pathconf *spp;

 
        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);
 
        if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                return (0);
        if (er)
                return (1);
 

-       spp = (struct nfsv3_pathconf *)dp;
-       ND_TCHECK(*spp);
+       spp = (const struct nfsv3_pathconf *)dp;
+       ND_TCHECK_SIZE(spp);

 
 

-       ND_PRINT((ndo, " linkmax %u namemax %u %s %s %s %s",
-              EXTRACT_32BITS(&spp->pc_linkmax),
-              EXTRACT_32BITS(&spp->pc_namemax),
-              EXTRACT_32BITS(&spp->pc_notrunc) ? "notrunc" : "",
-              EXTRACT_32BITS(&spp->pc_chownrestricted) ? "chownres" : "",
-              EXTRACT_32BITS(&spp->pc_caseinsensitive) ? "igncase" : "",
-              EXTRACT_32BITS(&spp->pc_casepreserving) ? "keepcase" : ""));
+       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_casepreserving) ? "keepcase" : "");

        return (1);
 trunc:
        return (0);
        return (1);
 trunc:
        return (0);


@@ -1468,16 +1487,16 @@ static void
 interp_reply(netdissect_options *ndo,
              const struct sunrpc_msg *rp, uint32_t proc, uint32_t vers, int length)
 {
 interp_reply(netdissect_options *ndo,
              const struct sunrpc_msg *rp, uint32_t proc, uint32_t vers, int length)
 {

-       register const uint32_t *dp;
-       register int v3;
-       int er;
+       const uint32_t *dp;
+       int v3;
+       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:


@@ -1506,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 {


@@ -1514,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);
                                }
                        }


@@ -1532,11 +1551,13 @@ 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 (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                        break;

-               if (!er)
-                       ND_PRINT((ndo, " c %04x", EXTRACT_32BITS(&dp[0])));
+               if (!er) {
+                       ND_TCHECK_4(dp);
+                       ND_PRINT(" c %04x", EXTRACT_BE_U_4(dp));
+               }

                return;
 
        case NFSPROC_READLINK:
                return;
 
        case NFSPROC_READLINK:


@@ -1556,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_32BITS(&dp[0])));
-                               if (EXTRACT_32BITS(&dp[1]))
-                                       ND_PRINT((ndo, " EOF"));
+                               ND_TCHECK_4(dp + 1);
+                               ND_PRINT(" %u bytes", EXTRACT_BE_U_4(dp));
+                               if (EXTRACT_BE_U_4(dp + 1))
+                                       ND_PRINT(" EOF");

                        }
                        return;
                } else {
                        }
                        return;
                } else {


@@ -1579,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_32BITS(&dp[0])));
+                               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_32BITS(&dp[1]))));
+                                                       NULL, EXTRACT_BE_U_4(dp + 1)));

                                }
                                return;
                        }
                                }
                                return;
                        }


@@ -1600,7 +1621,7 @@ interp_reply(netdissect_options *ndo,
                if (!(dp = parserep(ndo, rp, length)))
                        break;
                if (v3) {
                if (!(dp = parserep(ndo, rp, length)))
                        break;
                if (v3) {

-                       if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != 0)
+                       if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != NULL)

                                return;
                } else {
                        if (parsediropres(ndo, dp) != 0)
                                return;
                } else {
                        if (parsediropres(ndo, dp) != 0)


@@ -1612,10 +1633,10 @@ interp_reply(netdissect_options *ndo,
                if (!(dp = parserep(ndo, rp, length)))
                        break;
                if (v3) {
                if (!(dp = parserep(ndo, rp, length)))
                        break;
                if (v3) {

-                       if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != 0)
+                       if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != NULL)

                                return;
                } else {
                                return;
                } else {

-                       if (parsestatus(ndo, dp, &er) != 0)
+                       if (parsestatus(ndo, dp, &er) != NULL)

                                return;
                }
                break;
                                return;
                }
                break;


@@ -1623,7 +1644,7 @@ interp_reply(netdissect_options *ndo,
        case NFSPROC_MKNOD:
                if (!(dp = parserep(ndo, rp, length)))
                        break;
        case NFSPROC_MKNOD:
                if (!(dp = parserep(ndo, rp, length)))
                        break;

-               if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != 0)
+               if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != NULL)

                        return;
                break;
 
                        return;
                break;
 


@@ -1635,7 +1656,7 @@ interp_reply(netdissect_options *ndo,
                        if (parsewccres(ndo, dp, ndo->ndo_vflag))
                                return;
                } else {
                        if (parsewccres(ndo, dp, ndo->ndo_vflag))
                                return;
                } else {

-                       if (parsestatus(ndo, dp, &er) != 0)
+                       if (parsestatus(ndo, dp, &er) != NULL)

                                return;
                }
                break;
                                return;
                }
                break;


@@ -1647,16 +1668,16 @@ 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;
                        }
                        return;
                } else {
                                if (!(dp = parse_wcc_data(ndo, dp, ndo->ndo_vflag)))
                                        break;
                        }
                        return;
                } else {

-                       if (parsestatus(ndo, dp, &er) != 0)
+                       if (parsestatus(ndo, dp, &er) != NULL)

                                return;
                }
                break;
                                return;
                }
                break;


@@ -1668,16 +1689,16 @@ 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;
                        }
                } else {
                                if (!(dp = parse_wcc_data(ndo, dp, ndo->ndo_vflag)))
                                        break;
                                return;
                        }
                } else {

-                       if (parsestatus(ndo, dp, &er) != 0)
+                       if (parsestatus(ndo, dp, &er) != NULL)

                                return;
                }
                break;
                                return;
                }
                break;


@@ -1730,5 +1751,5 @@ interp_reply(netdissect_options *ndo,
        }
 trunc:
        if (!nfserr)
        }
 trunc:
        if (!nfserr)

-               ND_PRINT((ndo, "%s", tstr));
+               ND_PRINT("%s", tstr);

 }
 }