Fix a bunch of de-constifications.

[tcpdump] / print-nfs.c

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

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.70 2000-01-28 00:04:19 fenner Exp $ (LBL)";
-#endif
-

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

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-
-#include <rpc/rpc.h>
+#include <tcpdump-stdinc.h>

 
 

-#include <ctype.h>
-#include <pcap.h>

 #include <stdio.h>
 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"
 #include <stdio.h>
 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"

+#include "extract.h"

 
 #include "nfs.h"
 #include "nfsfh.h"
 
 
 #include "nfs.h"
 #include "nfsfh.h"
 

-static void nfs_printfh(const u_int32_t *, const u_int);
-static void xid_map_enter(const struct rpc_msg *, const struct ip *);
-static int32_t xid_map_find(const struct rpc_msg *, const struct ip *,
-                           u_int32_t *, u_int32_t *);
-static void interp_reply(const struct rpc_msg *, u_int32_t, u_int32_t, int);
-static const u_int32_t *parse_post_op_attr(const u_int32_t *, int);
-static void print_sattr3(const struct nfsv3_sattr *sa3, int verbose);
-static int print_int64(const u_int32_t *dp, int how);
+#include "ip.h"
+#ifdef INET6
+#include "ip6.h"
+#endif
+#include "rpc_auth.h"
+#include "rpc_msg.h"
+
+static const char tstr[] = " [|nfs]";
+
+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 *,
+                           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,


@@ -97,14 +83,90 @@ u_int32_t nfsv3_procid[NFS_NPROCS] = {
        NFSPROC_NOOP
 };
 
        NFSPROC_NOOP
 };
 

-static struct tok nfsv3_writemodes[] = {
+static const struct tok nfsproc_str[] = {
+       { NFSPROC_NOOP,        "nop"         },
+       { NFSPROC_NULL,        "null"        },
+       { NFSPROC_GETATTR,     "getattr"     },
+       { NFSPROC_SETATTR,     "setattr"     },
+       { NFSPROC_LOOKUP,      "lookup"      },
+       { NFSPROC_ACCESS,      "access"      },
+       { NFSPROC_READLINK,    "readlink"    },
+       { NFSPROC_READ,        "read"        },
+       { NFSPROC_WRITE,       "write"       },
+       { NFSPROC_CREATE,      "create"      },
+       { NFSPROC_MKDIR,       "mkdir"       },
+       { NFSPROC_SYMLINK,     "symlink"     },
+       { NFSPROC_MKNOD,       "mknod"       },
+       { NFSPROC_REMOVE,      "remove"      },
+       { NFSPROC_RMDIR,       "rmdir"       },
+       { NFSPROC_RENAME,      "rename"      },
+       { NFSPROC_LINK,        "link"        },
+       { NFSPROC_READDIR,     "readdir"     },
+       { NFSPROC_READDIRPLUS, "readdirplus" },
+       { NFSPROC_FSSTAT,      "fsstat"      },
+       { NFSPROC_FSINFO,      "fsinfo"      },
+       { NFSPROC_PATHCONF,    "pathconf"    },
+       { NFSPROC_COMMIT,      "commit"      },
+       { 0, NULL }
+};
+
+/*
+ * NFS V2 and V3 status values.
+ *
+ * Some of these come from the RFCs for NFS V2 and V3, with the message
+ * strings taken from the FreeBSD C library "errlst.c".
+ *
+ * Others are errors that are not in the RFC but that I suspect some
+ * NFS servers could return; the values are FreeBSD errno values, as
+ * the first NFS server was the SunOS 2.0 one, and until 5.0 SunOS
+ * was primarily BSD-derived.
+ */
+static const struct tok status2str[] = {
+       { 1,     "Operation not permitted" },   /* EPERM */
+       { 2,     "No such file or directory" }, /* ENOENT */
+       { 5,     "Input/output error" },        /* EIO */
+       { 6,     "Device not configured" },     /* ENXIO */
+       { 11,    "Resource deadlock avoided" }, /* EDEADLK */
+       { 12,    "Cannot allocate memory" },    /* ENOMEM */
+       { 13,    "Permission denied" },         /* EACCES */
+       { 17,    "File exists" },               /* EEXIST */
+       { 18,    "Cross-device link" },         /* EXDEV */
+       { 19,    "Operation not supported by device" }, /* ENODEV */
+       { 20,    "Not a directory" },           /* ENOTDIR */
+       { 21,    "Is a directory" },            /* EISDIR */
+       { 22,    "Invalid argument" },          /* EINVAL */
+       { 26,    "Text file busy" },            /* ETXTBSY */
+       { 27,    "File too large" },            /* EFBIG */
+       { 28,    "No space left on device" },   /* ENOSPC */
+       { 30,    "Read-only file system" },     /* EROFS */
+       { 31,    "Too many links" },            /* EMLINK */
+       { 45,    "Operation not supported" },   /* EOPNOTSUPP */
+       { 62,    "Too many levels of symbolic links" }, /* ELOOP */
+       { 63,    "File name too long" },        /* ENAMETOOLONG */
+       { 66,    "Directory not empty" },       /* ENOTEMPTY */
+       { 69,    "Disc quota exceeded" },       /* EDQUOT */
+       { 70,    "Stale NFS file handle" },     /* ESTALE */
+       { 71,    "Too many levels of remote in path" }, /* EREMOTE */
+       { 99,    "Write cache flushed to disk" }, /* NFSERR_WFLUSH (not used) */
+       { 10001, "Illegal NFS file handle" },   /* NFS3ERR_BADHANDLE */
+       { 10002, "Update synchronization mismatch" }, /* NFS3ERR_NOT_SYNC */
+       { 10003, "READDIR/READDIRPLUS cookie is stale" }, /* NFS3ERR_BAD_COOKIE */
+       { 10004, "Operation not supported" },   /* NFS3ERR_NOTSUPP */
+       { 10005, "Buffer or request is too small" }, /* NFS3ERR_TOOSMALL */
+       { 10006, "Unspecified error on server" }, /* NFS3ERR_SERVERFAULT */
+       { 10007, "Object of that type not supported" }, /* NFS3ERR_BADTYPE */
+       { 10008, "Request couldn't be completed in time" }, /* NFS3ERR_JUKEBOX */
+       { 0,     NULL }
+};
+
+static const struct tok nfsv3_writemodes[] = {

        { 0,            "unstable" },
        { 1,            "datasync" },
        { 2,            "filesync" },
        { 0,            NULL }
 };
 
        { 0,            "unstable" },
        { 1,            "datasync" },
        { 2,            "filesync" },
        { 0,            NULL }
 };
 

