Fix a bunch of de-constifications.

[tcpdump] / print-nfs.c

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

-#define NETDISSECT_REWORKED

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


@@ -45,17 +44,17 @@
 
 static const char tstr[] = " [|nfs]";
 
 
 static const char tstr[] = " [|nfs]";
 

-static void nfs_printfh(netdissect_options *, const u_int32_t *, const u_int);
+static void nfs_printfh(netdissect_options *, const uint32_t *, const u_int);

 static int xid_map_enter(netdissect_options *, const struct sunrpc_msg *, const u_char *);
 static int xid_map_find(const struct sunrpc_msg *, const u_char *,
 static int xid_map_enter(netdissect_options *, const struct sunrpc_msg *, const u_char *);
 static int xid_map_find(const struct sunrpc_msg *, const u_char *,

-                           u_int32_t *, u_int32_t *);
-static void interp_reply(netdissect_options *, const struct sunrpc_msg *, u_int32_t, u_int32_t, int);
-static const u_int32_t *parse_post_op_attr(netdissect_options *, const u_int32_t *, int);
+                           uint32_t *, uint32_t *);
+static void interp_reply(netdissect_options *, const struct sunrpc_msg *, uint32_t, uint32_t, int);
+static const uint32_t *parse_post_op_attr(netdissect_options *, const uint32_t *, int);

 
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */
 
 /*
  * Mapping of old NFS Version 2 RPC numbers to generic numbers.
  */

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

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


@@ -203,9 +202,9 @@ 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;
+       const struct ip *ip;

 #ifdef INET6
 #ifdef INET6

-       struct ip6_hdr *ip6;
+       const struct ip6_hdr *ip6;

        char srcaddr[INET6_ADDRSTRLEN], dstaddr[INET6_ADDRSTRLEN];
 #else
 #ifndef INET_ADDRSTRLEN
        char srcaddr[INET6_ADDRSTRLEN], dstaddr[INET6_ADDRSTRLEN];
 #else
 #ifndef INET_ADDRSTRLEN


