From ace14a2b50f2cc05c079d0b9137b49066dbb1206 Mon Sep 17 00:00:00 2001 From: fenner Date: Tue, 3 Apr 2001 07:45:48 +0000 Subject: Virgin import of tcpdump.org tcpdump v3.6.2 --- contrib/tcpdump/print-nfs.c | 605 +++++++++++++++++++++++++++----------------- 1 file changed, 378 insertions(+), 227 deletions(-) (limited to 'contrib/tcpdump/print-nfs.c') diff --git a/contrib/tcpdump/print-nfs.c b/contrib/tcpdump/print-nfs.c index ccfb52b..b520160 100644 --- a/contrib/tcpdump/print-nfs.c +++ b/contrib/tcpdump/print-nfs.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.69 1999/12/15 06:57:25 fenner Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.87 2000/10/07 05:53:12 itojun Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -32,16 +32,10 @@ static const char rcsid[] = #include #include -#if __STDC__ struct mbuf; struct rtentry; -#endif -#include #include -#include -#include -#include #include @@ -56,14 +50,20 @@ struct rtentry; #include "nfs.h" #include "nfsfh.h" +#include "ip.h" +#ifdef INET6 +#include "ip6.h" +#endif + 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 *, +static void xid_map_enter(const struct rpc_msg *, const u_char *); +static int32_t xid_map_find(const struct rpc_msg *, const u_char *, 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); +static void print_nfsaddr(const u_char *, const char *, const char *); /* * Mapping of old NFS Version 2 RPC numbers to generic numbers. @@ -97,10 +97,60 @@ u_int32_t nfsv3_procid[NFS_NPROCS] = { NFSPROC_NOOP }; -const char *nfsv3_writemodes[NFSV3WRITE_NMODES] = { - "unstable", - "datasync", - "filesync" +/* + * 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 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 struct tok nfsv3_writemodes[] = { + { 0, "unstable" }, + { 1, "datasync" }, + { 2, "filesync" }, + { 0, NULL } }; static struct tok type2str[] = { @@ -148,74 +198,102 @@ static int print_int64(const u_int32_t *dp, int how) } #else switch (how) { - case SIGNED : - case UNSIGNED : - case HEX : - printf ("0x%x%08x", dp[0], dp[1]); - break; - default : - return (0); + case SIGNED: + case UNSIGNED: + case HEX: + printf("0x%x%08x", (u_int32_t)ntohl(dp[0]), + (u_int32_t)ntohl(dp[1])); + break; + default: + return (0); } #endif return 1; } +static void +print_nfsaddr(const u_char *bp, const char *s, const char *d) +{ + struct ip *ip; +#ifdef INET6 + struct ip6_hdr *ip6; + char srcaddr[INET6_ADDRSTRLEN], dstaddr[INET6_ADDRSTRLEN]; +#else +#ifndef INET_ADDRSTRLEN +#define INET_ADDRSTRLEN 16 +#endif + char srcaddr[INET_ADDRSTRLEN], dstaddr[INET_ADDRSTRLEN]; +#endif + + srcaddr[0] = dstaddr[0] = '\0'; + switch (IP_V((struct ip *)bp)) { + case 4: + ip = (struct ip *)bp; + strlcpy(srcaddr, ipaddr_string(&ip->ip_src), sizeof(srcaddr)); + strlcpy(dstaddr, ipaddr_string(&ip->ip_dst), sizeof(dstaddr)); + break; +#ifdef INET6 + case 6: + ip6 = (struct ip6_hdr *)bp; + strlcpy(srcaddr, ip6addr_string(&ip6->ip6_src), + sizeof(srcaddr)); + strlcpy(dstaddr, ip6addr_string(&ip6->ip6_dst), + sizeof(dstaddr)); + break; +#endif + default: + strlcpy(srcaddr, "?", sizeof(srcaddr)); + strlcpy(dstaddr, "?", sizeof(dstaddr)); + break; + } + + (void)printf("%s.%s > %s.%s: ", srcaddr, s, dstaddr, d); +} + static const u_int32_t * parse_sattr3(const u_int32_t *dp, struct nfsv3_sattr *sa3) { - register const u_int32_t *ep = (u_int32_t *)snapend; - - if (dp + 1 > ep) - return (0); + TCHECK(dp[0]); if ((sa3->sa_modeset = ntohl(*dp++))) { - if (dp + 1 > ep) - return (0); + TCHECK(dp[0]); sa3->sa_mode = ntohl(*dp++); } - if (dp + 1 > ep) - return (0); + TCHECK(dp[0]); if ((sa3->sa_uidset = ntohl(*dp++))) { - if (dp + 1 > ep) - return (0); + TCHECK(dp[0]); sa3->sa_uid = ntohl(*dp++); } - if (dp + 1 > ep) - return (0); + TCHECK(dp[0]); if ((sa3->sa_gidset = ntohl(*dp++))) { - if (dp + 1 > ep) - return (0); + TCHECK(dp[0]); sa3->sa_gid = ntohl(*dp++); } - if (dp + 1 > ep) - return (0); + TCHECK(dp[0]); if ((sa3->sa_sizeset = ntohl(*dp++))) { - if (dp + 1 > ep) - return (0); + TCHECK(dp[0]); sa3->sa_size = ntohl(*dp++); } - if (dp + 1 > ep) - return (0); + TCHECK(dp[0]); if ((sa3->sa_atimetype = ntohl(*dp++)) == NFSV3SATTRTIME_TOCLIENT) { - if (dp + 2 > ep) - return (0); + TCHECK(dp[1]); sa3->sa_atime.nfsv3_sec = ntohl(*dp++); sa3->sa_atime.nfsv3_nsec = ntohl(*dp++); } - if (dp + 1 > ep) - return (0); + TCHECK(dp[0]); if ((sa3->sa_mtimetype = ntohl(*dp++)) == NFSV3SATTRTIME_TOCLIENT) { - if (dp + 2 > ep) - return (0); + TCHECK(dp[1]); sa3->sa_mtime.nfsv3_sec = ntohl(*dp++); sa3->sa_mtime.nfsv3_nsec = ntohl(*dp++); } return dp; +trunc: + return NULL; } static int nfserr; /* true if we error rather than trunc */ @@ -244,32 +322,28 @@ nfsreply_print(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; + u_int32_t proc, vers; + char srcid[20], dstid[20]; /*fits 32bit*/ 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", + + if (!nflag) { + strlcpy(srcid, "nfs", sizeof(srcid)); + snprintf(dstid, sizeof(dstid), "%u", + (u_int32_t)ntohl(rp->rm_xid)); + } else { + snprintf(srcid, sizeof(srcid), "%u", NFS_PORT); + snprintf(dstid, sizeof(dstid), "%u", + (u_int32_t)ntohl(rp->rm_xid)); + } + print_nfsaddr(bp2, srcid, dstid); + (void)printf("reply %s %d", + ntohl(rp->rm_reply.rp_stat) == MSG_ACCEPTED? + "ok":"ERR", length); - if (xid_map_find(rp, ip, &proc, &vers) >= 0) + if (xid_map_find(rp, bp2, &proc, &vers) >= 0) interp_reply(rp, proc, vers, length); } @@ -313,17 +387,17 @@ parsefh(register const u_int32_t *dp, int v3) int len; if (v3) { - if (dp + 1 > (u_int32_t *)snapend) - return (0); + TCHECK(dp[0]); len = (int)ntohl(*dp) / 4; dp++; } else len = NFSX_V2FH / 4; - if (dp + len <= (u_int32_t *)snapend) { + if (TTEST2(*dp, len * sizeof(*dp))) { nfs_printfh(dp, len); return (dp + len); } +trunc: return (NULL); } @@ -338,24 +412,25 @@ parsefn(register const u_int32_t *dp) register const u_char *cp; /* Bail if we don't have the string length */ - if ((u_char *)dp > snapend - sizeof(*dp)) - return (NULL); + TCHECK(*dp); /* Fetch string length; convert to host order */ len = *dp++; NTOHL(len); + TCHECK2(*dp, ((len + 3) & ~3)); + cp = (u_char *)dp; /* Update 32-bit pointer (NFS filenames padded to 32-bit boundaries) */ dp += ((len + 3) & ~3) / sizeof(*dp); - if ((u_char *)dp > snapend) - return (NULL); /* XXX seems like we should be checking the length */ putchar('"'); (void) fn_printn(cp, len, NULL); putchar('"'); return (dp); +trunc: + return NULL; } /* @@ -378,31 +453,28 @@ nfsreq_print(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; + nfs_type type; int v3; u_int32_t proc; struct nfsv3_sattr sa3; + char srcid[20], dstid[20]; /*fits 32bit*/ 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); + if (!nflag) { + snprintf(srcid, sizeof(srcid), "%u", + (u_int32_t)ntohl(rp->rm_xid)); + strlcpy(dstid, "nfs", sizeof(dstid)); + } else { + snprintf(srcid, sizeof(srcid), "%u", + (u_int32_t)ntohl(rp->rm_xid)); + snprintf(dstid, sizeof(dstid), "%u", NFS_PORT); + } + print_nfsaddr(bp2, srcid, dstid); + (void)printf("%d", length); - xid_map_enter(rp, ip); /* record proc number for later on */ + xid_map_enter(rp, bp2); /* record proc number for later on */ v3 = (ntohl(rp->rm_call.cb_vers) == NFS_VER3); proc = ntohl(rp->rm_call.cb_proc); @@ -443,8 +515,8 @@ nfsreq_print(register const u_char *bp, u_int length, printf(" access"); if ((dp = parsereq(rp, length)) != NULL && (dp = parsefh(dp, v3)) != NULL) { - TCHECK2(dp[0], 4); - printf(" %04x", ntohl(dp[0])); + TCHECK(dp[0]); + printf(" %04x", (u_int32_t)ntohl(dp[0])); return; } break; @@ -461,16 +533,16 @@ nfsreq_print(register const u_char *bp, u_int length, if ((dp = parsereq(rp, length)) != NULL && (dp = parsefh(dp, v3)) != NULL) { if (v3) { - TCHECK2(dp[0], 3 * sizeof(*dp)); + TCHECK(dp[2]); printf(" %u bytes @ ", (u_int32_t) ntohl(dp[2])); print_int64(dp, UNSIGNED); } else { - TCHECK2(dp[0], 2 * sizeof(*dp)); - printf(" %u bytes @ %u", - (u_int32_t)ntohl(dp[1]), - (u_int32_t)ntohl(dp[0])); - } + TCHECK(dp[1]); + printf(" %u bytes @ %u", + (u_int32_t)ntohl(dp[1]), + (u_int32_t)ntohl(dp[0])); + } return; } break; @@ -480,23 +552,24 @@ nfsreq_print(register const u_char *bp, u_int length, if ((dp = parsereq(rp, length)) != NULL && (dp = parsefh(dp, v3)) != NULL) { if (v3) { - TCHECK2(dp[0], 3 * sizeof(*dp)); + TCHECK(dp[4]); printf(" %u bytes @ ", - (u_int32_t) ntohl(dp[4])); + (u_int32_t) ntohl(dp[4])); print_int64(dp, UNSIGNED); if (vflag) { dp += 3; - TCHECK2(dp[0], sizeof(*dp)); + TCHECK(dp[0]); printf(" <%s>", - nfsv3_writemodes[ntohl(*dp)]); + tok2str(nfsv3_writemodes, + NULL, ntohl(*dp))); } } else { - TCHECK2(dp[0], 4 * sizeof(*dp)); - 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])); + 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])); } return; } @@ -526,7 +599,7 @@ nfsreq_print(register const u_char *bp, u_int length, break; if (v3 && vflag) print_sattr3(&sa3, vflag); - return; + return; } break; @@ -534,21 +607,21 @@ nfsreq_print(register const u_char *bp, u_int length, printf(" mknod"); if ((dp = parsereq(rp, length)) != 0 && (dp = parsefhn(dp, v3)) != 0) { - if (dp + 1 > (u_int32_t *)snapend) - break; - type = (nfstype)ntohl(*dp++); + TCHECK(*dp); + type = (nfs_type)ntohl(*dp++); if ((dp = parse_sattr3(dp, &sa3)) == 0) break; printf(" %s", tok2str(type2str, "unk-ft %d", type)); if (vflag && (type == NFCHR || type == NFBLK)) { - if (dp + 2 > (u_int32_t *)snapend) - break; - printf(" %u/%u", ntohl(dp[0]), ntohl(dp[1])); + TCHECK(dp[1]); + printf(" %u/%u", + (u_int32_t)ntohl(dp[0]), + (u_int32_t)ntohl(dp[1])); dp += 2; } if (vflag) print_sattr3(&sa3, vflag); - return; + return; } break; @@ -556,7 +629,7 @@ nfsreq_print(register const u_char *bp, u_int length, printf(" remove"); if ((dp = parsereq(rp, length)) != NULL && parsefhn(dp, v3) != NULL) - return; + return; break; case NFSPROC_RMDIR: @@ -582,7 +655,7 @@ nfsreq_print(register const u_char *bp, u_int length, (dp = parsefh(dp, v3)) != NULL) { fputs(" ->", stdout); if (parsefhn(dp, v3) != NULL) - return; + return; } break; @@ -591,7 +664,7 @@ nfsreq_print(register const u_char *bp, u_int length, if ((dp = parsereq(rp, length)) != NULL && (dp = parsefh(dp, v3)) != NULL) { if (v3) { - TCHECK2(dp[0], 20); + TCHECK(dp[4]); /* * We shouldn't really try to interpret the * offset cookie here. @@ -603,14 +676,14 @@ nfsreq_print(register const u_char *bp, u_int length, printf(" verf %08x%08x", dp[2], dp[3]); } else { - TCHECK2(dp[0], 2 * sizeof(*dp)); - /* + TCHECK(dp[1]); + /* * 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])); + */ + printf(" %u bytes @ %d", + (u_int32_t)ntohl(dp[1]), + (u_int32_t)ntohl(dp[0])); } return; } @@ -620,7 +693,7 @@ nfsreq_print(register const u_char *bp, u_int length, printf(" readdirplus"); if ((dp = parsereq(rp, length)) != NULL && (dp = parsefh(dp, v3)) != NULL) { - TCHECK2(dp[0], 20); + TCHECK(dp[4]); /* * We don't try to interpret the offset * cookie here. @@ -663,6 +736,7 @@ nfsreq_print(register const u_char *bp, u_int length, printf(" proc-%u", (u_int32_t)ntohl(rp->rm_call.cb_proc)); return; } + trunc: if (!nfserr) fputs(" [|nfs]", stdout); @@ -688,22 +762,27 @@ nfs_printfh(register const u_int32_t *dp, const u_int len) if (sfsname) { /* file system ID is ASCII, not numeric, for this server OS */ - static char temp[NFSX_V3FHMAX+1]; + static char temp[NFSX_V3FHMAX+1]; /* Make sure string is null-terminated */ - strncpy(temp, sfsname, NFSX_V3FHMAX); + strncpy(temp, sfsname, NFSX_V3FHMAX); + temp[sizeof(temp) - 1] = '\0'; /* Remove trailing spaces */ sfsname = strchr(temp, ' '); if (sfsname) *sfsname = 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); + (void)printf(" fh %s/", temp); + } else { + (void)printf(" fh %d,%d/", + fsid.Fsid_dev.Major, fsid.Fsid_dev.Minor); } + + if(fsid.Fsid_dev.Minor == 257 && uflag) + /* Print the undecoded handle */ + (void)printf("%s", fsid.Opaque_Handle); + else + (void)printf("%ld", (long) ino); } /* @@ -713,11 +792,17 @@ nfs_printfh(register const u_int32_t *dp, const u_int len) */ struct xid_map_entry { - u_int32_t xid; /* transaction ID (net order) */ + u_int32_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) */ - u_int32_t proc; /* call proc number (host order) */ - u_int32_t vers; /* program version (host order) */ +#endif + u_int32_t proc; /* call proc number (host order) */ + u_int32_t vers; /* program version (host order) */ }; /* @@ -734,51 +819,110 @@ int xid_map_next = 0; int xid_map_hint = 0; static void -xid_map_enter(const struct rpc_msg *rp, const struct ip *ip) +xid_map_enter(const struct rpc_msg *rp, const u_char *bp) { + struct ip *ip = NULL; +#ifdef INET6 + struct ip6_hdr *ip6 = NULL; +#endif struct xid_map_entry *xmep; + switch (IP_V((struct ip *)bp)) { + case 4: + ip = (struct ip *)bp; + break; +#ifdef INET6 + case 6: + ip6 = (struct ip6_hdr *)bp; + break; +#endif + default: + return; + } + 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; + if (ip) { + xmep->ipver = 4; + memcpy(&xmep->client, &ip->ip_src, sizeof(ip->ip_src)); + memcpy(&xmep->server, &ip->ip_dst, sizeof(ip->ip_dst)); + } +#ifdef INET6 + else if (ip6) { + xmep->ipver = 6; + memcpy(&xmep->client, &ip6->ip6_src, sizeof(ip6->ip6_src)); + memcpy(&xmep->server, &ip6->ip6_dst, sizeof(ip6->ip6_dst)); + } +#endif xmep->proc = ntohl(rp->rm_call.cb_proc); xmep->vers = ntohl(rp->rm_call.cb_vers); } -/* Returns NFSPROC_xxx or -1 on failure */ +/* + * Returns 0 and puts NFSPROC_xxx in proc return and + * 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, +xid_map_find(const struct rpc_msg *rp, const u_char *bp, u_int32_t *proc, u_int32_t *vers) { 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; + struct ip *ip = (struct ip *)bp; +#ifdef INET6 + struct ip6_hdr *ip6 = (struct ip6_hdr *)bp; +#endif + int cmp; /* Start searching from where we last left off */ - i = xid_map_hint; + 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 (memcmp(&ip->ip_src, &xmep->server, + sizeof(ip->ip_src)) != 0 || + memcmp(&ip->ip_dst, &xmep->client, + sizeof(ip->ip_dst)) != 0) { + cmp = 0; + } + break; +#ifdef INET6 + case 6: + if (memcmp(&ip6->ip6_src, &xmep->server, + sizeof(ip6->ip6_src)) != 0 || + 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 1; + return 0; } + nextitem: if (++i >= XIDMAPSIZE) i = 0; } while (i != xid_map_hint); /* search failed */ - return (0); + return (-1); } /* @@ -812,7 +956,7 @@ parserep(register const struct rpc_msg *rp, register u_int length) * which is an "enum" and so occupies one 32-bit word. */ dp = ((const u_int32_t *)&rp->rm_reply) + 1; - TCHECK2(dp[0], 1); + TCHECK(dp[1]); len = ntohl(dp[1]); if (len >= length) return (NULL); @@ -862,42 +1006,32 @@ parserep(register const struct rpc_msg *rp, register u_int length) return (NULL); } /* successful return */ - if ((sizeof(astat) + ((u_char *)dp)) < snapend) - return ((u_int32_t *) (sizeof(astat) + ((char *)dp))); + TCHECK2(*dp, sizeof(astat)); + return ((u_int32_t *) (sizeof(astat) + ((char *)dp))); trunc: return (0); } -#define T2CHECK(p, l) if ((u_char *)(p) > ((u_char *)snapend) - l) return(0) - -/* - * Not all systems have strerror(). - */ -static const char * -strerr(int errno) -{ - return (strerror(errno)); -} - static const u_int32_t * parsestatus(const u_int32_t *dp, int *er) { - int errno; - T2CHECK(dp, 4); + int errnum; - errno = ntohl(dp[0]); + TCHECK(dp[0]); + + errnum = ntohl(dp[0]); if (er) - *er = errno; - if (errno != 0 && !qflag) { - const char *errmsg; - - errmsg = strerr(errno); - if (errmsg) - printf(" ERROR: '%s'", errmsg); - else - printf(" ERROR: %d", errno); + *er = errnum; + if (errnum != 0) { + if (!qflag) + printf(" ERROR: %s", + tok2str(status2str, "unk %d", errnum)); + nfserr = 1; + return (NULL); } return (dp + 1); +trunc: + return NULL; } static const u_int32_t * @@ -905,9 +1039,8 @@ parsefattr(const u_int32_t *dp, int verbose, int v3) { const struct nfs_fattr *fap; - T2CHECK(dp, 5 * sizeof(*dp)); - fap = (const struct nfs_fattr *)dp; + TCHECK(fap->fa_gid); if (verbose) { printf(" %s %o ids %d/%d", tok2str(type2str, "unk-ft %d ", @@ -916,22 +1049,21 @@ parsefattr(const u_int32_t *dp, int verbose, int v3) (u_int32_t)ntohl(fap->fa_uid), (u_int32_t) ntohl(fap->fa_gid)); if (v3) { - T2CHECK(dp, 7 * sizeof(*dp)); + TCHECK(fap->fa3_size); printf(" sz "); print_int64((u_int32_t *)&fap->fa3_size, UNSIGNED); putchar(' '); - } - else { - T2CHECK(dp, 6 * sizeof(*dp)); + } else { + TCHECK(fap->fa2_size); printf(" sz %d ", (u_int32_t) ntohl(fap->fa2_size)); } } /* print lots more stuff */ if (verbose > 1) { if (v3) { - T2CHECK(dp, 64); + TCHECK(fap->fa3_ctime); printf("nlink %d rdev %d/%d ", - (u_int32_t)ntohl(fap->fa_nlink), + (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 "); @@ -941,20 +1073,20 @@ parsefattr(const u_int32_t *dp, int verbose, int v3) 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 ", + printf("%u.%06u ", (u_int32_t) ntohl(fap->fa3_mtime.nfsv3_sec), (u_int32_t) ntohl(fap->fa3_mtime.nfsv3_nsec)); - printf("%u.%06u ", + printf("%u.%06u ", (u_int32_t) ntohl(fap->fa3_ctime.nfsv3_sec), (u_int32_t) ntohl(fap->fa3_ctime.nfsv3_nsec)); } else { - T2CHECK(dp, 48); + 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 ", + printf("%u.%06u ", (u_int32_t) ntohl(fap->fa2_atime.nfsv2_sec), (u_int32_t) ntohl(fap->fa2_atime.nfsv2_usec)); printf("%u.%06u ", @@ -963,10 +1095,12 @@ parsefattr(const u_int32_t *dp, int verbose, int v3) printf("%u.%06u ", (u_int32_t) ntohl(fap->fa2_ctime.nfsv2_sec), (u_int32_t) ntohl(fap->fa2_ctime.nfsv2_usec)); - } + } } return ((const u_int32_t *)((unsigned char *)dp + (v3 ? NFSX_V3FATTR : NFSX_V2FATTR))); +trunc: + return (NULL); } static int @@ -1030,7 +1164,7 @@ parsestatfs(const u_int32_t *dp, int v3) return (0); } - T2CHECK(dp, (v3 ? NFSX_V3STATFS : NFSX_V2STATFS)); + TCHECK2(dp, (v3 ? NFSX_V3STATFS : NFSX_V2STATFS)); sfsp = (const struct nfs_statfs *)dp; @@ -1053,14 +1187,16 @@ parsestatfs(const u_int32_t *dp, int v3) } } 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)); + (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)); } return (1); +trunc: + return (0); } static int @@ -1074,12 +1210,15 @@ parserddires(const u_int32_t *dp) if (qflag) return (1); - T2CHECK(dp, 12); - printf(" offset %x size %d ", ntohl(dp[0]), ntohl(dp[1])); - if (dp[2] != 0) - printf(" eof"); + TCHECK(dp[2]); + printf(" offset %x size %d ", + (u_int32_t)ntohl(dp[0]), (u_int32_t)ntohl(dp[1])); + if (dp[2] != 0) + printf(" eof"); return (1); +trunc: + return (0); } static const u_int32_t * @@ -1087,8 +1226,9 @@ parse_wcc_attr(const u_int32_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])); + printf(" mtime %u.%06u ctime %u.%06u", + (u_int32_t)ntohl(dp[2]), (u_int32_t)ntohl(dp[3]), + (u_int32_t)ntohl(dp[4]), (u_int32_t)ntohl(dp[5])); return (dp + 6); } @@ -1098,17 +1238,19 @@ parse_wcc_attr(const u_int32_t *dp) static const u_int32_t * parse_pre_op_attr(const u_int32_t *dp, int verbose) { - T2CHECK(dp, 4); + TCHECK(dp[0]); if (!ntohl(dp[0])) return (dp + 1); dp++; - T2CHECK(dp, 24); + TCHECK2(dp, 24); if (verbose > 1) { return parse_wcc_attr(dp); } else { /* If not verbose enough, just skip over wcc_attr */ return (dp + 6); } +trunc: + return (NULL); } /* @@ -1117,7 +1259,7 @@ parse_pre_op_attr(const u_int32_t *dp, int verbose) static const u_int32_t * parse_post_op_attr(const u_int32_t *dp, int verbose) { - T2CHECK(dp, 4); + TCHECK(dp[0]); if (!ntohl(dp[0])) return (dp + 1); dp++; @@ -1125,6 +1267,8 @@ parse_post_op_attr(const u_int32_t *dp, int verbose) return parsefattr(dp, verbose, 1); } else return (dp + (NFSX_V3FATTR / sizeof (u_int32_t))); +trunc: + return (NULL); } static const u_int32_t * @@ -1150,7 +1294,7 @@ parsecreateopres(const u_int32_t *dp, int verbose) if (er) dp = parse_wcc_data(dp, verbose); else { - T2CHECK(dp, 4); + TCHECK(dp[0]); if (!ntohl(dp[0])) return (dp + 1); dp++; @@ -1166,6 +1310,8 @@ parsecreateopres(const u_int32_t *dp, int verbose) } } return (dp); +trunc: + return (NULL); } static int @@ -1192,12 +1338,14 @@ parsev3rddirres(const u_int32_t *dp, int verbose) if (er) return dp; if (vflag) { - T2CHECK(dp, 8); + TCHECK(dp[1]); printf(" verf %08x%08x", dp[0], dp[1]); dp += 2; } return dp; - } +trunc: + return (NULL); +} static int parsefsinfo(const u_int32_t *dp) @@ -1212,11 +1360,10 @@ parsefsinfo(const u_int32_t *dp) if (!(dp = parse_post_op_attr(dp, vflag))) return (0); if (er) - return (1); - - T2CHECK(dp, sizeof (struct nfsv3_fsinfo)); + 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), @@ -1232,6 +1379,8 @@ parsefsinfo(const u_int32_t *dp) (u_int32_t) ntohl(sfp->fs_timedelta.nfsv3_sec), (u_int32_t) ntohl(sfp->fs_timedelta.nfsv3_nsec)); } + return (0); +trunc: return (1); } @@ -1242,7 +1391,7 @@ parsepathconf(const u_int32_t *dp) struct nfsv3_pathconf *spp; if (!(dp = parsestatus(dp, &er))) - return (0); + return (0); if (vflag) printf(" POST:"); if (!(dp = parse_post_op_attr(dp, vflag))) @@ -1250,9 +1399,8 @@ parsepathconf(const u_int32_t *dp) if (er) return (1); - T2CHECK(dp, sizeof (struct nfsv3_pathconf)); - spp = (struct nfsv3_pathconf *)dp; + TCHECK(*spp); printf(" linkmax %u namemax %u %s %s %s %s", (u_int32_t) ntohl(spp->pc_linkmax), @@ -1262,6 +1410,8 @@ parsepathconf(const u_int32_t *dp) ntohl(spp->pc_caseinsensitive) ? "igncase" : "", ntohl(spp->pc_casepreserving) ? "keepcase" : ""); return (0); +trunc: + return (1); } static void @@ -1302,7 +1452,7 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt return; } else { if (parseattrstat(dp, !qflag, 0) != 0) - return; + return; } break; @@ -1331,7 +1481,7 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt return; } else { if (parsediropres(dp) != 0) - return; + return; } break; @@ -1345,7 +1495,7 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt if (!(dp = parse_post_op_attr(dp, vflag))) break; if (!er) - printf(" c %04x", ntohl(dp[0])); + printf(" c %04x", (u_int32_t)ntohl(dp[0])); return; case NFSPROC_READLINK: @@ -1367,7 +1517,7 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt if (er) return; if (vflag) { - TCHECK2(dp[0], 8); + TCHECK(dp[1]); printf("%u bytes", (u_int32_t) ntohl(dp[0])); if (ntohl(dp[1])) printf(" EOF"); @@ -1375,7 +1525,7 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt return; } else { if (parseattrstat(dp, vflag, 0) != 0) - return; + return; } break; @@ -1389,14 +1539,15 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt if (!(dp = parse_wcc_data(dp, vflag))) break; if (er) - return; + return; if (vflag) { - TCHECK2(dp[0], 4); + TCHECK(dp[0]); printf("%u bytes", (u_int32_t) ntohl(dp[0])); if (vflag > 1) { - TCHECK2(dp[0], 4); + TCHECK(dp[1]); printf(" <%s>", - nfsv3_writemodes[ntohl(dp[1])]); + tok2str(nfsv3_writemodes, + NULL, ntohl(dp[1]))); } return; } @@ -1441,7 +1592,7 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt return; } else { if (parsestatus(dp, &er) != 0) - return; + return; } break; @@ -1475,7 +1626,7 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt return; } else { if (parsestatus(dp, &er) != 0) - return; + return; } break; @@ -1519,7 +1670,7 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt } } else { if (parsestatus(dp, &er) != 0) - return; + return; } break; @@ -1532,7 +1683,7 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt return; } else { if (parserddires(dp) != 0) - return; + return; } break; @@ -1576,7 +1727,7 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt printf(" proc-%u", proc); return; } +trunc: if (!nfserr) fputs(" [|nfs]", stdout); -trunc:; } -- cgit v1.1