-static struct tok type2str[] = {
+static const struct tok type2str[] = {

        { NFNON,        "NON" },
        { NFREG,        "REG" },
        { NFDIR,        "DIR" },
        { NFNON,        "NON" },
        { NFREG,        "REG" },
        { NFDIR,        "DIR" },


@@ -115,91 +177,127 @@ static struct tok type2str[] = {
        { 0,            NULL }
 };
 
        { 0,            NULL }
 };
 

-/*
- * Print out a 64-bit integer. This appears to be different on each system,
- * try to make the best of it. The integer stored as 2 consecutive XDR
- * encoded 32-bit integers, to which a pointer is passed.
- *
- * Assume that a system that has INT64_FORMAT defined, has a 64-bit
- * integer datatype and can print it.
- */ 
+static const struct tok sunrpc_auth_str[] = {
+       { SUNRPC_AUTH_OK,           "OK"                                                     },
+       { SUNRPC_AUTH_BADCRED,      "Bogus Credentials (seal broken)"                        },
+       { SUNRPC_AUTH_REJECTEDCRED, "Rejected Credentials (client should begin new session)" },
+       { SUNRPC_AUTH_BADVERF,      "Bogus Verifier (seal broken)"                           },
+       { SUNRPC_AUTH_REJECTEDVERF, "Verifier expired or was replayed"                       },
+       { SUNRPC_AUTH_TOOWEAK,      "Credentials are too weak"                               },
+       { SUNRPC_AUTH_INVALIDRESP,  "Bogus response verifier"                                },
+       { SUNRPC_AUTH_FAILED,       "Unknown failure"                                        },
+       { 0, NULL }
+};

 
 

-#define UNSIGNED 0
-#define SIGNED   1
-#define HEX      2
+static const struct tok sunrpc_str[] = {
+       { SUNRPC_PROG_UNAVAIL,  "PROG_UNAVAIL"  },
+       { SUNRPC_PROG_MISMATCH, "PROG_MISMATCH" },
+       { SUNRPC_PROC_UNAVAIL,  "PROC_UNAVAIL"  },
+       { SUNRPC_GARBAGE_ARGS,  "GARBAGE_ARGS"  },
+       { SUNRPC_SYSTEM_ERR,    "SYSTEM_ERR"    },
+       { 0, NULL }
+};

 
 

-static int print_int64(const u_int32_t *dp, int how)
+static void
+print_nfsaddr(netdissect_options *ndo,
+              const u_char *bp, const char *s, const char *d)

 {
 {

-#ifdef INT64_FORMAT
-       u_int64_t res;
+       const struct ip *ip;
+#ifdef INET6
+       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

 
 

-       res = ((u_int64_t)ntohl(dp[0]) << 32) | (u_int64_t)ntohl(dp[1]);
-       switch (how) {
-       case SIGNED:
-               printf(INT64_FORMAT, res);
-               break;
-       case UNSIGNED:
-               printf(U_INT64_FORMAT, res);
+       srcaddr[0] = dstaddr[0] = '\0';
+       switch (IP_V((const struct ip *)bp)) {
+       case 4:
+               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;
                break;

-       case HEX:
-               printf(HEX_INT64_FORMAT, res);
+#ifdef INET6
+       case 6:
+               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;
                break;

+#endif

        default:
        default:

-               return (0);
-       }
-#else
-       switch (how) {
-       case SIGNED :
-       case UNSIGNED :
-       case HEX :
-           printf ("0x%x%08x", dp[0], dp[1]);
-           break;
-       default :
-           return (0);
+               strlcpy(srcaddr, "?", sizeof(srcaddr));
+               strlcpy(dstaddr, "?", sizeof(dstaddr));
+               break;

        }
        }

-#endif
-       return 1;
+
+       ND_PRINT((ndo, "%s.%s > %s.%s: ", srcaddr, s, dstaddr, d));

 }
 
 }
 

-static const u_int32_t *
-parse_sattr3(const u_int32_t *dp, struct nfsv3_sattr *sa3)
+static const uint32_t *
+parse_sattr3(netdissect_options *ndo,
+             const uint32_t *dp, struct nfsv3_sattr *sa3)

 {
 {

-       TCHECK(dp[0]);
-       if ((sa3->sa_modeset = ntohl(*dp++))) {
-               TCHECK(dp[0]);
-               sa3->sa_mode = ntohl(*dp++);
+       ND_TCHECK(dp[0]);
+       sa3->sa_modeset = EXTRACT_32BITS(dp);
+       dp++;
+       if (sa3->sa_modeset) {
+               ND_TCHECK(dp[0]);
+               sa3->sa_mode = EXTRACT_32BITS(dp);
+               dp++;

        }
 
        }
 

-       TCHECK(dp[0]);
-       if ((sa3->sa_uidset = ntohl(*dp++))) {
-               TCHECK(dp[0]);
-               sa3->sa_uid = ntohl(*dp++);
+       ND_TCHECK(dp[0]);
+       sa3->sa_uidset = EXTRACT_32BITS(dp);
+       dp++;
+       if (sa3->sa_uidset) {
+               ND_TCHECK(dp[0]);
+               sa3->sa_uid = EXTRACT_32BITS(dp);
+               dp++;

        }
 
        }
 

-       TCHECK(dp[0]);
-       if ((sa3->sa_gidset = ntohl(*dp++))) {
-               TCHECK(dp[0]);
-               sa3->sa_gid = ntohl(*dp++);
+       ND_TCHECK(dp[0]);
+       sa3->sa_gidset = EXTRACT_32BITS(dp);
+       dp++;
+       if (sa3->sa_gidset) {
+               ND_TCHECK(dp[0]);
+               sa3->sa_gid = EXTRACT_32BITS(dp);
+               dp++;

        }
 
        }
 

-       TCHECK(dp[0]);
-       if ((sa3->sa_sizeset = ntohl(*dp++))) {
-               TCHECK(dp[0]);
-               sa3->sa_size = ntohl(*dp++);
+       ND_TCHECK(dp[0]);
+       sa3->sa_sizeset = EXTRACT_32BITS(dp);
+       dp++;
+       if (sa3->sa_sizeset) {
+               ND_TCHECK(dp[0]);
+               sa3->sa_size = EXTRACT_32BITS(dp);
+               dp++;

        }
 
        }
 

-       TCHECK(dp[0]);
-       if ((sa3->sa_atimetype = ntohl(*dp++)) == NFSV3SATTRTIME_TOCLIENT) {
-               TCHECK(dp[1]);
-               sa3->sa_atime.nfsv3_sec = ntohl(*dp++);
-               sa3->sa_atime.nfsv3_nsec = ntohl(*dp++);
+       ND_TCHECK(dp[0]);
+       sa3->sa_atimetype = EXTRACT_32BITS(dp);
+       dp++;
+       if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT) {
+               ND_TCHECK(dp[1]);
+               sa3->sa_atime.nfsv3_sec = EXTRACT_32BITS(dp);
+               dp++;
+               sa3->sa_atime.nfsv3_nsec = EXTRACT_32BITS(dp);
+               dp++;

        }
 
        }
 

-       TCHECK(dp[0]);
-       if ((sa3->sa_mtimetype = ntohl(*dp++)) == NFSV3SATTRTIME_TOCLIENT) {
-               TCHECK(dp[1]);
-               sa3->sa_mtime.nfsv3_sec = ntohl(*dp++);
-               sa3->sa_mtime.nfsv3_nsec = ntohl(*dp++);
+       ND_TCHECK(dp[0]);
+       sa3->sa_mtimetype = EXTRACT_32BITS(dp);
+       dp++;
+       if (sa3->sa_mtimetype == NFSV3SATTRTIME_TOCLIENT) {
+               ND_TCHECK(dp[1]);
+               sa3->sa_mtime.nfsv3_sec = EXTRACT_32BITS(dp);
+               dp++;
+               sa3->sa_mtime.nfsv3_nsec = EXTRACT_32BITS(dp);
+               dp++;

        }
 
        return dp;
        }
 
        return dp;


@@ -210,81 +308,141 @@ trunc:
 static int nfserr;             /* true if we error rather than trunc */
 
 static void
 static int nfserr;             /* true if we error rather than trunc */
 
 static void

-print_sattr3(const struct nfsv3_sattr *sa3, int verbose)
+print_sattr3(netdissect_options *ndo,
+             const struct nfsv3_sattr *sa3, int verbose)

 {
        if (sa3->sa_modeset)
 {
        if (sa3->sa_modeset)

-               printf(" mode %o", sa3->sa_mode);
+               ND_PRINT((ndo, " mode %o", sa3->sa_mode));

        if (sa3->sa_uidset)
        if (sa3->sa_uidset)

-               printf(" uid %u", sa3->sa_uid);
+               ND_PRINT((ndo, " uid %u", sa3->sa_uid));

        if (sa3->sa_gidset)
        if (sa3->sa_gidset)

-               printf(" gid %u", sa3->sa_gid);
+               ND_PRINT((ndo, " gid %u", sa3->sa_gid));

        if (verbose > 1) {
                if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT)
        if (verbose > 1) {
                if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT)

-                       printf(" atime %u.%06u", sa3->sa_atime.nfsv3_sec,
-                              sa3->sa_atime.nfsv3_nsec);
+                       ND_PRINT((ndo, " 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)

-                       printf(" mtime %u.%06u", sa3->sa_mtime.nfsv3_sec,
-                              sa3->sa_mtime.nfsv3_nsec);
+                       ND_PRINT((ndo, " mtime %u.%06u", sa3->sa_mtime.nfsv3_sec,
+                              sa3->sa_mtime.nfsv3_nsec));

        }
 }
 
 void
        }
 }
 
 void

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

 {
 {

-       register const struct rpc_msg *rp;
-       register const struct ip *ip;
-       u_int32_t proc, vers;
+       register const struct sunrpc_msg *rp;
+       char srcid[20], dstid[20];      /*fits 32bit*/

 
        nfserr = 0;             /* assume no error */
 
        nfserr = 0;             /* assume no error */

-       rp = (const struct rpc_msg *)bp;
-       ip = (const struct ip *)bp2;
-
-       if (!nflag)
-               (void)printf("%s.nfs > %s.%u: reply %s %d",
-                            ipaddr_string(&ip->ip_src),
-                            ipaddr_string(&ip->ip_dst),
-                            (u_int32_t)ntohl(rp->rm_xid),
-                            ntohl(rp->rm_reply.rp_stat) == MSG_ACCEPTED?
-                                    "ok":"ERR",
-                            length);
-       else
-               (void)printf("%s.%u > %s.%u: reply %s %d",
-                            ipaddr_string(&ip->ip_src),
-                            NFS_PORT,
-                            ipaddr_string(&ip->ip_dst),
-                            (u_int32_t)ntohl(rp->rm_xid),
-                            ntohl(rp->rm_reply.rp_stat) == MSG_ACCEPTED?
-                               "ok":"ERR",
-                            length);
-
-       if (xid_map_find(rp, ip, &proc, &vers) >= 0)
-               interp_reply(rp, proc, vers, length);
+       rp = (const struct sunrpc_msg *)bp;
+
+       ND_TCHECK(rp->rm_xid);
+       if (!ndo->ndo_nflag) {
+               strlcpy(srcid, "nfs", sizeof(srcid));
+               snprintf(dstid, sizeof(dstid), "%u",
+                   EXTRACT_32BITS(&rp->rm_xid));
+       } else {
+               snprintf(srcid, sizeof(srcid), "%u", NFS_PORT);
+               snprintf(dstid, sizeof(dstid), "%u",
+                   EXTRACT_32BITS(&rp->rm_xid));
+       }
+       print_nfsaddr(ndo, bp2, srcid, dstid);
+
+       nfsreply_print_noaddr(ndo, bp, length, bp2);
+       return;
+
+trunc:
+       if (!nfserr)
+               ND_PRINT((ndo, "%s", tstr));
+}
+
+void
+nfsreply_print_noaddr(netdissect_options *ndo,
+                      register const u_char *bp, u_int length,
+                      register const u_char *bp2)
+{
+       register const struct sunrpc_msg *rp;
+       uint32_t proc, vers, reply_stat;
+       enum sunrpc_reject_stat rstat;
+       uint32_t rlow;
+       uint32_t rhigh;
+       enum sunrpc_auth_stat rwhy;
+
+       nfserr = 0;             /* assume no error */
+       rp = (const struct sunrpc_msg *)bp;
+
+       ND_TCHECK(rp->rm_reply.rp_stat);
+       reply_stat = EXTRACT_32BITS(&rp->rm_reply.rp_stat);
+       switch (reply_stat) {
+
+       case SUNRPC_MSG_ACCEPTED:
+               ND_PRINT((ndo, "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:
+               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);
+               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));
+                       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)));
+                       break;
+
+               default:
+                       ND_PRINT((ndo, "Unknown reason for rejecting rpc message %u", (unsigned int)rstat));
+                       break;
+               }
+               break;
+
+       default:
+               ND_PRINT((ndo, "reply Unknown rpc response code=%u %u", reply_stat, length));
+               break;
+       }
+       return;
+
+trunc:
+       if (!nfserr)
+               ND_PRINT((ndo, "%s", tstr));

 }
 
 /*
  * 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 *
-parsereq(register const struct rpc_msg *rp, register u_int length)
+static const uint32_t *
+parsereq(netdissect_options *ndo,
+         register const struct sunrpc_msg *rp, register u_int length)

 {
 {

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

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

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

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

-               TCHECK(dp[1]);
-               len = ntohl(dp[1]);
+               ND_TCHECK(dp[1]);
+               len = EXTRACT_32BITS(&dp[1]);

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

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

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


@@ -296,20 +454,21 @@ 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 *
-parsefh(register const u_int32_t *dp, int v3)
+static const uint32_t *
+parsefh(netdissect_options *ndo,
+        register const uint32_t *dp, int v3)

 {
 {

-       int len;
+       u_int len;

 
        if (v3) {
 
        if (v3) {

-               TCHECK(dp[0]);
-               len = (int)ntohl(*dp) / 4;
+               ND_TCHECK(dp[0]);
+               len = EXTRACT_32BITS(dp) / 4;

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

-       if (TTEST2(*dp, len * sizeof(*dp))) {
-               nfs_printfh(dp, len);
+       if (ND_TTEST2(*dp, len * sizeof(*dp))) {
+               nfs_printfh(ndo, dp, len);

                return (dp + len);
        }
 trunc:
                return (dp + len);
        }
 trunc:


@@ -320,28 +479,31 @@ 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 *
-parsefn(register const u_int32_t *dp)
+static const uint32_t *
+parsefn(netdissect_options *ndo,
+        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 */

