More nd_ification of structures.

[tcpdump] / print-nfs.c

diff --git a/print-nfs.c b/print-nfs.c
index 50334d10e5ea78ab0778f0ecaf8ebac64b215d13..a4823842a7be7e365684eba865bfbf68b61ceda0 100644 (file)
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -19,16 +19,18 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

+/* \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"
 


@@ -36,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"
 


@@ -54,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,15 +203,8 @@ print_nfsaddr(netdissect_options *ndo,
               const u_char *bp, const char *s, const char *d)
 {
        const struct ip *ip;
               const u_char *bp, const char *s, const char *d)
 {
        const struct ip *ip;

-#ifdef INET6

        const struct ip6_hdr *ip6;
        char srcaddr[INET6_ADDRSTRLEN], dstaddr[INET6_ADDRSTRLEN];
        const struct ip6_hdr *ip6;
        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';
        switch (IP_V((const struct ip *)bp)) {
 
        srcaddr[0] = dstaddr[0] = '\0';
        switch (IP_V((const struct ip *)bp)) {


@@ -220,7 +213,6 @@ print_nfsaddr(netdissect_options *ndo,
                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:
                ip6 = (const struct ip6_hdr *)bp;
                strlcpy(srcaddr, ip6addr_string(ndo, &ip6->ip6_src),
        case 6:
                ip6 = (const struct ip6_hdr *)bp;
                strlcpy(srcaddr, ip6addr_string(ndo, &ip6->ip6_src),


@@ -228,7 +220,6 @@ print_nfsaddr(netdissect_options *ndo,
                strlcpy(dstaddr, ip6addr_string(ndo, &ip6->ip6_dst),
                    sizeof(dstaddr));
                break;
                strlcpy(dstaddr, ip6addr_string(ndo, &ip6->ip6_dst),
                    sizeof(dstaddr));
                break;

-#endif

        default:
                strlcpy(srcaddr, "?", sizeof(srcaddr));
                strlcpy(dstaddr, "?", sizeof(dstaddr));
        default:
                strlcpy(srcaddr, "?", sizeof(srcaddr));
                strlcpy(dstaddr, "?", sizeof(dstaddr));


@@ -243,60 +234,60 @@ parse_sattr3(netdissect_options *ndo,
              const uint32_t *dp, struct nfsv3_sattr *sa3)
 {
        ND_TCHECK(dp[0]);
              const uint32_t *dp, struct nfsv3_sattr *sa3)
 {
        ND_TCHECK(dp[0]);

-       sa3->sa_modeset = EXTRACT_32BITS(dp);
+       sa3->sa_modeset = EXTRACT_BE_U_4(dp);

        dp++;
        if (sa3->sa_modeset) {
                ND_TCHECK(dp[0]);
        dp++;
        if (sa3->sa_modeset) {
                ND_TCHECK(dp[0]);

-               sa3->sa_mode = EXTRACT_32BITS(dp);
+               sa3->sa_mode = EXTRACT_BE_U_4(dp);

                dp++;
        }
 
        ND_TCHECK(dp[0]);
                dp++;
        }
 
        ND_TCHECK(dp[0]);

-       sa3->sa_uidset = EXTRACT_32BITS(dp);
+       sa3->sa_uidset = EXTRACT_BE_U_4(dp);

        dp++;
        if (sa3->sa_uidset) {
                ND_TCHECK(dp[0]);
        dp++;
        if (sa3->sa_uidset) {
                ND_TCHECK(dp[0]);

-               sa3->sa_uid = EXTRACT_32BITS(dp);
+               sa3->sa_uid = EXTRACT_BE_U_4(dp);

                dp++;
        }
 
        ND_TCHECK(dp[0]);
                dp++;
        }
 
        ND_TCHECK(dp[0]);

-       sa3->sa_gidset = EXTRACT_32BITS(dp);
+       sa3->sa_gidset = EXTRACT_BE_U_4(dp);

        dp++;
        if (sa3->sa_gidset) {
                ND_TCHECK(dp[0]);
        dp++;
        if (sa3->sa_gidset) {
                ND_TCHECK(dp[0]);

-               sa3->sa_gid = EXTRACT_32BITS(dp);
+               sa3->sa_gid = EXTRACT_BE_U_4(dp);

                dp++;
        }
 
        ND_TCHECK(dp[0]);
                dp++;
        }
 
        ND_TCHECK(dp[0]);

-       sa3->sa_sizeset = EXTRACT_32BITS(dp);
+       sa3->sa_sizeset = EXTRACT_BE_U_4(dp);

        dp++;
        if (sa3->sa_sizeset) {
                ND_TCHECK(dp[0]);
        dp++;
        if (sa3->sa_sizeset) {
                ND_TCHECK(dp[0]);

-               sa3->sa_size = EXTRACT_32BITS(dp);
+               sa3->sa_size = EXTRACT_BE_U_4(dp);

                dp++;
        }
 
        ND_TCHECK(dp[0]);
                dp++;
        }
 
        ND_TCHECK(dp[0]);

-       sa3->sa_atimetype = EXTRACT_32BITS(dp);
+       sa3->sa_atimetype = EXTRACT_BE_U_4(dp);

        dp++;
        if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT) {
                ND_TCHECK(dp[1]);
        dp++;
        if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT) {
                ND_TCHECK(dp[1]);

-               sa3->sa_atime.nfsv3_sec = EXTRACT_32BITS(dp);
+               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++;
        }
 
        ND_TCHECK(dp[0]);
                dp++;
        }
 
        ND_TCHECK(dp[0]);

-       sa3->sa_mtimetype = EXTRACT_32BITS(dp);
+       sa3->sa_mtimetype = EXTRACT_BE_U_4(dp);

        dp++;
        if (sa3->sa_mtimetype == NFSV3SATTRTIME_TOCLIENT) {
                ND_TCHECK(dp[1]);
        dp++;
        if (sa3->sa_mtimetype == NFSV3SATTRTIME_TOCLIENT) {
                ND_TCHECK(dp[1]);

-               sa3->sa_mtime.nfsv3_sec = EXTRACT_32BITS(dp);
+               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++;
        }
 


@@ -342,15 +333,15 @@ 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:
        return;
 
 trunc:


@@ -359,7 +350,7 @@ trunc:
 }
 
 void
 }
 
 void

-nfsreply_print_noaddr(netdissect_options *ndo,
+nfsreply_noaddr_print(netdissect_options *ndo,

                       register const u_char *bp, u_int length,
                       register const u_char *bp2)
 {
                       register const u_char *bp, u_int length,
                       register const u_char *bp2)
 {


@@ -374,7 +365,7 @@ 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:


@@ -386,19 +377,19 @@ nfsreply_print_noaddr(netdissect_options *ndo,
        case SUNRPC_MSG_DENIED:
                ND_PRINT((ndo, "reply ERR %u: ", length));
                ND_TCHECK(rp->rm_reply.rp_reject.rj_stat);
        case SUNRPC_MSG_DENIED:
                ND_PRINT((ndo, "reply ERR %u: ", length));
                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);
+                       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));
                        break;
 
                case SUNRPC_AUTH_ERROR:
                        ND_TCHECK(rp->rm_reply.rp_reject.rj_why);
                        ND_PRINT((ndo, "RPC Version mismatch (%u-%u)", rlow, rhigh));
                        break;
 
                case SUNRPC_AUTH_ERROR:
                        ND_TCHECK(rp->rm_reply.rp_reject.rj_why);

-                       rwhy = EXTRACT_32BITS(&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)));
                        break;
 
                        ND_PRINT((ndo, "Auth %s", tok2str(sunrpc_auth_str, "Invalid failure code %u", rwhy)));
                        break;
 


@@ -435,11 +426,11 @@ parsereq(netdissect_options *ndo,
         */
        dp = (const uint32_t *)&rp->rm_call.cb_cred;
        ND_TCHECK(dp[1]);
         */
        dp = (const uint32_t *)&rp->rm_call.cb_cred;
        ND_TCHECK(dp[1]);

