X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b45a9a167ca6a3ef2752ae9d48d56ac14b001bfd..195a4cfd9de46b47ac6794930e19e38ed263b05f:/print-nfs.c diff --git a/print-nfs.c b/print-nfs.c index 4fd9c3f7..04c98bec 100644 --- a/print-nfs.c +++ b/print-nfs.c @@ -234,60 +234,60 @@ parse_sattr3(netdissect_options *ndo, const uint32_t *dp, struct nfsv3_sattr *sa3) { ND_TCHECK(dp[0]); - sa3->sa_modeset = EXTRACT_32BITS(dp); + sa3->sa_modeset = EXTRACT_BE_U_4(dp); dp++; if (sa3->sa_modeset) { ND_TCHECK(dp[0]); - sa3->sa_mode = EXTRACT_32BITS(dp); + sa3->sa_mode = EXTRACT_BE_U_4(dp); dp++; } ND_TCHECK(dp[0]); - sa3->sa_uidset = EXTRACT_32BITS(dp); + sa3->sa_uidset = EXTRACT_BE_U_4(dp); dp++; if (sa3->sa_uidset) { ND_TCHECK(dp[0]); - sa3->sa_uid = EXTRACT_32BITS(dp); + sa3->sa_uid = EXTRACT_BE_U_4(dp); dp++; } ND_TCHECK(dp[0]); - sa3->sa_gidset = EXTRACT_32BITS(dp); + sa3->sa_gidset = EXTRACT_BE_U_4(dp); dp++; if (sa3->sa_gidset) { ND_TCHECK(dp[0]); - sa3->sa_gid = EXTRACT_32BITS(dp); + sa3->sa_gid = EXTRACT_BE_U_4(dp); dp++; } ND_TCHECK(dp[0]); - sa3->sa_sizeset = EXTRACT_32BITS(dp); + sa3->sa_sizeset = EXTRACT_BE_U_4(dp); dp++; if (sa3->sa_sizeset) { ND_TCHECK(dp[0]); - sa3->sa_size = EXTRACT_32BITS(dp); + sa3->sa_size = EXTRACT_BE_U_4(dp); dp++; } ND_TCHECK(dp[0]); - sa3->sa_atimetype = EXTRACT_32BITS(dp); + sa3->sa_atimetype = EXTRACT_BE_U_4(dp); dp++; if (sa3->sa_atimetype == NFSV3SATTRTIME_TOCLIENT) { ND_TCHECK(dp[1]); - sa3->sa_atime.nfsv3_sec = EXTRACT_32BITS(dp); + sa3->sa_atime.nfsv3_sec = EXTRACT_BE_U_4(dp); dp++; - sa3->sa_atime.nfsv3_nsec = EXTRACT_32BITS(dp); + sa3->sa_atime.nfsv3_nsec = EXTRACT_BE_U_4(dp); dp++; } ND_TCHECK(dp[0]); - sa3->sa_mtimetype = EXTRACT_32BITS(dp); + sa3->sa_mtimetype = EXTRACT_BE_U_4(dp); dp++; if (sa3->sa_mtimetype == NFSV3SATTRTIME_TOCLIENT) { ND_TCHECK(dp[1]); - sa3->sa_mtime.nfsv3_sec = EXTRACT_32BITS(dp); + sa3->sa_mtime.nfsv3_sec = EXTRACT_BE_U_4(dp); dp++; - sa3->sa_mtime.nfsv3_nsec = EXTRACT_32BITS(dp); + sa3->sa_mtime.nfsv3_nsec = EXTRACT_BE_U_4(dp); dp++; } @@ -320,10 +320,10 @@ print_sattr3(netdissect_options *ndo, void nfsreply_print(netdissect_options *ndo, - register const u_char *bp, u_int length, - register const u_char *bp2) + const u_char *bp, u_int length, + const u_char *bp2) { - register const struct sunrpc_msg *rp; + const struct sunrpc_msg *rp; char srcid[20], dstid[20]; /*fits 32bit*/ nfserr = 0; /* assume no error */ @@ -333,15 +333,15 @@ nfsreply_print(netdissect_options *ndo, if (!ndo->ndo_nflag) { strlcpy(srcid, "nfs", sizeof(srcid)); snprintf(dstid, sizeof(dstid), "%u", - EXTRACT_32BITS(&rp->rm_xid)); + EXTRACT_BE_U_4(&rp->rm_xid)); } else { snprintf(srcid, sizeof(srcid), "%u", NFS_PORT); snprintf(dstid, sizeof(dstid), "%u", - EXTRACT_32BITS(&rp->rm_xid)); + EXTRACT_BE_U_4(&rp->rm_xid)); } print_nfsaddr(ndo, bp2, srcid, dstid); - nfsreply_print_noaddr(ndo, bp, length, bp2); + nfsreply_noaddr_print(ndo, bp, length, bp2); return; trunc: @@ -350,11 +350,11 @@ trunc: } void -nfsreply_print_noaddr(netdissect_options *ndo, - register const u_char *bp, u_int length, - register const u_char *bp2) +nfsreply_noaddr_print(netdissect_options *ndo, + const u_char *bp, u_int length, + const u_char *bp2) { - register const struct sunrpc_msg *rp; + const struct sunrpc_msg *rp; uint32_t proc, vers, reply_stat; enum sunrpc_reject_stat rstat; uint32_t rlow; @@ -365,7 +365,7 @@ nfsreply_print_noaddr(netdissect_options *ndo, rp = (const struct sunrpc_msg *)bp; ND_TCHECK(rp->rm_reply.rp_stat); - reply_stat = EXTRACT_32BITS(&rp->rm_reply.rp_stat); + reply_stat = EXTRACT_BE_U_4(&rp->rm_reply.rp_stat); switch (reply_stat) { case SUNRPC_MSG_ACCEPTED: @@ -377,19 +377,19 @@ nfsreply_print_noaddr(netdissect_options *ndo, case SUNRPC_MSG_DENIED: ND_PRINT((ndo, "reply ERR %u: ", length)); ND_TCHECK(rp->rm_reply.rp_reject.rj_stat); - rstat = EXTRACT_32BITS(&rp->rm_reply.rp_reject.rj_stat); + rstat = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_stat); switch (rstat) { case SUNRPC_RPC_MISMATCH: ND_TCHECK(rp->rm_reply.rp_reject.rj_vers.high); - rlow = EXTRACT_32BITS(&rp->rm_reply.rp_reject.rj_vers.low); - rhigh = EXTRACT_32BITS(&rp->rm_reply.rp_reject.rj_vers.high); + rlow = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_vers.low); + rhigh = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_vers.high); ND_PRINT((ndo, "RPC Version mismatch (%u-%u)", rlow, rhigh)); break; case SUNRPC_AUTH_ERROR: ND_TCHECK(rp->rm_reply.rp_reject.rj_why); - rwhy = EXTRACT_32BITS(&rp->rm_reply.rp_reject.rj_why); + rwhy = EXTRACT_BE_U_4(&rp->rm_reply.rp_reject.rj_why); ND_PRINT((ndo, "Auth %s", tok2str(sunrpc_auth_str, "Invalid failure code %u", rwhy))); break; @@ -416,24 +416,24 @@ trunc: */ static const uint32_t * parsereq(netdissect_options *ndo, - register const struct sunrpc_msg *rp, register u_int length) + const struct sunrpc_msg *rp, u_int length) { - register const uint32_t *dp; - register u_int len; + const uint32_t *dp; + u_int len; /* * find the start of the req data (if we captured it) */ dp = (const uint32_t *)&rp->rm_call.cb_cred; ND_TCHECK(dp[1]); - len = EXTRACT_32BITS(&dp[1]); + len = EXTRACT_BE_U_4(dp + 1); if (len < length) { dp += (len + (2 * sizeof(*dp) + 3)) / sizeof(*dp); ND_TCHECK(dp[1]); - len = EXTRACT_32BITS(&dp[1]); + len = EXTRACT_BE_U_4(dp + 1); if (len < length) { dp += (len + (2 * sizeof(*dp) + 3)) / sizeof(*dp); - ND_TCHECK2(dp[0], 0); + ND_TCHECK_LEN(dp, 0); return (dp); } } @@ -447,18 +447,18 @@ trunc: */ static const uint32_t * parsefh(netdissect_options *ndo, - register const uint32_t *dp, int v3) + const uint32_t *dp, int v3) { u_int len; if (v3) { ND_TCHECK(dp[0]); - len = EXTRACT_32BITS(dp) / 4; + len = EXTRACT_BE_U_4(dp) / 4; dp++; } else len = NFSX_V2FH / 4; - if (ND_TTEST2(*dp, len * sizeof(*dp))) { + if (ND_TTEST_LEN(dp, len * sizeof(*dp))) { nfs_printfh(ndo, dp, len); return (dp + len); } @@ -472,19 +472,19 @@ trunc: */ static const uint32_t * parsefn(netdissect_options *ndo, - register const uint32_t *dp) + const uint32_t *dp) { - register uint32_t len; - register const u_char *cp; + uint32_t len; + const u_char *cp; /* Bail if we don't have the string length */ ND_TCHECK(*dp); - /* Fetch string length; convert to host order */ - len = *dp++; - NTOHL(len); + /* Fetch big-endian string length */ + len = EXTRACT_BE_U_4(dp); + dp++; - ND_TCHECK2(*dp, ((len + 3) & ~3)); + ND_TCHECK_LEN(dp, ((len + 3) & ~3)); cp = (const u_char *)dp; /* Update 32-bit pointer (NFS filenames padded to 32-bit boundaries) */ @@ -508,7 +508,7 @@ trunc: */ static const uint32_t * parsefhn(netdissect_options *ndo, - register const uint32_t *dp, int v3) + const uint32_t *dp, int v3) { dp = parsefh(ndo, dp, v3); if (dp == NULL) @@ -518,12 +518,12 @@ parsefhn(netdissect_options *ndo, } void -nfsreq_print_noaddr(netdissect_options *ndo, - register const u_char *bp, u_int length, - register const u_char *bp2) +nfsreq_noaddr_print(netdissect_options *ndo, + const u_char *bp, u_int length, + const u_char *bp2) { - register const struct sunrpc_msg *rp; - register const uint32_t *dp; + const struct sunrpc_msg *rp; + const uint32_t *dp; nfs_type type; int v3; uint32_t proc; @@ -537,8 +537,8 @@ nfsreq_print_noaddr(netdissect_options *ndo, if (!xid_map_enter(ndo, rp, bp2)) /* record proc number for later on */ goto trunc; - v3 = (EXTRACT_32BITS(&rp->rm_call.cb_vers) == NFS_VER3); - proc = EXTRACT_32BITS(&rp->rm_call.cb_proc); + v3 = (EXTRACT_BE_U_4(&rp->rm_call.cb_vers) == NFS_VER3); + proc = EXTRACT_BE_U_4(&rp->rm_call.cb_proc); if (!v3 && proc < NFS_NPROCS) proc = nfsv3_procid[proc]; @@ -571,7 +571,7 @@ nfsreq_print_noaddr(netdissect_options *ndo, if ((dp = parsereq(ndo, rp, length)) != NULL && (dp = parsefh(ndo, dp, v3)) != NULL) { ND_TCHECK(dp[0]); - access_flags = EXTRACT_32BITS(&dp[0]); + access_flags = EXTRACT_BE_U_4(dp); if (access_flags & ~NFSV3ACCESS_FULL) { /* NFSV3ACCESS definitions aren't up to date */ ND_PRINT((ndo, " %04x", access_flags)); @@ -612,13 +612,13 @@ nfsreq_print_noaddr(netdissect_options *ndo, if (v3) { ND_TCHECK(dp[2]); ND_PRINT((ndo, " %u bytes @ %" PRIu64, - EXTRACT_32BITS(&dp[2]), - EXTRACT_64BITS(&dp[0]))); + EXTRACT_BE_U_4(dp + 2), + EXTRACT_BE_U_8(dp))); } else { ND_TCHECK(dp[1]); ND_PRINT((ndo, " %u bytes @ %u", - EXTRACT_32BITS(&dp[1]), - EXTRACT_32BITS(&dp[0]))); + EXTRACT_BE_U_4(dp + 1), + EXTRACT_BE_U_4(dp))); } return; } @@ -630,21 +630,21 @@ nfsreq_print_noaddr(netdissect_options *ndo, if (v3) { ND_TCHECK(dp[4]); ND_PRINT((ndo, " %u (%u) bytes @ %" PRIu64, - EXTRACT_32BITS(&dp[4]), - EXTRACT_32BITS(&dp[2]), - EXTRACT_64BITS(&dp[0]))); + EXTRACT_BE_U_4(dp + 4), + EXTRACT_BE_U_4(dp + 2), + EXTRACT_BE_U_8(dp))); if (ndo->ndo_vflag) { ND_PRINT((ndo, " <%s>", tok2str(nfsv3_writemodes, - NULL, EXTRACT_32BITS(&dp[3])))); + NULL, EXTRACT_BE_U_4(dp + 3)))); } } else { ND_TCHECK(dp[3]); ND_PRINT((ndo, " %u (%u) bytes @ %u (%u)", - EXTRACT_32BITS(&dp[3]), - EXTRACT_32BITS(&dp[2]), - EXTRACT_32BITS(&dp[1]), - EXTRACT_32BITS(&dp[0]))); + EXTRACT_BE_U_4(dp + 3), + EXTRACT_BE_U_4(dp + 2), + EXTRACT_BE_U_4(dp + 1), + EXTRACT_BE_U_4(dp))); } return; } @@ -668,7 +668,7 @@ nfsreq_print_noaddr(netdissect_options *ndo, if ((dp = parsereq(ndo, rp, length)) != NULL && (dp = parsefhn(ndo, dp, v3)) != NULL) { ND_TCHECK(*dp); - type = (nfs_type)EXTRACT_32BITS(dp); + type = (nfs_type) EXTRACT_BE_U_4(dp); dp++; if ((dp = parse_sattr3(ndo, dp, &sa3)) == NULL) break; @@ -676,8 +676,8 @@ nfsreq_print_noaddr(netdissect_options *ndo, if (ndo->ndo_vflag && (type == NFCHR || type == NFBLK)) { ND_TCHECK(dp[1]); ND_PRINT((ndo, " %u/%u", - EXTRACT_32BITS(&dp[0]), - EXTRACT_32BITS(&dp[1]))); + EXTRACT_BE_U_4(dp), + EXTRACT_BE_U_4(dp + 1))); dp += 2; } if (ndo->ndo_vflag) @@ -714,10 +714,12 @@ nfsreq_print_noaddr(netdissect_options *ndo, * offset cookie here. */ ND_PRINT((ndo, " %u bytes @ %" PRId64, - EXTRACT_32BITS(&dp[4]), - EXTRACT_64BITS(&dp[0]))); + EXTRACT_BE_U_4(dp + 4), + EXTRACT_BE_U_8(dp))); if (ndo->ndo_vflag) - ND_PRINT((ndo, " verf %08x%08x", dp[2], dp[3])); + ND_PRINT((ndo, " verf %08x%08x", + EXTRACT_BE_U_4(dp + 2), + EXTRACT_BE_U_4(dp + 3))); } else { ND_TCHECK(dp[1]); /* @@ -725,8 +727,8 @@ nfsreq_print_noaddr(netdissect_options *ndo, * common, but offsets > 2^31 aren't. */ ND_PRINT((ndo, " %u bytes @ %d", - EXTRACT_32BITS(&dp[1]), - EXTRACT_32BITS(&dp[0]))); + EXTRACT_BE_U_4(dp + 1), + EXTRACT_BE_U_4(dp))); } return; } @@ -741,12 +743,14 @@ nfsreq_print_noaddr(netdissect_options *ndo, * cookie here. */ ND_PRINT((ndo, " %u bytes @ %" PRId64, - EXTRACT_32BITS(&dp[4]), - EXTRACT_64BITS(&dp[0]))); + EXTRACT_BE_U_4(dp + 4), + EXTRACT_BE_U_8(dp))); if (ndo->ndo_vflag) { ND_TCHECK(dp[5]); ND_PRINT((ndo, " max %u verf %08x%08x", - EXTRACT_32BITS(&dp[5]), dp[2], dp[3])); + EXTRACT_BE_U_4(dp + 5), + EXTRACT_BE_U_4(dp + 2), + EXTRACT_BE_U_4(dp + 3))); } return; } @@ -757,8 +761,8 @@ nfsreq_print_noaddr(netdissect_options *ndo, (dp = parsefh(ndo, dp, v3)) != NULL) { ND_TCHECK(dp[2]); ND_PRINT((ndo, " %u bytes @ %" PRIu64, - EXTRACT_32BITS(&dp[2]), - EXTRACT_64BITS(&dp[0]))); + EXTRACT_BE_U_4(dp + 2), + EXTRACT_BE_U_8(dp))); return; } break; @@ -783,7 +787,7 @@ trunc: */ static void nfs_printfh(netdissect_options *ndo, - register const uint32_t *dp, const u_int len) + const uint32_t *dp, const u_int len) { my_fsid fsid; uint32_t ino; @@ -796,7 +800,7 @@ nfs_printfh(netdissect_options *ndo, ND_PRINT((ndo, " fh[")); for (i=0; irm_call.cb_vers)) + if (!ND_TTEST(rp->rm_call.cb_proc)) return (0); switch (IP_V((const struct ip *)bp)) { case 4: @@ -899,12 +903,8 @@ xid_map_enter(netdissect_options *ndo, UNALIGNED_MEMCPY(&xmep->client, &ip6->ip6_src, sizeof(ip6->ip6_src)); UNALIGNED_MEMCPY(&xmep->server, &ip6->ip6_dst, sizeof(ip6->ip6_dst)); } - if (!ND_TTEST(rp->rm_call.cb_proc)) - return (0); - xmep->proc = EXTRACT_32BITS(&rp->rm_call.cb_proc); - if (!ND_TTEST(rp->rm_call.cb_vers)) - return (0); - xmep->vers = EXTRACT_32BITS(&rp->rm_call.cb_vers); + xmep->proc = EXTRACT_BE_U_4(&rp->rm_call.cb_proc); + xmep->vers = EXTRACT_BE_U_4(&rp->rm_call.cb_vers); return (1); } @@ -978,9 +978,9 @@ xid_map_find(const struct sunrpc_msg *rp, const u_char *bp, uint32_t *proc, */ static const uint32_t * parserep(netdissect_options *ndo, - register const struct sunrpc_msg *rp, register u_int length) + const struct sunrpc_msg *rp, u_int length) { - register const uint32_t *dp; + const uint32_t *dp; u_int len; enum sunrpc_accept_stat astat; @@ -1001,7 +1001,7 @@ parserep(netdissect_options *ndo, */ dp = ((const uint32_t *)&rp->rm_reply) + 1; ND_TCHECK(dp[1]); - len = EXTRACT_32BITS(&dp[1]); + len = EXTRACT_BE_U_4(dp + 1); if (len >= length) return (NULL); /* @@ -1013,14 +1013,14 @@ parserep(netdissect_options *ndo, * now we can check the ar_stat field */ ND_TCHECK(dp[0]); - astat = (enum sunrpc_accept_stat) EXTRACT_32BITS(dp); + astat = (enum sunrpc_accept_stat) EXTRACT_BE_U_4(dp); if (astat != SUNRPC_SUCCESS) { ND_PRINT((ndo, " %s", tok2str(sunrpc_str, "ar_stat %d", astat))); nfserr = 1; /* suppress trunc string */ return (NULL); } /* successful return */ - ND_TCHECK2(*dp, sizeof(astat)); + ND_TCHECK_LEN(dp, sizeof(astat)); return ((const uint32_t *) (sizeof(astat) + ((const char *)dp))); trunc: return (0); @@ -1034,7 +1034,7 @@ parsestatus(netdissect_options *ndo, ND_TCHECK(dp[0]); - errnum = EXTRACT_32BITS(&dp[0]); + errnum = EXTRACT_BE_U_4(dp); if (er) *er = errnum; if (errnum != 0) { @@ -1059,17 +1059,17 @@ parsefattr(netdissect_options *ndo, if (verbose) { ND_PRINT((ndo, " %s %o ids %d/%d", tok2str(type2str, "unk-ft %d ", - EXTRACT_32BITS(&fap->fa_type)), - EXTRACT_32BITS(&fap->fa_mode), - EXTRACT_32BITS(&fap->fa_uid), - EXTRACT_32BITS(&fap->fa_gid))); + EXTRACT_BE_U_4(&fap->fa_type)), + EXTRACT_BE_U_4(&fap->fa_mode), + EXTRACT_BE_U_4(&fap->fa_uid), + EXTRACT_BE_U_4(&fap->fa_gid))); if (v3) { ND_TCHECK(fap->fa3_size); ND_PRINT((ndo, " sz %" PRIu64, - EXTRACT_64BITS((const uint32_t *)&fap->fa3_size))); + EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_size))); } else { ND_TCHECK(fap->fa2_size); - ND_PRINT((ndo, " sz %d", EXTRACT_32BITS(&fap->fa2_size))); + ND_PRINT((ndo, " sz %d", EXTRACT_BE_U_4(&fap->fa2_size))); } } /* print lots more stuff */ @@ -1077,38 +1077,38 @@ parsefattr(netdissect_options *ndo, if (v3) { ND_TCHECK(fap->fa3_ctime); ND_PRINT((ndo, " nlink %d rdev %d/%d", - EXTRACT_32BITS(&fap->fa_nlink), - EXTRACT_32BITS(&fap->fa3_rdev.specdata1), - EXTRACT_32BITS(&fap->fa3_rdev.specdata2))); + EXTRACT_BE_U_4(&fap->fa_nlink), + EXTRACT_BE_U_4(&fap->fa3_rdev.specdata1), + EXTRACT_BE_U_4(&fap->fa3_rdev.specdata2))); ND_PRINT((ndo, " fsid %" PRIx64, - EXTRACT_64BITS((const uint32_t *)&fap->fa3_fsid))); + EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_fsid))); ND_PRINT((ndo, " fileid %" PRIx64, - EXTRACT_64BITS((const uint32_t *)&fap->fa3_fileid))); + EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_fileid))); ND_PRINT((ndo, " a/m/ctime %u.%06u", - EXTRACT_32BITS(&fap->fa3_atime.nfsv3_sec), - EXTRACT_32BITS(&fap->fa3_atime.nfsv3_nsec))); + EXTRACT_BE_U_4(&fap->fa3_atime.nfsv3_sec), + EXTRACT_BE_U_4(&fap->fa3_atime.nfsv3_nsec))); ND_PRINT((ndo, " %u.%06u", - EXTRACT_32BITS(&fap->fa3_mtime.nfsv3_sec), - EXTRACT_32BITS(&fap->fa3_mtime.nfsv3_nsec))); + EXTRACT_BE_U_4(&fap->fa3_mtime.nfsv3_sec), + EXTRACT_BE_U_4(&fap->fa3_mtime.nfsv3_nsec))); ND_PRINT((ndo, " %u.%06u", - EXTRACT_32BITS(&fap->fa3_ctime.nfsv3_sec), - EXTRACT_32BITS(&fap->fa3_ctime.nfsv3_nsec))); + EXTRACT_BE_U_4(&fap->fa3_ctime.nfsv3_sec), + EXTRACT_BE_U_4(&fap->fa3_ctime.nfsv3_nsec))); } else { ND_TCHECK(fap->fa2_ctime); ND_PRINT((ndo, " nlink %d rdev 0x%x fsid 0x%x nodeid 0x%x a/m/ctime", - EXTRACT_32BITS(&fap->fa_nlink), - EXTRACT_32BITS(&fap->fa2_rdev), - EXTRACT_32BITS(&fap->fa2_fsid), - EXTRACT_32BITS(&fap->fa2_fileid))); + EXTRACT_BE_U_4(&fap->fa_nlink), + EXTRACT_BE_U_4(&fap->fa2_rdev), + EXTRACT_BE_U_4(&fap->fa2_fsid), + EXTRACT_BE_U_4(&fap->fa2_fileid))); ND_PRINT((ndo, " %u.%06u", - EXTRACT_32BITS(&fap->fa2_atime.nfsv2_sec), - EXTRACT_32BITS(&fap->fa2_atime.nfsv2_usec))); + EXTRACT_BE_U_4(&fap->fa2_atime.nfsv2_sec), + EXTRACT_BE_U_4(&fap->fa2_atime.nfsv2_usec))); ND_PRINT((ndo, " %u.%06u", - EXTRACT_32BITS(&fap->fa2_mtime.nfsv2_sec), - EXTRACT_32BITS(&fap->fa2_mtime.nfsv2_usec))); + EXTRACT_BE_U_4(&fap->fa2_mtime.nfsv2_sec), + EXTRACT_BE_U_4(&fap->fa2_mtime.nfsv2_usec))); ND_PRINT((ndo, " %u.%06u", - EXTRACT_32BITS(&fap->fa2_ctime.nfsv2_sec), - EXTRACT_32BITS(&fap->fa2_ctime.nfsv2_usec))); + EXTRACT_BE_U_4(&fap->fa2_ctime.nfsv2_sec), + EXTRACT_BE_U_4(&fap->fa2_ctime.nfsv2_usec))); } } return ((const uint32_t *)((const unsigned char *)dp + @@ -1190,29 +1190,29 @@ parsestatfs(netdissect_options *ndo, return (0); } - ND_TCHECK2(*dp, (v3 ? NFSX_V3STATFS : NFSX_V2STATFS)); + ND_TCHECK_LEN(dp, (v3 ? NFSX_V3STATFS : NFSX_V2STATFS)); sfsp = (const struct nfs_statfs *)dp; if (v3) { ND_PRINT((ndo, " tbytes %" PRIu64 " fbytes %" PRIu64 " abytes %" PRIu64, - EXTRACT_64BITS((const uint32_t *)&sfsp->sf_tbytes), - EXTRACT_64BITS((const uint32_t *)&sfsp->sf_fbytes), - EXTRACT_64BITS((const uint32_t *)&sfsp->sf_abytes))); + EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_tbytes), + EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_fbytes), + EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_abytes))); if (ndo->ndo_vflag) { ND_PRINT((ndo, " tfiles %" PRIu64 " ffiles %" PRIu64 " afiles %" PRIu64 " invar %u", - EXTRACT_64BITS((const uint32_t *)&sfsp->sf_tfiles), - EXTRACT_64BITS((const uint32_t *)&sfsp->sf_ffiles), - EXTRACT_64BITS((const uint32_t *)&sfsp->sf_afiles), - EXTRACT_32BITS(&sfsp->sf_invarsec))); + EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_tfiles), + EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_ffiles), + EXTRACT_BE_U_8((const uint32_t *)&sfsp->sf_afiles), + EXTRACT_BE_U_4(&sfsp->sf_invarsec))); } } else { ND_PRINT((ndo, " tsize %d bsize %d blocks %d bfree %d bavail %d", - EXTRACT_32BITS(&sfsp->sf_tsize), - EXTRACT_32BITS(&sfsp->sf_bsize), - EXTRACT_32BITS(&sfsp->sf_blocks), - EXTRACT_32BITS(&sfsp->sf_bfree), - EXTRACT_32BITS(&sfsp->sf_bavail))); + EXTRACT_BE_U_4(&sfsp->sf_tsize), + EXTRACT_BE_U_4(&sfsp->sf_bsize), + EXTRACT_BE_U_4(&sfsp->sf_blocks), + EXTRACT_BE_U_4(&sfsp->sf_bfree), + EXTRACT_BE_U_4(&sfsp->sf_bavail))); } return (1); @@ -1236,8 +1236,8 @@ parserddires(netdissect_options *ndo, ND_TCHECK(dp[2]); ND_PRINT((ndo, " offset 0x%x size %d ", - EXTRACT_32BITS(&dp[0]), EXTRACT_32BITS(&dp[1]))); - if (dp[2] != 0) + EXTRACT_BE_U_4(dp), EXTRACT_BE_U_4(dp + 1))); + if (EXTRACT_BE_U_4(dp + 2) != 0) ND_PRINT((ndo, " eof")); return (1); @@ -1250,10 +1250,10 @@ parse_wcc_attr(netdissect_options *ndo, const uint32_t *dp) { /* Our caller has already checked this */ - ND_PRINT((ndo, " sz %" PRIu64, EXTRACT_64BITS(&dp[0]))); + ND_PRINT((ndo, " sz %" PRIu64, EXTRACT_BE_U_8(dp))); ND_PRINT((ndo, " mtime %u.%06u ctime %u.%06u", - EXTRACT_32BITS(&dp[2]), EXTRACT_32BITS(&dp[3]), - EXTRACT_32BITS(&dp[4]), EXTRACT_32BITS(&dp[5]))); + EXTRACT_BE_U_4(dp + 2), EXTRACT_BE_U_4(dp + 3), + EXTRACT_BE_U_4(dp + 4), EXTRACT_BE_U_4(dp + 5))); return (dp + 6); } @@ -1265,10 +1265,10 @@ parse_pre_op_attr(netdissect_options *ndo, const uint32_t *dp, int verbose) { ND_TCHECK(dp[0]); - if (!EXTRACT_32BITS(&dp[0])) + if (!EXTRACT_BE_U_4(dp)) return (dp + 1); dp++; - ND_TCHECK2(*dp, 24); + ND_TCHECK_LEN(dp, 24); if (verbose > 1) { return parse_wcc_attr(ndo, dp); } else { @@ -1287,7 +1287,7 @@ parse_post_op_attr(netdissect_options *ndo, const uint32_t *dp, int verbose) { ND_TCHECK(dp[0]); - if (!EXTRACT_32BITS(&dp[0])) + if (!EXTRACT_BE_U_4(dp)) return (dp + 1); dp++; if (verbose) { @@ -1324,7 +1324,7 @@ parsecreateopres(netdissect_options *ndo, dp = parse_wcc_data(ndo, dp, verbose); else { ND_TCHECK(dp[0]); - if (!EXTRACT_32BITS(&dp[0])) + if (!EXTRACT_BE_U_4(dp)) return (dp + 1); dp++; if (!(dp = parsefh(ndo, dp, 1))) @@ -1370,7 +1370,8 @@ parsev3rddirres(netdissect_options *ndo, return dp; if (ndo->ndo_vflag) { ND_TCHECK(dp[1]); - ND_PRINT((ndo, " verf %08x%08x", dp[0], dp[1])); + ND_PRINT((ndo, " verf %08x%08x", + EXTRACT_BE_U_4(dp), EXTRACT_BE_U_4(dp + 1))); dp += 2; } return dp; @@ -1397,19 +1398,19 @@ parsefsinfo(netdissect_options *ndo, sfp = (const struct nfsv3_fsinfo *)dp; ND_TCHECK(*sfp); ND_PRINT((ndo, " rtmax %u rtpref %u wtmax %u wtpref %u dtpref %u", - EXTRACT_32BITS(&sfp->fs_rtmax), - EXTRACT_32BITS(&sfp->fs_rtpref), - EXTRACT_32BITS(&sfp->fs_wtmax), - EXTRACT_32BITS(&sfp->fs_wtpref), - EXTRACT_32BITS(&sfp->fs_dtpref))); + EXTRACT_BE_U_4(&sfp->fs_rtmax), + EXTRACT_BE_U_4(&sfp->fs_rtpref), + EXTRACT_BE_U_4(&sfp->fs_wtmax), + EXTRACT_BE_U_4(&sfp->fs_wtpref), + EXTRACT_BE_U_4(&sfp->fs_dtpref))); if (ndo->ndo_vflag) { ND_PRINT((ndo, " rtmult %u wtmult %u maxfsz %" PRIu64, - EXTRACT_32BITS(&sfp->fs_rtmult), - EXTRACT_32BITS(&sfp->fs_wtmult), - EXTRACT_64BITS((const uint32_t *)&sfp->fs_maxfilesize))); + EXTRACT_BE_U_4(&sfp->fs_rtmult), + EXTRACT_BE_U_4(&sfp->fs_wtmult), + EXTRACT_BE_U_8((const uint32_t *)&sfp->fs_maxfilesize))); ND_PRINT((ndo, " delta %u.%06u ", - EXTRACT_32BITS(&sfp->fs_timedelta.nfsv3_sec), - EXTRACT_32BITS(&sfp->fs_timedelta.nfsv3_nsec))); + EXTRACT_BE_U_4(&sfp->fs_timedelta.nfsv3_sec), + EXTRACT_BE_U_4(&sfp->fs_timedelta.nfsv3_nsec))); } return (1); trunc: @@ -1436,12 +1437,12 @@ parsepathconf(netdissect_options *ndo, ND_TCHECK(*spp); ND_PRINT((ndo, " linkmax %u namemax %u %s %s %s %s", - EXTRACT_32BITS(&spp->pc_linkmax), - EXTRACT_32BITS(&spp->pc_namemax), - EXTRACT_32BITS(&spp->pc_notrunc) ? "notrunc" : "", - EXTRACT_32BITS(&spp->pc_chownrestricted) ? "chownres" : "", - EXTRACT_32BITS(&spp->pc_caseinsensitive) ? "igncase" : "", - EXTRACT_32BITS(&spp->pc_casepreserving) ? "keepcase" : "")); + EXTRACT_BE_U_4(&spp->pc_linkmax), + EXTRACT_BE_U_4(&spp->pc_namemax), + EXTRACT_BE_U_4(&spp->pc_notrunc) ? "notrunc" : "", + EXTRACT_BE_U_4(&spp->pc_chownrestricted) ? "chownres" : "", + EXTRACT_BE_U_4(&spp->pc_caseinsensitive) ? "igncase" : "", + EXTRACT_BE_U_4(&spp->pc_casepreserving) ? "keepcase" : "")); return (1); trunc: return (0); @@ -1451,8 +1452,8 @@ static void interp_reply(netdissect_options *ndo, const struct sunrpc_msg *rp, uint32_t proc, uint32_t vers, int length) { - register const uint32_t *dp; - register int v3; + const uint32_t *dp; + int v3; int er; v3 = (vers == NFS_VER3); @@ -1520,7 +1521,7 @@ interp_reply(netdissect_options *ndo, break; if (!er) { ND_TCHECK(dp[0]); - ND_PRINT((ndo, " c %04x", EXTRACT_32BITS(&dp[0]))); + ND_PRINT((ndo, " c %04x", EXTRACT_BE_U_4(dp))); } return; @@ -1542,8 +1543,8 @@ interp_reply(netdissect_options *ndo, return; if (ndo->ndo_vflag) { ND_TCHECK(dp[1]); - ND_PRINT((ndo, " %u bytes", EXTRACT_32BITS(&dp[0]))); - if (EXTRACT_32BITS(&dp[1])) + ND_PRINT((ndo, " %u bytes", EXTRACT_BE_U_4(dp))); + if (EXTRACT_BE_U_4(dp + 1)) ND_PRINT((ndo, " EOF")); } return; @@ -1565,12 +1566,12 @@ interp_reply(netdissect_options *ndo, return; if (ndo->ndo_vflag) { ND_TCHECK(dp[0]); - ND_PRINT((ndo, " %u bytes", EXTRACT_32BITS(&dp[0]))); + ND_PRINT((ndo, " %u bytes", EXTRACT_BE_U_4(dp))); if (ndo->ndo_vflag > 1) { ND_TCHECK(dp[1]); ND_PRINT((ndo, " <%s>", tok2str(nfsv3_writemodes, - NULL, EXTRACT_32BITS(&dp[1])))); + NULL, EXTRACT_BE_U_4(dp + 1)))); } return; }