-       TCHECK(*dp);
+       ND_TCHECK(*dp);

 
        /* Fetch string length; convert to host order */
        len = *dp++;
        NTOHL(len);
 
 
        /* Fetch string length; convert to host order */
        len = *dp++;
        NTOHL(len);
 

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

-       /* XXX seems like we should be checking the length */
-       putchar('"');
-       (void) fn_printn(cp, len, NULL);
-       putchar('"');
+       ND_PRINT((ndo, "\""));
+       if (fn_printn(ndo, cp, len, ndo->ndo_snapend)) {
+               ND_PRINT((ndo, "\""));
+               goto trunc;
+       }
+       ND_PRINT((ndo, "\""));

 
        return (dp);
 trunc:
 
        return (dp);
 trunc:


@@ -353,309 +515,272 @@ 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 *
-parsefhn(register const u_int32_t *dp, int v3)
+static const uint32_t *
+parsefhn(netdissect_options *ndo,
+         register const uint32_t *dp, int v3)

 {
 {

-       dp = parsefh(dp, v3);
+       dp = parsefh(ndo, dp, v3);

        if (dp == NULL)
                return (NULL);
        if (dp == NULL)
                return (NULL);

-       putchar(' ');
-       return (parsefn(dp));
+       ND_PRINT((ndo, " "));
+       return (parsefn(ndo, dp));

 }
 
 void
 }
 
 void

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

 {
 {

-       register const struct rpc_msg *rp;
-       register const struct ip *ip;
-       register const u_int32_t *dp;
-       nfstype type;
+       register const struct sunrpc_msg *rp;
+       register const uint32_t *dp;
+       nfs_type type;

        int v3;
        int v3;

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

        struct nfsv3_sattr sa3;
 
        struct nfsv3_sattr sa3;
 

+       ND_PRINT((ndo, "%d", length));

        nfserr = 0;             /* assume no error */
        nfserr = 0;             /* assume no error */

-       rp = (const struct rpc_msg *)bp;
-       ip = (const struct ip *)bp2;
-       if (!nflag)
-               (void)printf("%s.%u > %s.nfs: %d",
-                            ipaddr_string(&ip->ip_src),
-                            (u_int32_t)ntohl(rp->rm_xid),
-                            ipaddr_string(&ip->ip_dst),
-                            length);
-       else
-               (void)printf("%s.%u > %s.%u: %d",
-                            ipaddr_string(&ip->ip_src),
-                            (u_int32_t)ntohl(rp->rm_xid),
-                            ipaddr_string(&ip->ip_dst),
-                            NFS_PORT,
-                            length);
+       rp = (const struct sunrpc_msg *)bp;

 
 

-       xid_map_enter(rp, ip);  /* record proc number for later on */
+       if (!xid_map_enter(ndo, rp, bp2))       /* record proc number for later on */
+               goto trunc;

 
 

-       v3 = (ntohl(rp->rm_call.cb_vers) == NFS_VER3);
-       proc = ntohl(rp->rm_call.cb_proc);
+       v3 = (EXTRACT_32BITS(&rp->rm_call.cb_vers) == NFS_VER3);
+       proc = EXTRACT_32BITS(&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)));

        switch (proc) {
        switch (proc) {

-       case NFSPROC_NOOP:
-               printf(" nop");
-               return;
-       case NFSPROC_NULL:
-               printf(" null");
-               return;

 
        case NFSPROC_GETATTR:
 
        case NFSPROC_GETATTR:

-               printf(" getattr");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   parsefh(dp, v3) != NULL)
-                       return;
-               break;
-

        case NFSPROC_SETATTR:
        case NFSPROC_SETATTR:

-               printf(" setattr");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   parsefh(dp, v3) != NULL)
+       case NFSPROC_READLINK:
+       case NFSPROC_FSSTAT:
+       case NFSPROC_FSINFO:
+       case NFSPROC_PATHCONF:
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   parsefh(ndo, dp, v3) != NULL)

                        return;
                break;
 
        case NFSPROC_LOOKUP:
                        return;
                break;
 
        case NFSPROC_LOOKUP:

-               printf(" lookup");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   parsefhn(dp, v3) != NULL)
+       case NFSPROC_CREATE:
+       case NFSPROC_MKDIR:
+       case NFSPROC_REMOVE:
+       case NFSPROC_RMDIR:
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   parsefhn(ndo, dp, v3) != NULL)

                        return;
                break;
 
        case NFSPROC_ACCESS:
                        return;
                break;
 
        case NFSPROC_ACCESS:

-               printf(" access");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   (dp = parsefh(dp, v3)) != NULL) {
-                       TCHECK(dp[0]);
-                       printf(" %04x", ntohl(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]);
+                       if (access_flags & ~NFSV3ACCESS_FULL) {
+                               /* NFSV3ACCESS definitions aren't up to date */
+                               ND_PRINT((ndo, " %04x", access_flags));
+                       } else if ((access_flags & NFSV3ACCESS_FULL) == NFSV3ACCESS_FULL) {
+                               ND_PRINT((ndo, " NFS_ACCESS_FULL"));
+                       } else {
+                               char separator = ' ';
+                               if (access_flags & NFSV3ACCESS_READ) {
+                                       ND_PRINT((ndo, " NFS_ACCESS_READ"));
+                                       separator = '|';
+                               }
+                               if (access_flags & NFSV3ACCESS_LOOKUP) {
+                                       ND_PRINT((ndo, "%cNFS_ACCESS_LOOKUP", separator));
+                                       separator = '|';
+                               }
+                               if (access_flags & NFSV3ACCESS_MODIFY) {
+                                       ND_PRINT((ndo, "%cNFS_ACCESS_MODIFY", separator));
+                                       separator = '|';
+                               }
+                               if (access_flags & NFSV3ACCESS_EXTEND) {
+                                       ND_PRINT((ndo, "%cNFS_ACCESS_EXTEND", separator));
+                                       separator = '|';
+                               }
+                               if (access_flags & NFSV3ACCESS_DELETE) {
+                                       ND_PRINT((ndo, "%cNFS_ACCESS_DELETE", separator));
+                                       separator = '|';
+                               }
+                               if (access_flags & NFSV3ACCESS_EXECUTE)
+                                       ND_PRINT((ndo, "%cNFS_ACCESS_EXECUTE", separator));
+                       }

                        return;
                }
                break;
 
                        return;
                }
                break;
 

-       case NFSPROC_READLINK:
-               printf(" readlink");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   parsefh(dp, v3) != NULL)
-                       return;
-               break;
-

        case NFSPROC_READ:
        case NFSPROC_READ:

-               printf(" read");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   (dp = parsefh(dp, v3)) != NULL) {
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   (dp = parsefh(ndo, dp, v3)) != NULL) {

                        if (v3) {
                        if (v3) {

-                               TCHECK(dp[2]);
-                               printf(" %u bytes @ ",
-                                      (u_int32_t) ntohl(dp[2]));
-                               print_int64(dp, UNSIGNED);
+                               ND_TCHECK(dp[2]);
+                               ND_PRINT((ndo, " %u bytes @ %" PRIu64,
+                                      EXTRACT_32BITS(&dp[2]),
+                                      EXTRACT_64BITS(&dp[0])));

                        } else {
                        } else {

-                               TCHECK(dp[1]);
-                               printf(" %u bytes @ %u",
-                                   (u_int32_t)ntohl(dp[1]),
-                                   (u_int32_t)ntohl(dp[0]));
+                               ND_TCHECK(dp[1]);
+                               ND_PRINT((ndo, " %u bytes @ %u",
+                                   EXTRACT_32BITS(&dp[1]),
+                                   EXTRACT_32BITS(&dp[0])));

                        }
                        return;
                }
                break;
 
        case NFSPROC_WRITE:
                        }
                        return;
                }
                break;
 
        case NFSPROC_WRITE:

-               printf(" write");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   (dp = parsefh(dp, v3)) != NULL) {
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   (dp = parsefh(ndo, dp, v3)) != NULL) {

                        if (v3) {
                        if (v3) {

-                               TCHECK(dp[4]);
-                               printf(" %u bytes @ ",
-                                               (u_int32_t) ntohl(dp[4]));
-                               print_int64(dp, UNSIGNED);
-                               if (vflag) {
+                               ND_TCHECK(dp[2]);
+                               ND_PRINT((ndo, " %u (%u) bytes @ %" PRIu64,
+                                               EXTRACT_32BITS(&dp[4]),
+                                               EXTRACT_32BITS(&dp[2]),
+                                               EXTRACT_64BITS(&dp[0])));
+                               if (ndo->ndo_vflag) {

                                        dp += 3;
                                        dp += 3;

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

                                                tok2str(nfsv3_writemodes,
                                                tok2str(nfsv3_writemodes,

-                                                       NULL, ntohl(*dp)));
+                                                       NULL, EXTRACT_32BITS(dp))));

                                }
                        } else {
                                }
                        } else {

-                               TCHECK(dp[3]);
-                               printf(" %u (%u) bytes @ %u (%u)",
-                                               (u_int32_t)ntohl(dp[3]),
-                                               (u_int32_t)ntohl(dp[2]),
-                                               (u_int32_t)ntohl(dp[1]),
-                                               (u_int32_t)ntohl(dp[0]));
+                               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])));

                        }
                        return;
                }
                break;
 
                        }
                        return;
                }
                break;
 