-       len = EXTRACT_32BITS(&dp[1]);
+       len = EXTRACT_BE_U_4(dp + 1);

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

-               len = EXTRACT_32BITS(&dp[1]);
+               len = EXTRACT_BE_U_4(dp + 1);

                if (len < length) {
                        dp += (len + (2 * sizeof(*dp) + 3)) / sizeof(*dp);
                        ND_TCHECK2(dp[0], 0);
                if (len < length) {
                        dp += (len + (2 * sizeof(*dp) + 3)) / sizeof(*dp);
                        ND_TCHECK2(dp[0], 0);


@@ -462,7 +453,7 @@ parsefh(netdissect_options *ndo,
 
        if (v3) {
                ND_TCHECK(dp[0]);
 
        if (v3) {
                ND_TCHECK(dp[0]);

-               len = EXTRACT_32BITS(dp) / 4;
+               len = EXTRACT_BE_U_4(dp) / 4;

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


@@ -527,7 +518,7 @@ parsefhn(netdissect_options *ndo,
 }
 
 void
 }
 
 void

-nfsreq_print_noaddr(netdissect_options *ndo,
+nfsreq_noaddr_print(netdissect_options *ndo,

                     register const u_char *bp, u_int length,
                     register const u_char *bp2)
 {
                     register const u_char *bp, u_int length,
                     register const u_char *bp2)
 {


@@ -546,8 +537,8 @@ nfsreq_print_noaddr(netdissect_options *ndo,
        if (!xid_map_enter(ndo, rp, bp2))       /* record proc number for later on */
                goto trunc;
 
        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];


@@ -580,7 +571,7 @@ nfsreq_print_noaddr(netdissect_options *ndo,
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
                        ND_TCHECK(dp[0]);
                if ((dp = parsereq(ndo, rp, length)) != NULL &&
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
                        ND_TCHECK(dp[0]);

-                       access_flags = EXTRACT_32BITS(&dp[0]);
+                       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));
                        if (access_flags & ~NFSV3ACCESS_FULL) {
                                /* NFSV3ACCESS definitions aren't up to date */
                                ND_PRINT((ndo, " %04x", access_flags));


@@ -621,13 +612,13 @@ nfsreq_print_noaddr(netdissect_options *ndo,
                        if (v3) {
                                ND_TCHECK(dp[2]);
                                ND_PRINT((ndo, " %u bytes @ %" PRIu64,
                        if (v3) {
                                ND_TCHECK(dp[2]);
                                ND_PRINT((ndo, " %u bytes @ %" PRIu64,

-                                      EXTRACT_32BITS(&dp[2]),
-                                      EXTRACT_64BITS(&dp[0])));
+                                      EXTRACT_BE_U_4(dp + 2),
+                                      EXTRACT_BE_U_8(dp)));

                        } else {
                                ND_TCHECK(dp[1]);
                                ND_PRINT((ndo, " %u bytes @ %u",
                        } else {
                                ND_TCHECK(dp[1]);
                                ND_PRINT((ndo, " %u bytes @ %u",

-                                   EXTRACT_32BITS(&dp[1]),
-                                   EXTRACT_32BITS(&dp[0])));
+                                   EXTRACT_BE_U_4(dp + 1),
+                                   EXTRACT_BE_U_4(dp)));

                        }
                        return;
                }
                        }
                        return;
                }


@@ -637,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_TCHECK(dp[4]);

                                ND_PRINT((ndo, " %u (%u) bytes @ %" PRIu64,
                                ND_PRINT((ndo, " %u (%u) bytes @ %" PRIu64,

-                                               EXTRACT_32BITS(&dp[4]),
-                                               EXTRACT_32BITS(&dp[2]),
-                                               EXTRACT_64BITS(&dp[0])));
+                                               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>",
                                                tok2str(nfsv3_writemodes,
                                        ND_PRINT((ndo, " <%s>",
                                                tok2str(nfsv3_writemodes,

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

                                }
                        } else {
                                ND_TCHECK(dp[3]);
                                ND_PRINT((ndo, " %u (%u) bytes @ %u (%u)",
                                }
                        } 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])));
+                                               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) {
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   (dp = parsefhn(ndo, dp, v3)) != NULL) {

                        ND_PRINT((ndo, " ->"));
                        ND_PRINT((ndo, " ->"));

-                       if (v3 && (dp = parse_sattr3(ndo, dp, &sa3)) == 0)
+                       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);


@@ -676,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) {
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   (dp = parsefhn(ndo, dp, v3)) != NULL) {

                        ND_TCHECK(*dp);
                        ND_TCHECK(*dp);

-                       type = (nfs_type)EXTRACT_32BITS(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;
                        ND_PRINT((ndo, " %s", tok2str(type2str, "unk-ft %d", type)));
                        if (ndo->ndo_vflag && (type == NFCHR || type == NFBLK)) {
                                ND_TCHECK(dp[1]);
                                ND_PRINT((ndo, " %u/%u",
                                break;
                        ND_PRINT((ndo, " %s", tok2str(type2str, "unk-ft %d", type)));
                        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])));
+                                      EXTRACT_BE_U_4(dp),
+                                      EXTRACT_BE_U_4(dp + 1)));

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


@@ -725,8 +714,8 @@ nfsreq_print_noaddr(netdissect_options *ndo,
                                 * offset cookie here.
                                 */
                                ND_PRINT((ndo, " %u bytes @ %" PRId64,
                                 * offset cookie here.
                                 */
                                ND_PRINT((ndo, " %u bytes @ %" PRId64,

-                                   EXTRACT_32BITS(&dp[4]),
-                                   EXTRACT_64BITS(&dp[0])));
+                                   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]));
                        } else {
                                if (ndo->ndo_vflag)
                                        ND_PRINT((ndo, " verf %08x%08x", dp[2], dp[3]));
                        } else {


@@ -736,8 +725,8 @@ nfsreq_print_noaddr(netdissect_options *ndo,
                                 * common, but offsets > 2^31 aren't.
                                 */
                                ND_PRINT((ndo, " %u bytes @ %d",
                                 * common, but offsets > 2^31 aren't.
                                 */
                                ND_PRINT((ndo, " %u bytes @ %d",

-                                   EXTRACT_32BITS(&dp[1]),
-                                   EXTRACT_32BITS(&dp[0])));
+                                   EXTRACT_BE_U_4(dp + 1),
+                                   EXTRACT_BE_U_4(dp)));

                        }
                        return;
                }
                        }
                        return;
                }


@@ -752,12 +741,12 @@ nfsreq_print_noaddr(netdissect_options *ndo,
                         * cookie here.
                         */
                        ND_PRINT((ndo, " %u bytes @ %" PRId64,
                         * cookie here.
                         */
                        ND_PRINT((ndo, " %u bytes @ %" PRId64,

-                               EXTRACT_32BITS(&dp[4]),
-                               EXTRACT_64BITS(&dp[0])));
+                               EXTRACT_BE_U_4(dp + 4),
+                               EXTRACT_BE_U_8(dp)));

                        if (ndo->ndo_vflag) {
                                ND_TCHECK(dp[5]);
                                ND_PRINT((ndo, " max %u verf %08x%08x",
                        if (ndo->ndo_vflag) {
                                ND_TCHECK(dp[5]);
                                ND_PRINT((ndo, " max %u verf %08x%08x",

-                                      EXTRACT_32BITS(&dp[5]), dp[2], dp[3]));
+                                      EXTRACT_BE_U_4(dp + 5), dp[2], dp[3]));

                        }
                        return;
                }
                        }
                        return;
                }


