X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/8b67f771343e94182b048b0cae3ffe164dc37bb9..3ece7fe0f6601c846a38d4098e438ef720ddd108:/print-nfs.c diff --git a/print-nfs.c b/print-nfs.c index ad1cbb32..b02438be 100644 --- a/print-nfs.c +++ b/print-nfs.c @@ -21,29 +21,17 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.84 2000-09-28 06:43:03 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.95 2002-08-01 08:53:21 risso Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include -#include -#include - -struct mbuf; -struct rtentry; - -#include -#include -#ifdef INET6 -#include -#endif +#include #include -#include #include #include #include @@ -55,6 +43,9 @@ struct rtentry; #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 u_char *); @@ -172,7 +163,7 @@ static struct tok type2str[] = { * * Assume that a system that has INT64_FORMAT defined, has a 64-bit * integer datatype and can print it. - */ + */ #define UNSIGNED 0 #define SIGNED 1 @@ -227,7 +218,7 @@ print_nfsaddr(const u_char *bp, const char *s, const char *d) #endif srcaddr[0] = dstaddr[0] = '\0'; - switch (((struct ip *)bp)->ip_v) { + switch (IP_V((struct ip *)bp)) { case 4: ip = (struct ip *)bp; strlcpy(srcaddr, ipaddr_string(&ip->ip_src), sizeof(srcaddr)); @@ -717,10 +708,16 @@ nfsreq_print(register const u_char *bp, u_int length, case NFSPROC_FSINFO: printf(" fsinfo"); + if ((dp = parsereq(rp, length)) != NULL && + parsefh(dp, v3) != NULL) + return; break; case NFSPROC_PATHCONF: printf(" pathconf"); + if ((dp = parsereq(rp, length)) != NULL && + parsefh(dp, v3) != NULL) + return; break; case NFSPROC_COMMIT: @@ -757,9 +754,10 @@ nfs_printfh(register const u_int32_t *dp, const u_int len) { my_fsid fsid; ino_t ino; - char *sfsname = NULL; + const char *sfsname = NULL; + char *spacep; - 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 */ @@ -769,9 +767,9 @@ nfs_printfh(register const u_int32_t *dp, const u_int len) strncpy(temp, sfsname, NFSX_V3FHMAX); temp[sizeof(temp) - 1] = '\0'; /* Remove trailing spaces */ - sfsname = strchr(temp, ' '); - if (sfsname) - *sfsname = 0; + spacep = strchr(temp, ' '); + if (spacep) + *spacep = '\0'; (void)printf(" fh %s/", temp); } else { @@ -780,7 +778,7 @@ nfs_printfh(register const u_int32_t *dp, const u_int len) } if(fsid.Fsid_dev.Minor == 257 && uflag) - /* Print the undecoded handle */ + /* Print the undecoded handle */ (void)printf("%s", fsid.Opaque_Handle); else (void)printf("%ld", (long) ino); @@ -828,7 +826,7 @@ xid_map_enter(const struct rpc_msg *rp, const u_char *bp) #endif struct xid_map_entry *xmep; - switch (((struct ip *)bp)->ip_v) { + switch (IP_V((struct ip *)bp)) { case 4: ip = (struct ip *)bp; break; @@ -881,11 +879,11 @@ xid_map_find(const struct rpc_msg *rp, const u_char *bp, u_int32_t *proc, int cmp; /* Start searching from where we last left off */ - i = xid_map_hint; + i = xid_map_hint; do { xmep = &xid_map[i]; cmp = 1; - if (xmep->ipver != ip->ip_v || xmep->xid != xid) + if (xmep->ipver != IP_V(ip) || xmep->xid != xid) goto nextitem; switch (xmep->ipver) { case 4: @@ -1028,7 +1026,6 @@ parsestatus(const u_int32_t *dp, int *er) printf(" ERROR: %s", tok2str(status2str, "unk %d", errnum)); nfserr = 1; - return (NULL); } return (dp + 1); trunc: @@ -1110,8 +1107,10 @@ parseattrstat(const u_int32_t *dp, int verbose, int v3) int er; dp = parsestatus(dp, &er); - if (dp == NULL || er) + if (dp == NULL) return (0); + if (er) + return (1); return (parsefattr(dp, verbose, v3) != NULL); } @@ -1121,8 +1120,10 @@ parsediropres(const u_int32_t *dp) { int er; - if (!(dp = parsestatus(dp, &er)) || er) + if (!(dp = parsestatus(dp, &er))) return (0); + if (er) + return (1); dp = parsefh(dp, 0); if (dp == NULL) @@ -1137,8 +1138,10 @@ parselinkres(const u_int32_t *dp, int v3) int er; dp = parsestatus(dp, &er); - if (dp == NULL || er) + if (dp == NULL) return(0); + if (er) + return(1); if (v3 && !(dp = parse_post_op_attr(dp, vflag))) return (0); putchar(' '); @@ -1152,8 +1155,10 @@ parsestatfs(const u_int32_t *dp, int v3) int er; dp = parsestatus(dp, &er); - if (dp == NULL || (!v3 && er)) + if (dp == NULL) return (0); + if (!v3 && er) + return (1); if (qflag) return(1); @@ -1165,7 +1170,7 @@ parsestatfs(const u_int32_t *dp, int v3) return (0); } - TCHECK2(dp, (v3 ? NFSX_V3STATFS : NFSX_V2STATFS)); + TCHECK2(*dp, (v3 ? NFSX_V3STATFS : NFSX_V2STATFS)); sfsp = (const struct nfs_statfs *)dp; @@ -1206,8 +1211,10 @@ parserddires(const u_int32_t *dp) int er; dp = parsestatus(dp, &er); - if (dp == 0 || er) + if (dp == NULL) return (0); + if (er) + return (1); if (qflag) return (1); @@ -1243,7 +1250,7 @@ parse_pre_op_attr(const u_int32_t *dp, int verbose) if (!ntohl(dp[0])) return (dp + 1); dp++; - TCHECK2(dp, 24); + TCHECK2(*dp, 24); if (verbose > 1) { return parse_wcc_attr(dp); } else { @@ -1380,9 +1387,9 @@ 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); +trunc: + return (0); } static int @@ -1410,9 +1417,9 @@ parsepathconf(const u_int32_t *dp) ntohl(spp->pc_chownrestricted) ? "chownres" : "", ntohl(spp->pc_caseinsensitive) ? "igncase" : "", ntohl(spp->pc_casepreserving) ? "keepcase" : ""); - return (0); -trunc: return (1); +trunc: + return (0); } static void @@ -1488,7 +1495,8 @@ interp_reply(const struct rpc_msg *rp, u_int32_t proc, u_int32_t vers, int lengt case NFSPROC_ACCESS: printf(" access"); - dp = parserep(rp, length); + if (!(dp = parserep(rp, length))) + break; if (!(dp = parsestatus(dp, &er))) break; if (vflag)