-       case NFSPROC_CREATE:
-               printf(" create");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   parsefhn(dp, v3) != NULL)
-                       return;
-               break;
-
-       case NFSPROC_MKDIR:
-               printf(" mkdir");
-               if ((dp = parsereq(rp, length)) != 0 && parsefhn(dp, v3) != 0)
-                       return;
-               break;
-

        case NFSPROC_SYMLINK:
        case NFSPROC_SYMLINK:

-               printf(" symlink");
-               if ((dp = parsereq(rp, length)) != 0 &&
-                   (dp = parsefhn(dp, v3)) != 0) {
-                       fputs(" ->", stdout);
-                       if (v3 && (dp = parse_sattr3(dp, &sa3)) == 0)
+               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)

                                break;
                                break;

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

                                break;
                                break;

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

                        return;
                }
                break;
 
        case NFSPROC_MKNOD:
                        return;
                }
                break;
 
        case NFSPROC_MKNOD:

-               printf(" mknod");
-               if ((dp = parsereq(rp, length)) != 0 &&
-                   (dp = parsefhn(dp, v3)) != 0) {
-                       TCHECK(*dp);
-                       type = (nfstype)ntohl(*dp++);
-                       if ((dp = parse_sattr3(dp, &sa3)) == 0)
+               if ((dp = parsereq(ndo, rp, length)) != 0 &&
+                   (dp = parsefhn(ndo, dp, v3)) != 0) {
+                       ND_TCHECK(*dp);
+                       type = (nfs_type)EXTRACT_32BITS(dp);
+                       dp++;
+                       if ((dp = parse_sattr3(ndo, dp, &sa3)) == 0)

                                break;
                                break;

-                       printf(" %s", tok2str(type2str, "unk-ft %d", type));
-                       if (vflag && (type == NFCHR || type == NFBLK)) {
-                               TCHECK(dp[1]);
-                               printf(" %u/%u", ntohl(dp[0]), ntohl(dp[1]));
+                       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])));

                                dp += 2;
                        }
                                dp += 2;
                        }

-                       if (vflag)
-                               print_sattr3(&sa3, vflag);
+                       if (ndo->ndo_vflag)
+                               print_sattr3(ndo, &sa3, ndo->ndo_vflag);

                        return;
                }
                break;
 
                        return;
                }
                break;
 

-       case NFSPROC_REMOVE:
-               printf(" remove");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   parsefhn(dp, v3) != NULL)
-                       return;
-               break;
-
-       case NFSPROC_RMDIR:
-               printf(" rmdir");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   parsefhn(dp, v3) != NULL)
-                       return;
-               break;
-

        case NFSPROC_RENAME:
        case NFSPROC_RENAME:

-               printf(" rename");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   (dp = parsefhn(dp, v3)) != NULL) {
-                       fputs(" ->", stdout);
-                       if (parsefhn(dp, v3) != NULL)
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   (dp = parsefhn(ndo, dp, v3)) != NULL) {
+                       ND_PRINT((ndo, " ->"));
+                       if (parsefhn(ndo, dp, v3) != NULL)

                                return;
                }
                break;
 
        case NFSPROC_LINK:
                                return;
                }
                break;
 
        case NFSPROC_LINK:

-               printf(" link");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   (dp = parsefh(dp, v3)) != NULL) {
-                       fputs(" ->", stdout);
-                       if (parsefhn(dp, v3) != NULL)
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   (dp = parsefh(ndo, dp, v3)) != NULL) {
+                       ND_PRINT((ndo, " ->"));
+                       if (parsefhn(ndo, dp, v3) != NULL)

                                return;
                }
                break;
 
        case NFSPROC_READDIR:
                                return;
                }
                break;
 
        case NFSPROC_READDIR:

-               printf(" readdir");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   (dp = parsefh(dp, v3)) != NULL) {
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   (dp = parsefh(ndo, dp, v3)) != NULL) {

                        if (v3) {
                        if (v3) {

-                               TCHECK(dp[4]);
+                               ND_TCHECK(dp[4]);

                                /*
                                 * We shouldn't really try to interpret the
                                 * offset cookie here.
                                 */
                                /*
                                 * We shouldn't really try to interpret the
                                 * offset cookie here.
                                 */

-                               printf(" %u bytes @ ",
-                                   (u_int32_t) ntohl(dp[4]));
-                               print_int64(dp, SIGNED);
-                               if (vflag)
-                                       printf(" verf %08x%08x", dp[2],
-                                              dp[3]);
+                               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]));

                        } else {
                        } else {

-                               TCHECK(dp[1]);
+                               ND_TCHECK(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.
                                 */

-                               printf(" %u bytes @ %d",
-                                   (u_int32_t)ntohl(dp[1]),
-                                   (u_int32_t)ntohl(dp[0]));
+                               ND_PRINT((ndo, " %u bytes @ %d",
+                                   EXTRACT_32BITS(&dp[1]),
+                                   EXTRACT_32BITS(&dp[0])));

                        }
                        return;
                }
                break;
 
        case NFSPROC_READDIRPLUS:
                        }
                        return;
                }
                break;
 
        case NFSPROC_READDIRPLUS:

-               printf(" readdirplus");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   (dp = parsefh(dp, v3)) != NULL) {
-                       TCHECK(dp[4]);
+               if ((dp = parsereq(ndo, rp, length)) != NULL &&
+                   (dp = parsefh(ndo, dp, v3)) != NULL) {
+                       ND_TCHECK(dp[4]);

                        /*
                         * We don't try to interpret the offset
                         * cookie here.
                         */
                        /*
                         * We don't try to interpret the offset
                         * cookie here.
                         */

-                       printf(" %u bytes @ ", (u_int32_t) ntohl(dp[4]));
-                       print_int64(dp, SIGNED);
-                       if (vflag)
-                               printf(" max %u verf %08x%08x",
-                                      (u_int32_t) ntohl(dp[5]), dp[2], dp[3]);
+                       ND_PRINT((ndo, " %u bytes @ %" PRId64,
+                               EXTRACT_32BITS(&dp[4]),
+                               EXTRACT_64BITS(&dp[0])));
+                       if (ndo->ndo_vflag) {
+                               ND_TCHECK(dp[5]);
+                               ND_PRINT((ndo, " max %u verf %08x%08x",
+                                      EXTRACT_32BITS(&dp[5]), dp[2], dp[3]));
+                       }

                        return;
                }
                break;
 
                        return;
                }
                break;
 

-       case NFSPROC_FSSTAT:
-               printf(" fsstat");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   parsefh(dp, v3) != NULL)
-                       return;
-               break;
-
-       case NFSPROC_FSINFO:
-               printf(" fsinfo");
-               break;
-
-       case NFSPROC_PATHCONF:
-               printf(" pathconf");
-               break;
-

        case NFSPROC_COMMIT:
        case NFSPROC_COMMIT:

-               printf(" commit");
-               if ((dp = parsereq(rp, length)) != NULL &&
-                   (dp = parsefh(dp, v3)) != NULL) {
-                       printf(" %u bytes @ ", (u_int32_t) ntohl(dp[2]));
-                       print_int64(dp, UNSIGNED);
+               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])));

                        return;
                }
                break;
 
        default:
                        return;
                }
                break;
 
        default:

-               printf(" proc-%u", (u_int32_t)ntohl(rp->rm_call.cb_proc));

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

-               fputs(" [|nfs]", stdout);
+               ND_PRINT((ndo, "%s", tstr));

 }
 
 /*
 }
 
 /*


@@ -668,13 +793,28 @@ trunc:
  * additional hacking on the parser code.
  */
 static void
  * additional hacking on the parser code.
  */
 static void

-nfs_printfh(register const u_int32_t *dp, const u_int len)
+nfs_printfh(netdissect_options *ndo,
+            register const uint32_t *dp, const u_int len)

 {
        my_fsid fsid;
 {
        my_fsid fsid;

-       ino_t ino;
-       char *sfsname = NULL;
+       uint32_t ino;
+       const char *sfsname = NULL;
+       char *spacep;
+
+       if (ndo->ndo_uflag) {
+               u_int i;
+               char const *sep = "";
+
+               ND_PRINT((ndo, " fh["));
+               for (i=0; i<len; i++) {
+                       ND_PRINT((ndo, "%s%x", sep, dp[i]));
+                       sep = ":";
+               }
+               ND_PRINT((ndo, "]"));
+               return;
+       }

 
 

-       Parse_fh((caddr_t*)dp, len, &fsid, &ino, NULL, &sfsname, 0);
+       Parse_fh((const u_char *)dp, len, &fsid, &ino, NULL, &sfsname, 0);

 
        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 */


@@ -682,18 +822,23 @@ nfs_printfh(register const u_int32_t *dp, const u_int len)
 
                /* Make sure string is null-terminated */
                strncpy(temp, sfsname, NFSX_V3FHMAX);
 
                /* Make sure string is null-terminated */
                strncpy(temp, sfsname, NFSX_V3FHMAX);

+               temp[sizeof(temp) - 1] = '\0';

                /* Remove trailing spaces */
                /* Remove trailing spaces */

-               sfsname = strchr(temp, ' ');
-               if (sfsname)
-                       *sfsname = 0;
+               spacep = strchr(temp, ' ');
+               if (spacep)
+                       *spacep = '\0';

 
 

-               (void)printf(" fh %s/%ld", temp, (long) ino);
-       }
-       else {
-               (void)printf(" fh %d,%d/%ld",
-                       fsid.Fsid_dev.Major, fsid.Fsid_dev.Minor,
-                       (long) ino);
+               ND_PRINT((ndo, " fh %s/", temp));
+       } else {
+               ND_PRINT((ndo, " fh %d,%d/",
+                            fsid.Fsid_dev.Major, fsid.Fsid_dev.Minor));

        }
        }

+
+       if(fsid.Fsid_dev.Minor == 257)
+               /* Print the undecoded handle */
+               ND_PRINT((ndo, "%s", fsid.Opaque_Handle));
+       else
+               ND_PRINT((ndo, "%ld", (long) ino));

 }
 
 /*
 }
 
 /*


@@ -703,11 +848,17 @@ nfs_printfh(register const u_int32_t *dp, const u_int len)
  */
 
 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) */