@@ -768,8 +757,8 @@ nfsreq_print_noaddr(netdissect_options *ndo,
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
                        ND_TCHECK(dp[2]);
                        ND_PRINT((ndo, " %u bytes @ %" PRIu64,
                    (dp = parsefh(ndo, dp, v3)) != NULL) {
                        ND_TCHECK(dp[2]);
                        ND_PRINT((ndo, " %u bytes @ %" PRIu64,

-                               EXTRACT_32BITS(&dp[2]),
-                               EXTRACT_64BITS(&dp[0])));
+                               EXTRACT_BE_U_4(dp + 2),
+                               EXTRACT_BE_U_8(dp)));

                        return;
                }
                break;
                        return;
                }
                break;


@@ -818,11 +807,15 @@ 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)
                /* Remove trailing spaces */
                spacep = strchr(temp, ' ');
                if (spacep)


@@ -850,13 +843,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) */
 };


@@ -869,32 +857,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)
 {
        const struct ip *ip = NULL;
 
 static int
 xid_map_enter(netdissect_options *ndo,
               const struct sunrpc_msg *rp, const u_char *bp)
 {
        const struct ip *ip = NULL;

-#ifdef INET6

        const struct ip6_hdr *ip6 = NULL;
        const struct ip6_hdr *ip6 = NULL;

-#endif

        struct xid_map_entry *xmep;
 
        struct xid_map_entry *xmep;
 

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

                return (0);
        switch (IP_V((const struct ip *)bp)) {
        case 4:
                ip = (const struct ip *)bp;
                break;
                return (0);
        switch (IP_V((const struct ip *)bp)) {
        case 4:
                ip = (const struct ip *)bp;
                break;

-#ifdef INET6

        case 6:
                ip6 = (const struct ip6_hdr *)bp;
                break;
        case 6:
                ip6 = (const struct ip6_hdr *)bp;
                break;

-#endif

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


@@ -910,15 +894,13 @@ xid_map_enter(netdissect_options *ndo,
                UNALIGNED_MEMCPY(&xmep->client, &ip->ip_src, sizeof(ip->ip_src));
                UNALIGNED_MEMCPY(&xmep->server, &ip->ip_dst, sizeof(ip->ip_dst));
        }
                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);
 }
 


@@ -932,13 +914,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;
+       uint32_t xid;

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

-#ifdef INET6

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

-#endif

        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 {


@@ -955,7 +936,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 ||


@@ -964,7 +944,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;


@@ -1018,19 +997,19 @@ parserep(netdissect_options *ndo,
         */
        dp = ((const uint32_t *)&rp->rm_reply) + 1;
        ND_TCHECK(dp[1]);
         */
        dp = ((const uint32_t *)&rp->rm_reply) + 1;
        ND_TCHECK(dp[1]);

-       len = EXTRACT_32BITS(&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(dp[0]);
+       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)));
                nfserr = 1;             /* suppress trunc string */
        if (astat != SUNRPC_SUCCESS) {
                ND_PRINT((ndo, " %s", tok2str(sunrpc_str, "ar_stat %d", astat)));
                nfserr = 1;             /* suppress trunc string */


@@ -1051,7 +1030,7 @@ parsestatus(netdissect_options *ndo,
 
        ND_TCHECK(dp[0]);
 
 
        ND_TCHECK(dp[0]);
 

-       errnum = EXTRACT_32BITS(&dp[0]);
+       errnum = EXTRACT_BE_U_4(dp);

        if (er)
                *er = errnum;
        if (errnum != 0) {
        if (er)
                *er = errnum;
        if (errnum != 0) {


@@ -1076,17 +1055,17 @@ parsefattr(netdissect_options *ndo,
        if (verbose) {
                ND_PRINT((ndo, " %s %o ids %d/%d",
                    tok2str(type2str, "unk-ft %d ",
        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)));
+                   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)));

                if (v3) {
                        ND_TCHECK(fap->fa3_size);
                        ND_PRINT((ndo, " sz %" PRIu64,
                if (v3) {
                        ND_TCHECK(fap->fa3_size);
                        ND_PRINT((ndo, " sz %" PRIu64,

-                               EXTRACT_64BITS((const uint32_t *)&fap->fa3_size)));
+                               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((ndo, " sz %d", EXTRACT_BE_U_4(&fap->fa2_size)));

                }
        }
        /* print lots more stuff */
                }
        }
        /* print lots more stuff */


@@ -1094,38 +1073,38 @@ parsefattr(netdissect_options *ndo,
                if (v3) {
                        ND_TCHECK(fap->fa3_ctime);
                        ND_PRINT((ndo, " nlink %d rdev %d/%d",
                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)));
+                              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,
                        ND_PRINT((ndo, " fsid %" PRIx64,

-                               EXTRACT_64BITS((const uint32_t *)&fap->fa3_fsid)));
+                               EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_fsid)));

                        ND_PRINT((ndo, " fileid %" PRIx64,
                        ND_PRINT((ndo, " fileid %" PRIx64,

-                               EXTRACT_64BITS((const uint32_t *)&fap->fa3_fileid)));
+                               EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_fileid)));

                        ND_PRINT((ndo, " a/m/ctime %u.%06u",
                        ND_PRINT((ndo, " a/m/ctime %u.%06u",

-                              EXTRACT_32BITS(&fap->fa3_atime.nfsv3_sec),
-                              EXTRACT_32BITS(&fap->fa3_atime.nfsv3_nsec)));
+                              EXTRACT_BE_U_4(&fap->fa3_atime.nfsv3_sec),
+                              EXTRACT_BE_U_4(&fap->fa3_atime.nfsv3_nsec)));

                        ND_PRINT((ndo, " %u.%06u",
                        ND_PRINT((ndo, " %u.%06u",

-                              EXTRACT_32BITS(&fap->fa3_mtime.nfsv3_sec),
-                              EXTRACT_32BITS(&fap->fa3_mtime.nfsv3_nsec)));
+                              EXTRACT_BE_U_4(&fap->fa3_mtime.nfsv3_sec),
+                              EXTRACT_BE_U_4(&fap->fa3_mtime.nfsv3_nsec)));

                        ND_PRINT((ndo, " %u.%06u",
                        ND_PRINT((ndo, " %u.%06u",

-                              EXTRACT_32BITS(&fap->fa3_ctime.nfsv3_sec),
-                              EXTRACT_32BITS(&fap->fa3_ctime.nfsv3_nsec)));
+                              EXTRACT_BE_U_4(&fap->fa3_ctime.nfsv3_sec),
+                              EXTRACT_BE_U_4(&fap->fa3_ctime.nfsv3_nsec)));

                } else {
                        ND_TCHECK(fap->fa2_ctime);
                        ND_PRINT((ndo, " nlink %d rdev 0x%x fsid 0x%x nodeid 0x%x a/m/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)));
+                              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",
                        ND_PRINT((ndo, " %u.%06u",

-                              EXTRACT_32BITS(&fap->fa2_atime.nfsv2_sec),
-                              EXTRACT_32BITS(&fap->fa2_atime.nfsv2_usec)));
+                              EXTRACT_BE_U_4(&fap->fa2_atime.nfsv2_sec),
+                              EXTRACT_BE_U_4(&fap->fa2_atime.nfsv2_usec)));

                        ND_PRINT((ndo, " %u.%06u",
                        ND_PRINT((ndo, " %u.%06u",

-                              EXTRACT_32BITS(&fap->fa2_mtime.nfsv2_sec),
-                              EXTRACT_32BITS(&fap->fa2_mtime.nfsv2_usec)));
+                              EXTRACT_BE_U_4(&fap->fa2_mtime.nfsv2_sec),
+                              EXTRACT_BE_U_4(&fap->fa2_mtime.nfsv2_usec)));

                        ND_PRINT((ndo, " %u.%06u",
                        ND_PRINT((ndo, " %u.%06u",

-                              EXTRACT_32BITS(&fap->fa2_ctime.nfsv2_sec),
-                              EXTRACT_32BITS(&fap->fa2_ctime.nfsv2_usec)));
+                              EXTRACT_BE_U_4(&fap->fa2_ctime.nfsv2_sec),
+                              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 +


@@ -1213,23 +1192,23 @@ parsestatfs(netdissect_options *ndo,
 
        if (v3) {
                ND_PRINT((ndo, " tbytes %" PRIu64 " fbytes %" PRIu64 " abytes %" PRIu64,
 
        if (v3) {
                ND_PRINT((ndo, " tbytes %" PRIu64 " fbytes %" PRIu64 " abytes %" PRIu64,

-                       EXTRACT_64BITS((const uint32_t *)&sfsp->sf_tbytes),
-                       EXTRACT_64BITS((const uint32_t *)&sfsp->sf_fbytes),
-                       EXTRACT_64BITS((const uint32_t *)&sfsp->sf_abytes)));
+                       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) {
                        ND_PRINT((ndo, " tfiles %" PRIu64 " ffiles %" PRIu64 " afiles %" PRIu64 " invar %u",
                if (ndo->ndo_vflag) {
                        ND_PRINT((ndo, " tfiles %" PRIu64 " ffiles %" PRIu64 " afiles %" PRIu64 " invar %u",

-                              EXTRACT_64BITS((const uint32_t *)&sfsp->sf_tfiles),
-                              EXTRACT_64BITS((const uint32_t *)&sfsp->sf_ffiles),
-                              EXTRACT_64BITS((const uint32_t *)&sfsp->sf_afiles),
-                              EXTRACT_32BITS(&sfsp->sf_invarsec)));
+                              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 {
                ND_PRINT((ndo, " tsize %d bsize %d blocks %d bfree %d bavail %d",
                }
        } 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)));
+                       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);


@@ -1253,7 +1232,7 @@ parserddires(netdissect_options *ndo,
 
        ND_TCHECK(dp[2]);
        ND_PRINT((ndo, " offset 0x%x size %d ",
 
        ND_TCHECK(dp[2]);
        ND_PRINT((ndo, " offset 0x%x size %d ",

-              EXTRACT_32BITS(&dp[0]), EXTRACT_32BITS(&dp[1])));
+              EXTRACT_BE_U_4(dp), EXTRACT_BE_U_4(dp + 1)));

        if (dp[2] != 0)
                ND_PRINT((ndo, " eof"));
 
        if (dp[2] != 0)
                ND_PRINT((ndo, " eof"));
 


@@ -1266,10 +1245,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])));
+       /* 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((ndo, " mtime %u.%06u ctime %u.%06u",

-              EXTRACT_32BITS(&dp[2]), EXTRACT_32BITS(&dp[3]),
-              EXTRACT_32BITS(&dp[4]), EXTRACT_32BITS(&dp[5])));
+              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,7 +1261,7 @@ parse_pre_op_attr(netdissect_options *ndo,
                   const uint32_t *dp, int verbose)
 {
        ND_TCHECK(dp[0]);
                   const uint32_t *dp, int verbose)
 {
        ND_TCHECK(dp[0]);

-       if (!EXTRACT_32BITS(&dp[0]))
+       if (!EXTRACT_BE_U_4(dp))

                return (dp + 1);
        dp++;
        ND_TCHECK2(*dp, 24);
                return (dp + 1);
        dp++;
        ND_TCHECK2(*dp, 24);


@@ -1303,7 +1283,7 @@ parse_post_op_attr(netdissect_options *ndo,
                    const uint32_t *dp, int verbose)
 {
        ND_TCHECK(dp[0]);
                    const uint32_t *dp, int verbose)
 {
        ND_TCHECK(dp[0]);

-       if (!EXTRACT_32BITS(&dp[0]))
+       if (!EXTRACT_BE_U_4(dp))

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


@@ -1340,7 +1320,7 @@ parsecreateopres(netdissect_options *ndo,
                dp = parse_wcc_data(ndo, dp, verbose);
        else {
                ND_TCHECK(dp[0]);
                dp = parse_wcc_data(ndo, dp, verbose);
        else {
                ND_TCHECK(dp[0]);

-               if (!EXTRACT_32BITS(&dp[0]))
+               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)))


@@ -1367,7 +1347,7 @@ parsewccres(netdissect_options *ndo,
 
        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 *
 }
 
 static const uint32_t *


@@ -1413,19 +1393,19 @@ parsefsinfo(netdissect_options *ndo,
        sfp = (const struct nfsv3_fsinfo *)dp;
        ND_TCHECK(*sfp);
        ND_PRINT((ndo, " rtmax %u rtpref %u wtmax %u wtpref %u dtpref %u",
        sfp = (const 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)));
+              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) {
                ND_PRINT((ndo, " rtmult %u wtmult %u maxfsz %" PRIu64,
        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((const uint32_t *)&sfp->fs_maxfilesize)));
+                      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 ",
                ND_PRINT((ndo, " delta %u.%06u ",

-                      EXTRACT_32BITS(&sfp->fs_timedelta.nfsv3_sec),
-                      EXTRACT_32BITS(&sfp->fs_timedelta.nfsv3_nsec)));
+                      EXTRACT_BE_U_4(&sfp->fs_timedelta.nfsv3_sec),
+                      EXTRACT_BE_U_4(&sfp->fs_timedelta.nfsv3_nsec)));

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


@@ -1452,12 +1432,12 @@ parsepathconf(netdissect_options *ndo,
        ND_TCHECK(*spp);
 
        ND_PRINT((ndo, " linkmax %u namemax %u %s %s %s %s",
        ND_TCHECK(*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" : ""));
+              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);


@@ -1534,8 +1514,10 @@ interp_reply(netdissect_options *ndo,
                        ND_PRINT((ndo, " attr:"));
                if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
                        break;
                        ND_PRINT((ndo, " attr:"));
                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(dp[0]);
+                       ND_PRINT((ndo, " c %04x", EXTRACT_BE_U_4(dp)));
+               }

                return;
 
        case NFSPROC_READLINK:
                return;
 
        case NFSPROC_READLINK:


@@ -1556,8 +1538,8 @@ interp_reply(netdissect_options *ndo,
                                return;
                        if (ndo->ndo_vflag) {
                                ND_TCHECK(dp[1]);
                                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, " %u bytes", EXTRACT_BE_U_4(dp)));
+                               if (EXTRACT_BE_U_4(dp + 1))

                                        ND_PRINT((ndo, " EOF"));
                        }
                        return;
                                        ND_PRINT((ndo, " EOF"));
                        }
                        return;


@@ -1579,12 +1561,12 @@ interp_reply(netdissect_options *ndo,
                                return;
                        if (ndo->ndo_vflag) {
                                ND_TCHECK(dp[0]);
                                return;
                        if (ndo->ndo_vflag) {
                                ND_TCHECK(dp[0]);

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

                                if (ndo->ndo_vflag > 1) {
                                        ND_TCHECK(dp[1]);
                                        ND_PRINT((ndo, " <%s>",
                                                tok2str(nfsv3_writemodes,
                                if (ndo->ndo_vflag > 1) {
                                        ND_TCHECK(dp[1]);
                                        ND_PRINT((ndo, " <%s>",
                                                tok2str(nfsv3_writemodes,

-                                                       NULL, EXTRACT_32BITS(&dp[1]))));
+                                                       NULL, EXTRACT_BE_U_4(dp + 1))));

                                }
                                return;
                        }
                                }
                                return;
                        }


@@ -1599,7 +1581,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)


@@ -1611,10 +1593,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;


@@ -1622,7 +1604,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;
 


@@ -1634,7 +1616,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;


@@ -1655,7 +1637,7 @@ interp_reply(netdissect_options *ndo,
                        }
                        return;
                } else {
                        }
                        return;
                } else {

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

                                return;
                }
                break;
                                return;
                }
                break;


@@ -1676,7 +1658,7 @@ interp_reply(netdissect_options *ndo,
                                return;
                        }
                } else {
                                return;
                        }
                } else {

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

                                return;
                }
                break;
                                return;
                }
                break;