@@ -215,15 +214,15 @@ print_nfsaddr(netdissect_options *ndo,
 #endif
 
        srcaddr[0] = dstaddr[0] = '\0';
 #endif
 
        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;
 #ifdef INET6
        case 6:
                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 = (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),
                strlcpy(srcaddr, ip6addr_string(ndo, &ip6->ip6_src),
                    sizeof(srcaddr));
                strlcpy(dstaddr, ip6addr_string(ndo, &ip6->ip6_dst),


@@ -239,9 +238,9 @@ print_nfsaddr(netdissect_options *ndo,
        ND_PRINT((ndo, "%s.%s > %s.%s: ", srcaddr, s, dstaddr, d));
 }
 
        ND_PRINT((ndo, "%s.%s > %s.%s: ", srcaddr, s, dstaddr, d));
 }
 

-static const u_int32_t *
+static const uint32_t *

 parse_sattr3(netdissect_options *ndo,
 parse_sattr3(netdissect_options *ndo,

-             const u_int32_t *dp, struct nfsv3_sattr *sa3)
+             const uint32_t *dp, struct nfsv3_sattr *sa3)

 {
        ND_TCHECK(dp[0]);
        sa3->sa_modeset = EXTRACT_32BITS(dp);
 {
        ND_TCHECK(dp[0]);
        sa3->sa_modeset = EXTRACT_32BITS(dp);


@@ -365,10 +364,10 @@ nfsreply_print_noaddr(netdissect_options *ndo,
                       register const u_char *bp2)
 {
        register const struct sunrpc_msg *rp;
                       register const u_char *bp2)
 {
        register const struct sunrpc_msg *rp;

-       u_int32_t proc, vers, reply_stat;
+       uint32_t proc, vers, reply_stat;

        enum sunrpc_reject_stat rstat;
        enum sunrpc_reject_stat rstat;

-       u_int32_t rlow;
-       u_int32_t rhigh;
+       uint32_t rlow;
+       uint32_t rhigh;

        enum sunrpc_auth_stat rwhy;
 
        nfserr = 0;             /* assume no error */
        enum sunrpc_auth_stat rwhy;
 
        nfserr = 0;             /* assume no error */


@@ -424,17 +423,17 @@ trunc:
  * Return a pointer to the first file handle in the packet.
  * If the packet was truncated, return 0.
  */
  * Return a pointer to the first file handle in the packet.
  * If the packet was truncated, return 0.
  */

-static const u_int32_t *
+static const uint32_t *

 parsereq(netdissect_options *ndo,
          register const struct sunrpc_msg *rp, register u_int length)
 {
 parsereq(netdissect_options *ndo,
          register const struct sunrpc_msg *rp, register u_int length)
 {

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

        register u_int len;
 
        /*
         * find the start of the req data (if we captured it)
         */
        register u_int len;
 
        /*
         * find the start of the req data (if we captured it)
         */

-       dp = (u_int32_t *)&rp->rm_call.cb_cred;
+       dp = (const uint32_t *)&rp->rm_call.cb_cred;

        ND_TCHECK(dp[1]);
        len = EXTRACT_32BITS(&dp[1]);
        if (len < length) {
        ND_TCHECK(dp[1]);
        len = EXTRACT_32BITS(&dp[1]);
        if (len < length) {


@@ -455,9 +454,9 @@ trunc:
  * Print out an NFS file handle and return a pointer to following word.
  * If packet was truncated, return 0.
  */
  * Print out an NFS file handle and return a pointer to following word.
  * If packet was truncated, return 0.
  */

-static const u_int32_t *
+static const uint32_t *

 parsefh(netdissect_options *ndo,
 parsefh(netdissect_options *ndo,

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

 {
        u_int len;
 
 {
        u_int len;
 


@@ -480,11 +479,11 @@ trunc:
  * Print out a file name and return pointer to 32-bit word past it.
  * If packet was truncated, return 0.
  */
  * Print out a file name and return pointer to 32-bit word past it.
  * If packet was truncated, return 0.
  */

-static const u_int32_t *
+static const uint32_t *

 parsefn(netdissect_options *ndo,
 parsefn(netdissect_options *ndo,

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

 {
 {

-       register u_int32_t len;
+       register uint32_t len;

        register const u_char *cp;
 
        /* Bail if we don't have the string length */
        register const u_char *cp;
 
        /* Bail if we don't have the string length */


@@ -496,11 +495,11 @@ parsefn(netdissect_options *ndo,
 
        ND_TCHECK2(*dp, ((len + 3) & ~3));
 
 
        ND_TCHECK2(*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);
        ND_PRINT((ndo, "\""));
        /* Update 32-bit pointer (NFS filenames padded to 32-bit boundaries) */
        dp += ((len + 3) & ~3) / sizeof(*dp);
        ND_PRINT((ndo, "\""));

-       if (fn_printn(cp, len, ndo->ndo_snapend)) {
+       if (fn_printn(ndo, cp, len, ndo->ndo_snapend)) {

                ND_PRINT((ndo, "\""));
                goto trunc;
        }
                ND_PRINT((ndo, "\""));
                goto trunc;
        }


@@ -516,9 +515,9 @@ trunc:
  * Return pointer to 32-bit word past file name.
  * If packet was truncated (or there was some other error), return 0.
  */
  * Return pointer to 32-bit word past file name.
  * If packet was truncated (or there was some other error), return 0.
  */

-static const u_int32_t *
+static const uint32_t *

 parsefhn(netdissect_options *ndo,
 parsefhn(netdissect_options *ndo,

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

 {
        dp = parsefh(ndo, dp, v3);
        if (dp == NULL)
 {
        dp = parsefh(ndo, dp, v3);
        if (dp == NULL)


@@ -533,11 +532,11 @@ nfsreq_print_noaddr(netdissect_options *ndo,
                     register const u_char *bp2)
 {
        register const struct sunrpc_msg *rp;
                     register const u_char *bp2)
 {
        register const struct sunrpc_msg *rp;

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

        nfs_type type;
        int v3;
        nfs_type type;
        int v3;

-       u_int32_t proc;
-       u_int32_t access_flags;
+       uint32_t proc;
+       uint32_t access_flags;

        struct nfsv3_sattr sa3;
 
        ND_PRINT((ndo, "%d", length));
        struct nfsv3_sattr sa3;
 
        ND_PRINT((ndo, "%d", length));


@@ -795,10 +794,10 @@ trunc:
  */
 static void
 nfs_printfh(netdissect_options *ndo,
  */
 static void
 nfs_printfh(netdissect_options *ndo,

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

 {
        my_fsid fsid;
 {
        my_fsid fsid;

-       u_int32_t ino;
+       uint32_t ino;

        const char *sfsname = NULL;
        char *spacep;
 
        const char *sfsname = NULL;
        char *spacep;
 


@@ -849,7 +848,7 @@ nfs_printfh(netdissect_options *ndo,
  */
 
 struct xid_map_entry {
  */
 
 struct xid_map_entry {

-       u_int32_t       xid;            /* transaction ID (net order) */
+       uint32_t        xid;            /* transaction ID (net order) */

        int ipver;                      /* IP version (4 or 6) */
 #ifdef INET6
        struct in6_addr client;         /* client IP address (net order) */
        int ipver;                      /* IP version (4 or 6) */
 #ifdef INET6
        struct in6_addr client;         /* client IP address (net order) */


@@ -858,8 +857,8 @@ struct xid_map_entry {
        struct in_addr  client;         /* client IP address (net order) */
        struct in_addr  server;         /* server IP address (net order) */
 #endif
        struct in_addr  client;         /* client IP address (net order) */
        struct in_addr  server;         /* server IP address (net order) */
 #endif

-       u_int32_t       proc;           /* call proc number (host order) */
-       u_int32_t       vers;           /* program version (host order) */
+       uint32_t        proc;           /* call proc number (host order) */
+       uint32_t        vers;           /* program version (host order) */

 };
 
 /*
 };
 
 /*


@@ -879,21 +878,21 @@ static int
 xid_map_enter(netdissect_options *ndo,
               const struct sunrpc_msg *rp, const u_char *bp)
 {
 xid_map_enter(netdissect_options *ndo,
               const struct sunrpc_msg *rp, const u_char *bp)
 {

-       struct ip *ip = NULL;
+       const struct ip *ip = NULL;

 #ifdef INET6
 #ifdef INET6

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

 #endif
        struct xid_map_entry *xmep;
 
        if (!ND_TTEST(rp->rm_call.cb_vers))
                return (0);
 #endif
        struct xid_map_entry *xmep;
 
        if (!ND_TTEST(rp->rm_call.cb_vers))
                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;
 #ifdef INET6
        case 6:
                break;
 #ifdef INET6
        case 6:

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

                break;
 #endif
        default:
                break;
 #endif
        default:


@@ -905,7 +904,7 @@ 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));
        if (ip) {
                xmep->ipver = 4;
                UNALIGNED_MEMCPY(&xmep->client, &ip->ip_src, sizeof(ip->ip_src));


@@ -928,15 +927,15 @@ xid_map_enter(netdissect_options *ndo,
  * version in vers return, or returns -1 on failure
  */
 static int
  * version in vers return, or returns -1 on failure
  */
 static int

-xid_map_find(const struct sunrpc_msg *rp, const u_char *bp, u_int32_t *proc,
-            u_int32_t *vers)
+xid_map_find(const struct sunrpc_msg *rp, const u_char *bp, uint32_t *proc,
+            uint32_t *vers)

 {
        int i;
        struct xid_map_entry *xmep;
 {
        int i;
        struct xid_map_entry *xmep;

-       u_int32_t xid = rp->rm_xid;
-       struct ip *ip = (struct ip *)bp;
+       uint32_t xid = rp->rm_xid;
+       const struct ip *ip = (const struct ip *)bp;

 #ifdef INET6
 #ifdef INET6

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

 #endif
        int cmp;
 
 #endif
        int cmp;
 


@@ -994,11 +993,11 @@ xid_map_find(const struct sunrpc_msg *rp, const u_char *bp, u_int32_t *proc,
  * Return a pointer to the beginning of the actual results.
  * If the packet was truncated, return 0.
  */
  * Return a pointer to the beginning of the actual results.
  * If the packet was truncated, return 0.
  */

-static const u_int32_t *
+static const uint32_t *

 parserep(netdissect_options *ndo,
          register const struct sunrpc_msg *rp, register u_int length)
 {
 parserep(netdissect_options *ndo,
          register const struct sunrpc_msg *rp, register u_int length)
 {

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

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


@@ -1006,7 +1005,7 @@ parserep(netdissect_options *ndo,
         * Portability note:
         * Here we find the address of the ar_verf credentials.
         * Originally, this calculation was
         * Portability note:
         * Here we find the address of the ar_verf credentials.
         * Originally, this calculation was

-        *      dp = (u_int32_t *)&rp->rm_reply.rp_acpt.ar_verf
+        *      dp = (uint32_t *)&rp->rm_reply.rp_acpt.ar_verf

         * On the wire, the rp_acpt field starts immediately after
         * the (32 bit) rp_stat field.  However, rp_acpt (which is a
         * "struct accepted_reply") contains a "struct opaque_auth",
         * On the wire, the rp_acpt field starts immediately after
         * the (32 bit) rp_stat field.  However, rp_acpt (which is a
         * "struct accepted_reply") contains a "struct opaque_auth",


@@ -1017,7 +1016,7 @@ parserep(netdissect_options *ndo,
         * representation.  Instead, we skip past the rp_stat field,
         * which is an "enum" and so occupies one 32-bit word.
         */
         * representation.  Instead, we skip past the rp_stat field,
         * which is an "enum" and so occupies one 32-bit word.
         */

-       dp = ((const u_int32_t *)&rp->rm_reply) + 1;
+       dp = ((const uint32_t *)&rp->rm_reply) + 1;

        ND_TCHECK(dp[1]);
        len = EXTRACT_32BITS(&dp[1]);
        if (len >= length)
        ND_TCHECK(dp[1]);
        len = EXTRACT_32BITS(&dp[1]);
        if (len >= length)


@@ -1025,7 +1024,7 @@ parserep(netdissect_options *ndo,
        /*
         * skip past the ar_verf credentials.
         */
        /*
         * skip past the ar_verf credentials.
         */

-       dp += (len + (2*sizeof(u_int32_t) + 3)) / sizeof(u_int32_t);
+       dp += (len + (2*sizeof(uint32_t) + 3)) / sizeof(uint32_t);

        ND_TCHECK2(dp[0], 0);
 
        /*
        ND_TCHECK2(dp[0], 0);
 
        /*


@@ -1039,14 +1038,14 @@ parserep(netdissect_options *ndo,
        }
        /* successful return */
        ND_TCHECK2(*dp, sizeof(astat));
        }
        /* successful return */
        ND_TCHECK2(*dp, sizeof(astat));

-       return ((u_int32_t *) (sizeof(astat) + ((char *)dp)));
+       return ((const uint32_t *) (sizeof(astat) + ((const char *)dp)));

 trunc:
        return (0);
 }
 
 trunc:
        return (0);
 }
 

-static const u_int32_t *
+static const uint32_t *

 parsestatus(netdissect_options *ndo,
 parsestatus(netdissect_options *ndo,

-            const u_int32_t *dp, int *er)
+            const uint32_t *dp, int *er)

 {
        int errnum;
 
 {
        int errnum;
 


@@ -1066,9 +1065,9 @@ trunc:
        return NULL;
 }
 
        return NULL;
 }
 

-static const u_int32_t *
+static const uint32_t *

 parsefattr(netdissect_options *ndo,
 parsefattr(netdissect_options *ndo,

-           const u_int32_t *dp, int verbose, int v3)
+           const uint32_t *dp, int verbose, int v3)

 {
        const struct nfs_fattr *fap;
 
 {
        const struct nfs_fattr *fap;
 


@@ -1084,7 +1083,7 @@ parsefattr(netdissect_options *ndo,
                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((u_int32_t *)&fap->fa3_size)));
+                               EXTRACT_64BITS((const uint32_t *)&fap->fa3_size)));

                } else {
                        ND_TCHECK(fap->fa2_size);
                        ND_PRINT((ndo, " sz %d", EXTRACT_32BITS(&fap->fa2_size)));
                } else {
                        ND_TCHECK(fap->fa2_size);
                        ND_PRINT((ndo, " sz %d", EXTRACT_32BITS(&fap->fa2_size)));


@@ -1099,9 +1098,9 @@ parsefattr(netdissect_options *ndo,
                               EXTRACT_32BITS(&fap->fa3_rdev.specdata1),
                               EXTRACT_32BITS(&fap->fa3_rdev.specdata2)));
                        ND_PRINT((ndo, " fsid %" PRIx64,
                               EXTRACT_32BITS(&fap->fa3_rdev.specdata1),
                               EXTRACT_32BITS(&fap->fa3_rdev.specdata2)));
                        ND_PRINT((ndo, " fsid %" PRIx64,

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

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

-                               EXTRACT_64BITS((u_int32_t *)&fap->fa3_fileid)));
+                               EXTRACT_64BITS((const 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, " a/m/ctime %u.%06u",
                               EXTRACT_32BITS(&fap->fa3_atime.nfsv3_sec),
                               EXTRACT_32BITS(&fap->fa3_atime.nfsv3_nsec)));


@@ -1113,7 +1112,7 @@ parsefattr(netdissect_options *ndo,
                               EXTRACT_32BITS(&fap->fa3_ctime.nfsv3_nsec)));
                } else {
                        ND_TCHECK(fap->fa2_ctime);
                               EXTRACT_32BITS(&fap->fa3_ctime.nfsv3_nsec)));
                } else {
                        ND_TCHECK(fap->fa2_ctime);

-                       ND_PRINT((ndo, " nlink %d rdev %x fsid %x nodeid %x a/m/ctime",
+                       ND_PRINT((ndo, " nlink %d rdev 0x%x fsid 0x%x nodeid 0x%x a/m/ctime",

                               EXTRACT_32BITS(&fap->fa_nlink),
                               EXTRACT_32BITS(&fap->fa2_rdev),
                               EXTRACT_32BITS(&fap->fa2_fsid),
                               EXTRACT_32BITS(&fap->fa_nlink),
                               EXTRACT_32BITS(&fap->fa2_rdev),
                               EXTRACT_32BITS(&fap->fa2_fsid),


@@ -1129,7 +1128,7 @@ parsefattr(netdissect_options *ndo,
                               EXTRACT_32BITS(&fap->fa2_ctime.nfsv2_usec)));
                }
        }
                               EXTRACT_32BITS(&fap->fa2_ctime.nfsv2_usec)));
                }
        }

-       return ((const u_int32_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);


@@ -1137,7 +1136,7 @@ trunc:
 
 static int
 parseattrstat(netdissect_options *ndo,
 
 static int
 parseattrstat(netdissect_options *ndo,

-              const u_int32_t *dp, int verbose, int v3)
+              const uint32_t *dp, int verbose, int v3)

 {
        int er;
 
 {
        int er;
 


@@ -1152,7 +1151,7 @@ parseattrstat(netdissect_options *ndo,
 
 static int
 parsediropres(netdissect_options *ndo,
 
 static int
 parsediropres(netdissect_options *ndo,

-              const u_int32_t *dp)
+              const uint32_t *dp)

 {
        int er;
 
 {
        int er;
 


@@ -1170,7 +1169,7 @@ parsediropres(netdissect_options *ndo,
 
 static int
 parselinkres(netdissect_options *ndo,
 
 static int
 parselinkres(netdissect_options *ndo,

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

 {
        int er;
 
 {
        int er;
 


@@ -1187,7 +1186,7 @@ parselinkres(netdissect_options *ndo,
 
 static int
 parsestatfs(netdissect_options *ndo,
 
 static int
 parsestatfs(netdissect_options *ndo,

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

 {
        const struct nfs_statfs *sfsp;
        int er;
 {
        const struct nfs_statfs *sfsp;
        int er;


@@ -1214,14 +1213,14 @@ 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((u_int32_t *)&sfsp->sf_tbytes),
-                       EXTRACT_64BITS((u_int32_t *)&sfsp->sf_fbytes),
-                       EXTRACT_64BITS((u_int32_t *)&sfsp->sf_abytes)));
+                       EXTRACT_64BITS((const uint32_t *)&sfsp->sf_tbytes),
+                       EXTRACT_64BITS((const uint32_t *)&sfsp->sf_fbytes),
+                       EXTRACT_64BITS((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((u_int32_t *)&sfsp->sf_tfiles),
-                              EXTRACT_64BITS((u_int32_t *)&sfsp->sf_ffiles),
-                              EXTRACT_64BITS((u_int32_t *)&sfsp->sf_afiles),
+                              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)));
                }
        } else {
                               EXTRACT_32BITS(&sfsp->sf_invarsec)));
                }
        } else {


@@ -1240,7 +1239,7 @@ trunc:
 
 static int
 parserddires(netdissect_options *ndo,
 
 static int
 parserddires(netdissect_options *ndo,

-             const u_int32_t *dp)
+             const uint32_t *dp)

 {
        int er;
 
 {
        int er;
 


@@ -1253,7 +1252,7 @@ parserddires(netdissect_options *ndo,
                return (1);
 
        ND_TCHECK(dp[2]);
                return (1);
 
        ND_TCHECK(dp[2]);

-       ND_PRINT((ndo, " offset %x size %d ",
+       ND_PRINT((ndo, " offset 0x%x size %d ",

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


@@ -1263,9 +1262,9 @@ trunc:
        return (0);
 }
 
        return (0);
 }
 

-static const u_int32_t *
+static const uint32_t *

 parse_wcc_attr(netdissect_options *ndo,
 parse_wcc_attr(netdissect_options *ndo,

-               const u_int32_t *dp)
+               const uint32_t *dp)

 {
        ND_PRINT((ndo, " sz %" PRIu64, EXTRACT_64BITS(&dp[0])));
        ND_PRINT((ndo, " mtime %u.%06u ctime %u.%06u",
 {
        ND_PRINT((ndo, " sz %" PRIu64, EXTRACT_64BITS(&dp[0])));
        ND_PRINT((ndo, " mtime %u.%06u ctime %u.%06u",


@@ -1277,9 +1276,9 @@ parse_wcc_attr(netdissect_options *ndo,
 /*
  * Pre operation attributes. Print only if vflag > 1.
  */
 /*
  * Pre operation attributes. Print only if vflag > 1.
  */

-static const u_int32_t *
+static const uint32_t *

 parse_pre_op_attr(netdissect_options *ndo,
 parse_pre_op_attr(netdissect_options *ndo,

-                  const u_int32_t *dp, int verbose)
+                  const uint32_t *dp, int verbose)

 {
        ND_TCHECK(dp[0]);
        if (!EXTRACT_32BITS(&dp[0]))
 {
        ND_TCHECK(dp[0]);
        if (!EXTRACT_32BITS(&dp[0]))


@@ -1299,9 +1298,9 @@ trunc:
 /*
  * Post operation attributes are printed if vflag >= 1
  */
 /*
  * Post operation attributes are printed if vflag >= 1
  */

-static const u_int32_t *
+static const uint32_t *

 parse_post_op_attr(netdissect_options *ndo,
 parse_post_op_attr(netdissect_options *ndo,

-                   const u_int32_t *dp, int verbose)
+                   const uint32_t *dp, int verbose)

 {
        ND_TCHECK(dp[0]);
        if (!EXTRACT_32BITS(&dp[0]))
 {
        ND_TCHECK(dp[0]);
        if (!EXTRACT_32BITS(&dp[0]))


@@ -1310,14 +1309,14 @@ parse_post_op_attr(netdissect_options *ndo,
        if (verbose) {
                return parsefattr(ndo, dp, verbose, 1);
        } else
        if (verbose) {
                return parsefattr(ndo, dp, verbose, 1);
        } else

-               return (dp + (NFSX_V3FATTR / sizeof (u_int32_t)));
+               return (dp + (NFSX_V3FATTR / sizeof (uint32_t)));

 trunc:
        return (NULL);
 }
 
 trunc:
        return (NULL);
 }
 

-static const u_int32_t *
+static const uint32_t *

 parse_wcc_data(netdissect_options *ndo,
 parse_wcc_data(netdissect_options *ndo,

-               const u_int32_t *dp, int verbose)
+               const uint32_t *dp, int verbose)

 {
        if (verbose > 1)
                ND_PRINT((ndo, " PRE:"));
 {
        if (verbose > 1)
                ND_PRINT((ndo, " PRE:"));


@@ -1329,9 +1328,9 @@ parse_wcc_data(netdissect_options *ndo,
        return parse_post_op_attr(ndo, dp, verbose);
 }
 
        return parse_post_op_attr(ndo, dp, verbose);
 }
 

-static const u_int32_t *
+static const uint32_t *

 parsecreateopres(netdissect_options *ndo,
 parsecreateopres(netdissect_options *ndo,

-                 const u_int32_t *dp, int verbose)
+                 const uint32_t *dp, int verbose)

 {
        int er;
 
 {
        int er;
 


@@ -1362,7 +1361,7 @@ trunc:
 
 static int
 parsewccres(netdissect_options *ndo,
 
 static int
 parsewccres(netdissect_options *ndo,

-            const u_int32_t *dp, int verbose)
+            const uint32_t *dp, int verbose)

 {
        int er;
 
 {
        int er;
 


@@ -1371,9 +1370,9 @@ parsewccres(netdissect_options *ndo,
        return parse_wcc_data(ndo, dp, verbose) != 0;
 }
 
        return parse_wcc_data(ndo, dp, verbose) != 0;
 }
 

-static const u_int32_t *
+static const uint32_t *

 parsev3rddirres(netdissect_options *ndo,
 parsev3rddirres(netdissect_options *ndo,

-                const u_int32_t *dp, int verbose)
+                const uint32_t *dp, int verbose)

 {
        int er;
 
 {
        int er;
 


@@ -1397,9 +1396,9 @@ trunc:
 
 static int
 parsefsinfo(netdissect_options *ndo,
 
 static int
 parsefsinfo(netdissect_options *ndo,

-            const u_int32_t *dp)
+            const uint32_t *dp)

 {
 {

-       struct nfsv3_fsinfo *sfp;
+       const struct nfsv3_fsinfo *sfp;

        int er;
 
        if (!(dp = parsestatus(ndo, dp, &er)))
        int er;
 
        if (!(dp = parsestatus(ndo, dp, &er)))


@@ -1411,7 +1410,7 @@ parsefsinfo(netdissect_options *ndo,
        if (er)
                return (1);
 
        if (er)
                return (1);
 

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


@@ -1423,7 +1422,7 @@ parsefsinfo(netdissect_options *ndo,
                ND_PRINT((ndo, " rtmult %u wtmult %u maxfsz %" PRIu64,
                       EXTRACT_32BITS(&sfp->fs_rtmult),
                       EXTRACT_32BITS(&sfp->fs_wtmult),
                ND_PRINT((ndo, " rtmult %u wtmult %u maxfsz %" PRIu64,
                       EXTRACT_32BITS(&sfp->fs_rtmult),
                       EXTRACT_32BITS(&sfp->fs_wtmult),

-                      EXTRACT_64BITS((u_int32_t *)&sfp->fs_maxfilesize)));
+                      EXTRACT_64BITS((const 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((ndo, " delta %u.%06u ",
                       EXTRACT_32BITS(&sfp->fs_timedelta.nfsv3_sec),
                       EXTRACT_32BITS(&sfp->fs_timedelta.nfsv3_nsec)));


@@ -1435,10 +1434,10 @@ trunc:
 
 static int
 parsepathconf(netdissect_options *ndo,
 
 static int
 parsepathconf(netdissect_options *ndo,

-              const u_int32_t *dp)
+              const uint32_t *dp)

 {
        int er;
 {
        int er;

-       struct nfsv3_pathconf *spp;
+       const struct nfsv3_pathconf *spp;

 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);
 
        if (!(dp = parsestatus(ndo, dp, &er)))
                return (0);


@@ -1449,7 +1448,7 @@ parsepathconf(netdissect_options *ndo,
        if (er)
                return (1);
 
        if (er)
                return (1);
 

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

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


@@ -1466,9 +1465,9 @@ trunc:
 
 static void
 interp_reply(netdissect_options *ndo,
 
 static void
 interp_reply(netdissect_options *ndo,

-             const struct sunrpc_msg *rp, u_int32_t proc, u_int32_t vers, int length)
+             const struct sunrpc_msg *rp, uint32_t proc, uint32_t vers, int length)

 {
 {

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

        register int v3;
        int er;
 
        register int v3;
        int er;