+       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) */
        struct in_addr  client;         /* client IP address (net order) */
        struct in_addr  server;         /* server IP address (net order) */

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

 };
 
 /*
 };
 
 /*


@@ -723,21 +874,52 @@ struct xid_map_entry xid_map[XIDMAPSIZE];
 int    xid_map_next = 0;
 int    xid_map_hint = 0;
 
 int    xid_map_next = 0;
 int    xid_map_hint = 0;
 

-static void
-xid_map_enter(const struct rpc_msg *rp, const struct ip *ip)
+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;
+#endif

        struct xid_map_entry *xmep;
 
        struct xid_map_entry *xmep;
 

+       if (!ND_TTEST(rp->rm_call.cb_vers))
+               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;
+#endif
+       default:
+               return (1);
+       }
+

        xmep = &xid_map[xid_map_next];
 
        if (++xid_map_next >= XIDMAPSIZE)
                xid_map_next = 0;
 
        xmep = &xid_map[xid_map_next];
 
        if (++xid_map_next >= XIDMAPSIZE)
                xid_map_next = 0;
 

-       xmep->xid = rp->rm_xid;
-       xmep->client = ip->ip_src;
-       xmep->server = ip->ip_dst;
-       xmep->proc = ntohl(rp->rm_call.cb_proc);
-       xmep->vers = ntohl(rp->rm_call.cb_vers);
+       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));
+       }
+#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));
+       }
+#endif
+       xmep->proc = EXTRACT_32BITS(&rp->rm_call.cb_proc);
+       xmep->vers = EXTRACT_32BITS(&rp->rm_call.cb_vers);
+       return (1);

 }
 
 /*
 }
 
 /*


@@ -745,27 +927,56 @@ xid_map_enter(const struct rpc_msg *rp, const struct ip *ip)
  * 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 rpc_msg *rp, const struct ip *ip, 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;
-       u_int32_t clip = ip->ip_dst.s_addr;
-       u_int32_t sip = ip->ip_src.s_addr;
+       uint32_t xid = rp->rm_xid;
+       const struct ip *ip = (const struct ip *)bp;
+#ifdef INET6
+       const struct ip6_hdr *ip6 = (const struct ip6_hdr *)bp;
+#endif
+       int cmp;

 
        /* Start searching from where we last left off */
        i = xid_map_hint;
        do {
                xmep = &xid_map[i];
 
        /* Start searching from where we last left off */
        i = xid_map_hint;
        do {
                xmep = &xid_map[i];

-               if (xmep->xid == xid && xmep->client.s_addr == clip &&
-                   xmep->server.s_addr == sip) {
+               cmp = 1;
+               if (xmep->ipver != IP_V(ip) || xmep->xid != xid)
+                       goto nextitem;
+               switch (xmep->ipver) {
+               case 4:
+                       if (UNALIGNED_MEMCMP(&ip->ip_src, &xmep->server,
+                                  sizeof(ip->ip_src)) != 0 ||
+                           UNALIGNED_MEMCMP(&ip->ip_dst, &xmep->client,
+                                  sizeof(ip->ip_dst)) != 0) {
+                               cmp = 0;
+                       }
+                       break;
+#ifdef INET6
+               case 6:
+                       if (UNALIGNED_MEMCMP(&ip6->ip6_src, &xmep->server,
+                                  sizeof(ip6->ip6_src)) != 0 ||
+                           UNALIGNED_MEMCMP(&ip6->ip6_dst, &xmep->client,
+                                  sizeof(ip6->ip6_dst)) != 0) {
+                               cmp = 0;
+                       }
+                       break;
+#endif
+               default:
+                       cmp = 0;
+                       break;
+               }
+               if (cmp) {

                        /* match */
                        xid_map_hint = i;
                        *proc = xmep->proc;
                        *vers = xmep->vers;
                        return 0;
                }
                        /* match */
                        xid_map_hint = i;
                        *proc = xmep->proc;
                        *vers = xmep->vers;
                        return 0;
                }

+       nextitem:

                if (++i >= XIDMAPSIZE)
                        i = 0;
        } while (i != xid_map_hint);
                if (++i >= XIDMAPSIZE)
                        i = 0;
        } while (i != xid_map_hint);


@@ -782,18 +993,19 @@ xid_map_find(const struct rpc_msg *rp, const struct ip *ip, 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 *
-parserep(register const struct rpc_msg *rp, register u_int length)
+static const uint32_t *
+parserep(netdissect_options *ndo,
+         register const struct sunrpc_msg *rp, register u_int length)

 {
 {

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

        u_int len;
        u_int len;

-       enum accept_stat astat;
+       enum sunrpc_accept_stat astat;

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


@@ -804,242 +1016,220 @@ parserep(register const struct rpc_msg *rp, register u_int length)
         * 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;
-       TCHECK(dp[1]);
-       len = ntohl(dp[1]);
+       dp = ((const uint32_t *)&rp->rm_reply) + 1;
+       ND_TCHECK(dp[1]);
+       len = EXTRACT_32BITS(&dp[1]);

        if (len >= length)
                return (NULL);
        /*
         * skip past the ar_verf credentials.
         */
        if (len >= length)
                return (NULL);
        /*
         * skip past the ar_verf credentials.
         */

-       dp += (len + (2*sizeof(u_int32_t) + 3)) / sizeof(u_int32_t);
-       TCHECK2(dp[0], 0);
+       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 = ntohl(*(enum accept_stat *)dp);
-       switch (astat) {
-
-       case SUCCESS:
-               break;
-
-       case PROG_UNAVAIL:
-               printf(" PROG_UNAVAIL");
-               nfserr = 1;             /* suppress trunc string */
-               return (NULL);
-
-       case PROG_MISMATCH:
-               printf(" PROG_MISMATCH");
-               nfserr = 1;             /* suppress trunc string */
-               return (NULL);
-
-       case PROC_UNAVAIL:
-               printf(" PROC_UNAVAIL");
-               nfserr = 1;             /* suppress trunc string */
-               return (NULL);
-
-       case GARBAGE_ARGS:
-               printf(" GARBAGE_ARGS");
-               nfserr = 1;             /* suppress trunc string */
-               return (NULL);
-
-       case SYSTEM_ERR:
-               printf(" SYSTEM_ERR");
-               nfserr = 1;             /* suppress trunc string */
-               return (NULL);
-
-       default:
-               printf(" ar_stat %d", astat);
+       astat = (enum sunrpc_accept_stat) EXTRACT_32BITS(dp);
+       if (astat != SUNRPC_SUCCESS) {
+               ND_PRINT((ndo, " %s", tok2str(sunrpc_str, "ar_stat %d", astat)));

                nfserr = 1;             /* suppress trunc string */
                return (NULL);
        }
        /* successful return */
                nfserr = 1;             /* suppress trunc string */
                return (NULL);
        }
        /* successful return */

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

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

-static const u_int32_t *
-parsestatus(const u_int32_t *dp, int *er)
+static const uint32_t *
+parsestatus(netdissect_options *ndo,
+            const uint32_t *dp, int *er)

 {
        int errnum;
 
 {
        int errnum;
 

-       TCHECK(dp[0]);
+       ND_TCHECK(dp[0]);

 
 

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

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

-               if (!qflag)
-                       printf(" ERROR: %s", pcap_strerror(errnum));
+               if (!ndo->ndo_qflag)
+                       ND_PRINT((ndo, " ERROR: %s",
+                           tok2str(status2str, "unk %d", errnum)));

                nfserr = 1;
                nfserr = 1;

-               return (NULL);

        }
        return (dp + 1);
 trunc:
        return NULL;
 }
 
        }
        return (dp + 1);
 trunc:
        return NULL;
 }
 

-static const u_int32_t *
-parsefattr(const u_int32_t *dp, int verbose, int v3)
+static const uint32_t *
+parsefattr(netdissect_options *ndo,
+           const uint32_t *dp, int verbose, int v3)

 {
        const struct nfs_fattr *fap;
 
        fap = (const struct nfs_fattr *)dp;
 {
        const struct nfs_fattr *fap;
 
        fap = (const struct nfs_fattr *)dp;

-       TCHECK(fap->fa_gid);
+       ND_TCHECK(fap->fa_gid);

        if (verbose) {
        if (verbose) {

-               printf(" %s %o ids %d/%d",
+               ND_PRINT((ndo, " %s %o ids %d/%d",

                    tok2str(type2str, "unk-ft %d ",
                    tok2str(type2str, "unk-ft %d ",

-                   (u_int32_t)ntohl(fap->fa_type)),
-                   (u_int32_t)ntohl(fap->fa_mode),
-                   (u_int32_t)ntohl(fap->fa_uid),
-                   (u_int32_t) ntohl(fap->fa_gid));
+                   EXTRACT_32BITS(&fap->fa_type)),
+                   EXTRACT_32BITS(&fap->fa_mode),
+                   EXTRACT_32BITS(&fap->fa_uid),
+                   EXTRACT_32BITS(&fap->fa_gid)));

                if (v3) {
                if (v3) {

-                       TCHECK(fap->fa3_size);
-                       printf(" sz ");
-                       print_int64((u_int32_t *)&fap->fa3_size, UNSIGNED);
-                       putchar(' ');
+                       ND_TCHECK(fap->fa3_size);
+                       ND_PRINT((ndo, " sz %" PRIu64,
+                               EXTRACT_64BITS((const uint32_t *)&fap->fa3_size)));

                } else {
                } else {

-                       TCHECK(fap->fa2_size);
-                       printf(" sz %d ", (u_int32_t) ntohl(fap->fa2_size));
+                       ND_TCHECK(fap->fa2_size);
+                       ND_PRINT((ndo, " sz %d", EXTRACT_32BITS(&fap->fa2_size)));

                }
        }
        /* print lots more stuff */
        if (verbose > 1) {
                if (v3) {
                }
        }
        /* print lots more stuff */
        if (verbose > 1) {
                if (v3) {

-                       TCHECK(fap->fa3_ctime);
-                       printf("nlink %d rdev %d/%d ",
-                              (u_int32_t)ntohl(fap->fa_nlink),
-                              (u_int32_t) ntohl(fap->fa3_rdev.specdata1),
-                              (u_int32_t) ntohl(fap->fa3_rdev.specdata2));
-                       printf("fsid ");
-                       print_int64((u_int32_t *)&fap->fa2_fsid, HEX);
-                       printf(" nodeid ");
-                       print_int64((u_int32_t *)&fap->fa2_fileid, HEX);
-                       printf(" a/m/ctime %u.%06u ",
-                              (u_int32_t) ntohl(fap->fa3_atime.nfsv3_sec),
-                              (u_int32_t) ntohl(fap->fa3_atime.nfsv3_nsec));
-                       printf("%u.%06u ",
-                              (u_int32_t) ntohl(fap->fa3_mtime.nfsv3_sec),
-                              (u_int32_t) ntohl(fap->fa3_mtime.nfsv3_nsec));
-                       printf("%u.%06u ",
-                              (u_int32_t) ntohl(fap->fa3_ctime.nfsv3_sec),
-                              (u_int32_t) ntohl(fap->fa3_ctime.nfsv3_nsec));
+                       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((const uint32_t *)&fap->fa3_fsid)));
+                       ND_PRINT((ndo, " fileid %" PRIx64,
+                               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, " %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)));

                } else {
                } else {

-                       TCHECK(fap->fa2_ctime);
-                       printf("nlink %d rdev %x fsid %x nodeid %x a/m/ctime ",
-                              (u_int32_t) ntohl(fap->fa_nlink),
-                              (u_int32_t) ntohl(fap->fa2_rdev),
-                              (u_int32_t) ntohl(fap->fa2_fsid),
-                              (u_int32_t) ntohl(fap->fa2_fileid));
-                       printf("%u.%06u ",
-                              (u_int32_t) ntohl(fap->fa2_atime.nfsv2_sec),
-                              (u_int32_t) ntohl(fap->fa2_atime.nfsv2_usec));
-                       printf("%u.%06u ",
-                              (u_int32_t) ntohl(fap->fa2_mtime.nfsv2_sec),
-                              (u_int32_t) ntohl(fap->fa2_mtime.nfsv2_usec));
-                       printf("%u.%06u ",
-                              (u_int32_t) ntohl(fap->fa2_ctime.nfsv2_sec),
-                              (u_int32_t) ntohl(fap->fa2_ctime.nfsv2_usec));
+                       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)));

                }
        }
                }
        }

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

                (v3 ? NFSX_V3FATTR : NFSX_V2FATTR)));
 trunc:
        return (NULL);
 }
 
 static int
                (v3 ? NFSX_V3FATTR : NFSX_V2FATTR)));
 trunc:
        return (NULL);
 }
 
 static int

-parseattrstat(const u_int32_t *dp, int verbose, int v3)
+parseattrstat(netdissect_options *ndo,
+              const uint32_t *dp, int verbose, int v3)

 {
        int er;
 
 {
        int er;
 

-       dp = parsestatus(dp, &er);
-       if (dp == NULL || er)
+       dp = parsestatus(ndo, dp, &er);
+       if (dp == NULL)

                return (0);
                return (0);

+       if (er)
+               return (1);

 
 

-       return (parsefattr(dp, verbose, v3) != NULL);
+       return (parsefattr(ndo, dp, verbose, v3) != NULL);

 }
 
 static int
 }
 
 static int

-parsediropres(const u_int32_t *dp)
+parsediropres(netdissect_options *ndo,
+              const uint32_t *dp)

 {
        int er;
 
 {
        int er;
 

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

                return (0);
                return (0);

+       if (er)
+               return (1);

 
 

-       dp = parsefh(dp, 0);
+       dp = parsefh(ndo, dp, 0);

        if (dp == NULL)
                return (0);
 
        if (dp == NULL)
                return (0);
 

-       return (parsefattr(dp, vflag, 0) != NULL);
+       return (parsefattr(ndo, dp, ndo->ndo_vflag, 0) != NULL);

 }
 
 static int
 }
 
 static int

-parselinkres(const u_int32_t *dp, int v3)
+parselinkres(netdissect_options *ndo,
+             const uint32_t *dp, int v3)

 {
        int er;
 
 {
        int er;
 

-       dp = parsestatus(dp, &er);
-       if (dp == NULL || er)
+       dp = parsestatus(ndo, dp, &er);
+       if (dp == NULL)

                return(0);
                return(0);

-       if (v3 && !(dp = parse_post_op_attr(dp, vflag)))
+       if (er)
+               return(1);
+       if (v3 && !(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))

                return (0);
                return (0);

-       putchar(' ');
-       return (parsefn(dp) != NULL);
+       ND_PRINT((ndo, " "));
+       return (parsefn(ndo, dp) != NULL);

 }
 
 static int
 }
 
 static int

-parsestatfs(const u_int32_t *dp, int v3)
+parsestatfs(netdissect_options *ndo,
+            const uint32_t *dp, int v3)

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

-       dp = parsestatus(dp, &er);
-       if (dp == NULL || (!v3 && er))
+       dp = parsestatus(ndo, dp, &er);
+       if (dp == NULL)

                return (0);
                return (0);

+       if (!v3 && er)
+               return (1);

 
 

-       if (qflag)
+       if (ndo->ndo_qflag)

                return(1);
 
        if (v3) {
                return(1);
 
        if (v3) {

-               if (vflag)
-                       printf(" POST:");
-               if (!(dp = parse_post_op_attr(dp, vflag)))
+               if (ndo->ndo_vflag)
+                       ND_PRINT((ndo, " POST:"));
+               if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))

                        return (0);
        }
 
                        return (0);
        }
 

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

 
        sfsp = (const struct nfs_statfs *)dp;
 
        if (v3) {
 
        sfsp = (const struct nfs_statfs *)dp;
 
        if (v3) {

-               printf(" tbytes ");
-               print_int64((u_int32_t *)&sfsp->sf_tbytes, UNSIGNED);
-               printf(" fbytes ");
-               print_int64((u_int32_t *)&sfsp->sf_fbytes, UNSIGNED);
-               printf(" abytes ");
-               print_int64((u_int32_t *)&sfsp->sf_abytes, UNSIGNED);
-               if (vflag) {
-                       printf(" tfiles ");
-                       print_int64((u_int32_t *)&sfsp->sf_tfiles, UNSIGNED);
-                       printf(" ffiles ");
-                       print_int64((u_int32_t *)&sfsp->sf_ffiles, UNSIGNED);
-                       printf(" afiles ");
-                       print_int64((u_int32_t *)&sfsp->sf_afiles, UNSIGNED);
-                       printf(" invar %u",
-                              (u_int32_t) ntohl(sfsp->sf_invarsec));
+               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)));
+               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)));

                }
        } else {
                }
        } else {

-               printf(" tsize %d bsize %d blocks %d bfree %d bavail %d",
-                       (u_int32_t)ntohl(sfsp->sf_tsize),
-                       (u_int32_t)ntohl(sfsp->sf_bsize),
-                       (u_int32_t)ntohl(sfsp->sf_blocks),
-                       (u_int32_t)ntohl(sfsp->sf_bfree),
-                       (u_int32_t)ntohl(sfsp->sf_bavail));
+               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)));

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


@@ -1048,49 +1238,55 @@ trunc:
 }
 
 static int
 }
 
 static int

-parserddires(const u_int32_t *dp)
+parserddires(netdissect_options *ndo,
+             const uint32_t *dp)

 {
        int er;
 
 {
        int er;
 

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

                return (0);
                return (0);

-       if (qflag)
+       if (er)
+               return (1);
+       if (ndo->ndo_qflag)

                return (1);
 
                return (1);
 

-       TCHECK(dp[2]);
-       printf(" offset %x size %d ", ntohl(dp[0]), ntohl(dp[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)
        if (dp[2] != 0)

-               printf(" eof");
+               ND_PRINT((ndo, " eof"));

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

-static const u_int32_t *
-parse_wcc_attr(const u_int32_t *dp)
+static const uint32_t *
+parse_wcc_attr(netdissect_options *ndo,
+               const uint32_t *dp)

 {
 {

-       printf(" sz ");
-       print_int64(dp, UNSIGNED);
-       printf(" mtime %u.%06u ctime %u.%06u", ntohl(dp[2]), ntohl(dp[3]),
-              ntohl(dp[4]), ntohl(dp[5]));
+       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])));

        return (dp + 6);
 }
 
 /*
  * Pre operation attributes. Print only if vflag > 1.
  */
        return (dp + 6);
 }
 
 /*
  * Pre operation attributes. Print only if vflag > 1.
  */

-static const u_int32_t *
-parse_pre_op_attr(const u_int32_t *dp, int verbose)
+static const uint32_t *
+parse_pre_op_attr(netdissect_options *ndo,
+                  const uint32_t *dp, int verbose)

 {
 {

-       TCHECK(dp[0]);
-       if (!ntohl(dp[0]))
+       ND_TCHECK(dp[0]);
+       if (!EXTRACT_32BITS(&dp[0]))

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

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

        if (verbose > 1) {
        if (verbose > 1) {

-               return parse_wcc_attr(dp);
+               return parse_wcc_attr(ndo, dp);

        } else {
                /* If not verbose enough, just skip over wcc_attr */
                return (dp + 6);
        } else {
                /* If not verbose enough, just skip over wcc_attr */
                return (dp + 6);


@@ -1102,56 +1298,59 @@ trunc:
 /*
  * Post operation attributes are printed if vflag >= 1
  */
 /*
  * Post operation attributes are printed if vflag >= 1
  */

-static const u_int32_t *
-parse_post_op_attr(const u_int32_t *dp, int verbose)
+static const uint32_t *
+parse_post_op_attr(netdissect_options *ndo,
+                   const uint32_t *dp, int verbose)

 {
 {

-       TCHECK(dp[0]);
-       if (!ntohl(dp[0]))
+       ND_TCHECK(dp[0]);
+       if (!EXTRACT_32BITS(&dp[0]))

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

-               return parsefattr(dp, verbose, 1);
+               return parsefattr(ndo, dp, verbose, 1);

        } else
        } 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 *
-parse_wcc_data(const u_int32_t *dp, int verbose)
+static const uint32_t *
+parse_wcc_data(netdissect_options *ndo,
+               const uint32_t *dp, int verbose)

 {
        if (verbose > 1)
 {
        if (verbose > 1)

-               printf(" PRE:");
-       if (!(dp = parse_pre_op_attr(dp, verbose)))
+               ND_PRINT((ndo, " PRE:"));
+       if (!(dp = parse_pre_op_attr(ndo, dp, verbose)))

                return (0);
 
        if (verbose)
                return (0);
 
        if (verbose)

-               printf(" POST:");
-       return parse_post_op_attr(dp, verbose);
+               ND_PRINT((ndo, " POST:"));
+       return parse_post_op_attr(ndo, dp, verbose);

 }
 
 }
 

-static const u_int32_t *
-parsecreateopres(const u_int32_t *dp, int verbose)
+static const uint32_t *
+parsecreateopres(netdissect_options *ndo,
+                 const uint32_t *dp, int verbose)

 {
        int er;
 
 {
        int er;
 

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

                return (0);
        if (er)
                return (0);
        if (er)

-               dp = parse_wcc_data(dp, verbose);
+               dp = parse_wcc_data(ndo, dp, verbose);

        else {
        else {

-               TCHECK(dp[0]);
-               if (!ntohl(dp[0]))
+               ND_TCHECK(dp[0]);
+               if (!EXTRACT_32BITS(&dp[0]))

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

-               if (!(dp = parsefh(dp, 1)))
+               if (!(dp = parsefh(ndo, dp, 1)))

                        return (0);
                if (verbose) {
                        return (0);
                if (verbose) {

-                       if (!(dp = parse_post_op_attr(dp, verbose)))
+                       if (!(dp = parse_post_op_attr(ndo, dp, verbose)))

                                return (0);
                                return (0);

-                       if (vflag > 1) {
-                               printf("dir attr:");
-                               dp = parse_wcc_data(dp, verbose);
+                       if (ndo->ndo_vflag > 1) {
+                               ND_PRINT((ndo, " dir attr:"));
+                               dp = parse_wcc_data(ndo, dp, verbose);

                        }
                }
        }
                        }
                }
        }


@@ -1161,31 +1360,33 @@ trunc:
 }
 
 static int
 }
 
 static int

-parsewccres(const u_int32_t *dp, int verbose)
+parsewccres(netdissect_options *ndo,
+            const uint32_t *dp, int verbose)

 {
        int er;
 
 {
        int er;
 

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

                return (0);
                return (0);

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

 }
 
 }
 

-static const u_int32_t *
-parsev3rddirres(const u_int32_t *dp, int verbose)
+static const uint32_t *
+parsev3rddirres(netdissect_options *ndo,
+                const uint32_t *dp, int verbose)

 {
        int er;
 
 {
        int er;
 

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

                return (0);
                return (0);

-       if (vflag)
-               printf(" POST:");
-       if (!(dp = parse_post_op_attr(dp, verbose)))
+       if (ndo->ndo_vflag)
+               ND_PRINT((ndo, " POST:"));
+       if (!(dp = parse_post_op_attr(ndo, dp, verbose)))

                return (0);
        if (er)
                return dp;
                return (0);
        if (er)
                return dp;

-       if (vflag) {
-               TCHECK(dp[1]);
-               printf(" verf %08x%08x", dp[0], dp[1]);
+       if (ndo->ndo_vflag) {
+               ND_TCHECK(dp[1]);
+               ND_PRINT((ndo, " verf %08x%08x", dp[0], dp[1]));

                dp += 2;
        }
        return dp;
                dp += 2;
        }
        return dp;


@@ -1194,76 +1395,79 @@ trunc:
 }
 
 static int
 }
 
 static int

-parsefsinfo(const u_int32_t *dp)
+parsefsinfo(netdissect_options *ndo,
+            const uint32_t *dp)

 {
 {

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

        int er;
 
        int er;
 

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

                return (0);
                return (0);

-       if (vflag)
-               printf(" POST:");
-       if (!(dp = parse_post_op_attr(dp, vflag)))
+       if (ndo->ndo_vflag)
+               ND_PRINT((ndo, " POST:"));
+       if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))

                return (0);
        if (er)
                return (1);
 
                return (0);
        if (er)
                return (1);
 

-       sfp = (struct nfsv3_fsinfo *)dp;
-       TCHECK(*sfp);
-       printf(" rtmax %u rtpref %u wtmax %u wtpref %u dtpref %u",
-              (u_int32_t) ntohl(sfp->fs_rtmax),
-              (u_int32_t) ntohl(sfp->fs_rtpref),
-              (u_int32_t) ntohl(sfp->fs_wtmax),
-              (u_int32_t) ntohl(sfp->fs_wtpref),
-              (u_int32_t) ntohl(sfp->fs_dtpref));
-       if (vflag) {
-               printf(" rtmult %u wtmult %u maxfsz ",
-                      (u_int32_t) ntohl(sfp->fs_rtmult),
-                      (u_int32_t) ntohl(sfp->fs_wtmult));
-               print_int64((u_int32_t *)&sfp->fs_maxfilesize, UNSIGNED);
-               printf(" delta %u.%06u ",
-                      (u_int32_t) ntohl(sfp->fs_timedelta.nfsv3_sec),
-                      (u_int32_t) ntohl(sfp->fs_timedelta.nfsv3_nsec));
+       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)));
+       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)));
+               ND_PRINT((ndo, " delta %u.%06u ",
+                      EXTRACT_32BITS(&sfp->fs_timedelta.nfsv3_sec),
+                      EXTRACT_32BITS(&sfp->fs_timedelta.nfsv3_nsec)));

        }
        }

-       return (0);
-trunc:

        return (1);
        return (1);

+trunc:
+       return (0);

 }
 
 static int
 }
 
 static int

-parsepathconf(const u_int32_t *dp)
+parsepathconf(netdissect_options *ndo,
+              const uint32_t *dp)

 {
        int er;
 {
        int er;

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

 
 

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

                return (0);
                return (0);

-       if (vflag)
-               printf(" POST:");
-       if (!(dp = parse_post_op_attr(dp, vflag)))
+       if (ndo->ndo_vflag)
+               ND_PRINT((ndo, " POST:"));
+       if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))

                return (0);
        if (er)
                return (1);
 
                return (0);
        if (er)
                return (1);
 

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

 
 

-       printf(" linkmax %u namemax %u %s %s %s %s",
-              (u_int32_t) ntohl(spp->pc_linkmax),
-              (u_int32_t) ntohl(spp->pc_namemax),
-              ntohl(spp->pc_notrunc) ? "notrunc" : "",
-              ntohl(spp->pc_chownrestricted) ? "chownres" : "",
-              ntohl(spp->pc_caseinsensitive) ? "igncase" : "",
-              ntohl(spp->pc_casepreserving) ? "keepcase" : "");
-       return (0);
-trunc:
+       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" : ""));

        return (1);
        return (1);

+trunc:
+       return (0);

 }
 
 static void
 }
 
 static void

-interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int length)
+interp_reply(netdissect_options *ndo,
+             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;
 


@@ -1272,308 +1476,258 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt
        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)));

        switch (proc) {
 
        switch (proc) {
 

-       case NFSPROC_NOOP:
-               printf(" nop");
-               return;
-
-       case NFSPROC_NULL:
-               printf(" null");
-               return;
-

        case NFSPROC_GETATTR:
        case NFSPROC_GETATTR:

-               printf(" getattr");
-               dp = parserep(rp, length);
-               if (dp != NULL && parseattrstat(dp, !qflag, v3) != 0)
+               dp = parserep(ndo, rp, length);
+               if (dp != NULL && parseattrstat(ndo, dp, !ndo->ndo_qflag, v3) != 0)

                        return;
                break;
 
        case NFSPROC_SETATTR:
                        return;
                break;
 
        case NFSPROC_SETATTR:

-               printf(" setattr");
-               if (!(dp = parserep(rp, length)))
+               if (!(dp = parserep(ndo, rp, length)))

                        return;
                if (v3) {
                        return;
                if (v3) {

-                       if (parsewccres(dp, vflag))
+                       if (parsewccres(ndo, dp, ndo->ndo_vflag))

                                return;
                } else {
                                return;
                } else {

-                       if (parseattrstat(dp, !qflag, 0) != 0)
+                       if (parseattrstat(ndo, dp, !ndo->ndo_qflag, 0) != 0)

                                return;
                }
                break;
 
        case NFSPROC_LOOKUP:
                                return;
                }
                break;
 
        case NFSPROC_LOOKUP:

-               printf(" lookup");
-               if (!(dp = parserep(rp, length)))
+               if (!(dp = parserep(ndo, rp, length)))

                        break;
                if (v3) {
                        break;
                if (v3) {

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

                                break;
                        if (er) {
                                break;
                        if (er) {

-                               if (vflag > 1) {
-                                       printf(" post dattr:");
-                                       dp = parse_post_op_attr(dp, vflag);
+                               if (ndo->ndo_vflag > 1) {
+                                       ND_PRINT((ndo, " post dattr:"));
+                                       dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag);

                                }
                        } else {
                                }
                        } else {

-                               if (!(dp = parsefh(dp, v3)))
+                               if (!(dp = parsefh(ndo, dp, v3)))

                                        break;
                                        break;

-                               if ((dp = parse_post_op_attr(dp, vflag)) &&
-                                   vflag > 1) {
-                                       printf(" post dattr:");
-                                       dp = parse_post_op_attr(dp, vflag);
+                               if ((dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)) &&
+                                   ndo->ndo_vflag > 1) {
+                                       ND_PRINT((ndo, " post dattr:"));
+                                       dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag);

                                }
                        }
                        if (dp)
                                return;
                } else {
                                }
                        }
                        if (dp)
                                return;
                } else {

-                       if (parsediropres(dp) != 0)
+                       if (parsediropres(ndo, dp) != 0)

                                return;
                }
                break;
 
        case NFSPROC_ACCESS:
                                return;
                }
                break;
 
        case NFSPROC_ACCESS:

-               printf(" access");
-               dp = parserep(rp, length);
-               if (!(dp = parsestatus(dp, &er)))
+               if (!(dp = parserep(ndo, rp, length)))

                        break;
                        break;

-               if (vflag)
-                       printf(" attr:");
-               if (!(dp = parse_post_op_attr(dp, vflag)))
+               if (!(dp = parsestatus(ndo, dp, &er)))
+                       break;
+               if (ndo->ndo_vflag)
+                       ND_PRINT((ndo, " attr:"));
+               if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))

                        break;
                if (!er)
                        break;
                if (!er)

-                       printf(" c %04x", ntohl(dp[0]));
+                       ND_PRINT((ndo, " c %04x", EXTRACT_32BITS(&dp[0])));

                return;
 
        case NFSPROC_READLINK:
                return;
 
        case NFSPROC_READLINK:

-               printf(" readlink");
-               dp = parserep(rp, length);
-               if (dp != NULL && parselinkres(dp, v3) != 0)
+               dp = parserep(ndo, rp, length);
+               if (dp != NULL && parselinkres(ndo, dp, v3) != 0)

                        return;
                break;
 
        case NFSPROC_READ:
                        return;
                break;
 
        case NFSPROC_READ:

-               printf(" read");
-               if (!(dp = parserep(rp, length)))
+               if (!(dp = parserep(ndo, rp, length)))

                        break;
                if (v3) {
                        break;
                if (v3) {

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

                                break;
                                break;

-                       if (!(dp = parse_post_op_attr(dp, vflag)))
+                       if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))

                                break;
                        if (er)
                                return;
                                break;
                        if (er)
                                return;

-                       if (vflag) {
-                               TCHECK(dp[1]);
-                               printf("%u bytes", (u_int32_t) ntohl(dp[0]));
-                               if (ntohl(dp[1]))
-                                       printf(" EOF");
+                       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"));

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

-                       if (parseattrstat(dp, vflag, 0) != 0)
+                       if (parseattrstat(ndo, dp, ndo->ndo_vflag, 0) != 0)

                                return;
                }
                break;
 
        case NFSPROC_WRITE:
                                return;
                }
                break;
 
        case NFSPROC_WRITE:

-               printf(" write");
-               if (!(dp = parserep(rp, length)))
+               if (!(dp = parserep(ndo, rp, length)))

                        break;
                if (v3) {
                        break;
                if (v3) {

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

                                break;
                                break;

-                       if (!(dp = parse_wcc_data(dp, vflag)))
+                       if (!(dp = parse_wcc_data(ndo, dp, ndo->ndo_vflag)))

                                break;
                        if (er)
                                return;
                                break;
                        if (er)
                                return;

-                       if (vflag) {
-                               TCHECK(dp[0]);
-                               printf("%u bytes", (u_int32_t) ntohl(dp[0]));
-                               if (vflag > 1) {
-                                       TCHECK(dp[1]);
-                                       printf(" <%s>",
+                       if (ndo->ndo_vflag) {
+                               ND_TCHECK(dp[0]);
+                               ND_PRINT((ndo, " %u bytes", EXTRACT_32BITS(&dp[0])));
+                               if (ndo->ndo_vflag > 1) {
+                                       ND_TCHECK(dp[1]);
+                                       ND_PRINT((ndo, " <%s>",

                                                tok2str(nfsv3_writemodes,
                                                tok2str(nfsv3_writemodes,

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

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

-                       if (parseattrstat(dp, vflag, v3) != 0)
+                       if (parseattrstat(ndo, dp, ndo->ndo_vflag, v3) != 0)

                                return;
                }
                break;
 
        case NFSPROC_CREATE:
                                return;
                }
                break;
 
        case NFSPROC_CREATE:

-               printf(" create");
-               if (!(dp = parserep(rp, length)))
-                       break;
-               if (v3) {
-                       if (parsecreateopres(dp, vflag) != 0)
-                               return;
-               } else {
-                       if (parsediropres(dp) != 0)
-                               return;
-               }
-               break;
-

        case NFSPROC_MKDIR:
        case NFSPROC_MKDIR:

-               printf(" mkdir");
-               if (!(dp = parserep(rp, length)))
+               if (!(dp = parserep(ndo, rp, length)))

                        break;
                if (v3) {
                        break;
                if (v3) {

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

                                return;
                } else {
                                return;
                } else {

-                       if (parsediropres(dp) != 0)
+                       if (parsediropres(ndo, dp) != 0)

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

-               printf(" symlink");
-               if (!(dp = parserep(rp, length)))
+               if (!(dp = parserep(ndo, rp, length)))

                        break;
                if (v3) {
                        break;
                if (v3) {

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

                                return;
                } else {
                                return;
                } else {

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

                                return;
                }
                break;
 
        case NFSPROC_MKNOD:
                                return;
                }
                break;
 
        case NFSPROC_MKNOD:

-               printf(" mknod");
-               if (!(dp = parserep(rp, length)))
+               if (!(dp = parserep(ndo, rp, length)))

                        break;
                        break;

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

                        return;
                break;
 
        case NFSPROC_REMOVE:
                        return;
                break;
 
        case NFSPROC_REMOVE:

-               printf(" remove");
-               if (!(dp = parserep(rp, length)))
-                       break;
-               if (v3) {
-                       if (parsewccres(dp, vflag))
-                               return;
-               } else {
-                       if (parsestatus(dp, &er) != 0)
-                               return;
-               }
-               break;
-

        case NFSPROC_RMDIR:
        case NFSPROC_RMDIR:

-               printf(" rmdir");
-               if (!(dp = parserep(rp, length)))
+               if (!(dp = parserep(ndo, rp, length)))

                        break;
                if (v3) {
                        break;
                if (v3) {

-                       if (parsewccres(dp, vflag))
+                       if (parsewccres(ndo, dp, ndo->ndo_vflag))

                                return;
                } else {
                                return;
                } else {

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

                                return;
                }
                break;
 
        case NFSPROC_RENAME:
                                return;
                }
                break;
 
        case NFSPROC_RENAME:

-               printf(" rename");
-               if (!(dp = parserep(rp, length)))
+               if (!(dp = parserep(ndo, rp, length)))

                        break;
                if (v3) {
                        break;
                if (v3) {

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

                                break;
                                break;

-                       if (vflag) {
-                               printf(" from:");
-                               if (!(dp = parse_wcc_data(dp, vflag)))
+                       if (ndo->ndo_vflag) {
+                               ND_PRINT((ndo, " from:"));
+                               if (!(dp = parse_wcc_data(ndo, dp, ndo->ndo_vflag)))

                                        break;
                                        break;

-                               printf(" to:");
-                               if (!(dp = parse_wcc_data(dp, vflag)))
+                               ND_PRINT((ndo, " to:"));
+                               if (!(dp = parse_wcc_data(ndo, dp, ndo->ndo_vflag)))

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

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

                                return;
                }
                break;
 
        case NFSPROC_LINK:
                                return;
                }
                break;
 
        case NFSPROC_LINK:

-               printf(" link");
-               if (!(dp = parserep(rp, length)))
+               if (!(dp = parserep(ndo, rp, length)))

                        break;
                if (v3) {
                        break;
                if (v3) {

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

                                break;
                                break;

-                       if (vflag) {
-                               printf(" file POST:");
-                               if (!(dp = parse_post_op_attr(dp, vflag)))
+                       if (ndo->ndo_vflag) {
+                               ND_PRINT((ndo, " file POST:"));
+                               if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))

                                        break;
                                        break;

-                               printf(" dir:");
-                               if (!(dp = parse_wcc_data(dp, vflag)))
+                               ND_PRINT((ndo, " dir:"));
+                               if (!(dp = parse_wcc_data(ndo, dp, ndo->ndo_vflag)))

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

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

                                return;
                }
                break;
 
        case NFSPROC_READDIR:
                                return;
                }
                break;
 
        case NFSPROC_READDIR:

-               printf(" readdir");
-               if (!(dp = parserep(rp, length)))
+               if (!(dp = parserep(ndo, rp, length)))

                        break;
                if (v3) {
                        break;
                if (v3) {

-                       if (parsev3rddirres(dp, vflag))
+                       if (parsev3rddirres(ndo, dp, ndo->ndo_vflag))

                                return;
                } else {
                                return;
                } else {

-                       if (parserddires(dp) != 0)
+                       if (parserddires(ndo, dp) != 0)

                                return;
                }
                break;
 
        case NFSPROC_READDIRPLUS:
                                return;
                }
                break;
 
        case NFSPROC_READDIRPLUS:

-               printf(" readdirplus");
-               if (!(dp = parserep(rp, length)))
+               if (!(dp = parserep(ndo, rp, length)))

                        break;
                        break;

-               if (parsev3rddirres(dp, vflag))
+               if (parsev3rddirres(ndo, dp, ndo->ndo_vflag))

                        return;
                break;
 
        case NFSPROC_FSSTAT:
                        return;
                break;
 
        case NFSPROC_FSSTAT:

-               printf(" fsstat");
-               dp = parserep(rp, length);
-               if (dp != NULL && parsestatfs(dp, v3) != 0)
+               dp = parserep(ndo, rp, length);
+               if (dp != NULL && parsestatfs(ndo, dp, v3) != 0)

                        return;
                break;
 
        case NFSPROC_FSINFO:
                        return;
                break;
 
        case NFSPROC_FSINFO:

-               printf(" fsinfo");
-               dp = parserep(rp, length);
-               if (dp != NULL && parsefsinfo(dp) != 0)
+               dp = parserep(ndo, rp, length);
+               if (dp != NULL && parsefsinfo(ndo, dp) != 0)

                        return;
                break;
 
        case NFSPROC_PATHCONF:
                        return;
                break;
 
        case NFSPROC_PATHCONF:

-               printf(" pathconf");
-               dp = parserep(rp, length);
-               if (dp != NULL && parsepathconf(dp) != 0)
+               dp = parserep(ndo, rp, length);
+               if (dp != NULL && parsepathconf(ndo, dp) != 0)

                        return;
                break;
 
        case NFSPROC_COMMIT:
                        return;
                break;
 
        case NFSPROC_COMMIT:

-               printf(" commit");
-               dp = parserep(rp, length);
-               if (dp != NULL && parsewccres(dp, vflag) != 0)
+               dp = parserep(ndo, rp, length);
+               if (dp != NULL && parsewccres(ndo, dp, ndo->ndo_vflag) != 0)

                        return;
                break;
 
        default:
                        return;
                break;
 
        default:

-               printf(" proc-%u", proc);

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

-               fputs(" [|nfs]", stdout);
+               ND_PRINT((ndo, "%s", tstr));

 }
 }