* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+/* \summary: Network File System (NFS) printer */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <stdio.h>
#include <string.h>
-#include "interface.h"
+#include "netdissect.h"
#include "addrtoname.h"
#include "extract.h"
#include "nfsfh.h"
#include "ip.h"
-#ifdef INET6
#include "ip6.h"
-#endif
#include "rpc_auth.h"
#include "rpc_msg.h"
/*
* Mapping of old NFS Version 2 RPC numbers to generic numbers.
*/
-uint32_t nfsv3_procid[NFS_NPROCS] = {
+static uint32_t nfsv3_procid[NFS_NPROCS] = {
NFSPROC_NULL,
NFSPROC_GETATTR,
NFSPROC_SETATTR,
print_nfsaddr(netdissect_options *ndo,
const u_char *bp, const char *s, const char *d)
{
- struct ip *ip;
-#ifdef INET6
- struct ip6_hdr *ip6;
+ const struct ip *ip;
+ 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
srcaddr[0] = dstaddr[0] = '\0';
- switch (IP_V((struct ip *)bp)) {
+ switch (IP_V((const struct ip *)bp)) {
case 4:
- ip = (struct ip *)bp;
+ ip = (const struct ip *)bp;
strlcpy(srcaddr, ipaddr_string(ndo, &ip->ip_src), sizeof(srcaddr));
strlcpy(dstaddr, ipaddr_string(ndo, &ip->ip_dst), sizeof(dstaddr));
break;
-#ifdef INET6
case 6:
- ip6 = (struct ip6_hdr *)bp;
+ ip6 = (const struct ip6_hdr *)bp;
strlcpy(srcaddr, ip6addr_string(ndo, &ip6->ip6_src),
sizeof(srcaddr));
strlcpy(dstaddr, ip6addr_string(ndo, &ip6->ip6_dst),
sizeof(dstaddr));
break;
-#endif
default:
strlcpy(srcaddr, "?", sizeof(srcaddr));
strlcpy(dstaddr, "?", sizeof(dstaddr));
parse_sattr3(netdissect_options *ndo,
const uint32_t *dp, struct nfsv3_sattr *sa3)
{
- ND_TCHECK(dp[0]);
- sa3->sa_modeset = EXTRACT_32BITS(dp);
+ ND_TCHECK_4(dp);
+ sa3->sa_modeset = EXTRACT_BE_U_4(dp);
dp++;
if (sa3->sa_modeset) {
- ND_TCHECK(dp[0]);
- sa3->sa_mode = EXTRACT_32BITS(dp);
+ ND_TCHECK_4(dp);
+ sa3->sa_mode = EXTRACT_BE_U_4(dp);
dp++;
}
- ND_TCHECK(dp[0]);
- sa3->sa_uidset = EXTRACT_32BITS(dp);
+ ND_TCHECK_4(dp);
+ sa3->sa_uidset = EXTRACT_BE_U_4(dp);
dp++;
if (sa3->sa_uidset) {
- ND_TCHECK(dp[0]);
- sa3->sa_uid = EXTRACT_32BITS(dp);
+ ND_TCHECK_4(dp);
+ sa3->sa_uid = EXTRACT_BE_U_4(dp);
dp++;
}
- ND_TCHECK(dp[0]);
- sa3->sa_gidset = EXTRACT_32BITS(dp);
+ ND_TCHECK_4(dp);
+ sa3->sa_gidset = EXTRACT_BE_U_4(dp);
dp++;
if (sa3->sa_gidset) {
- ND_TCHECK(dp[0]);
- sa3->sa_gid = EXTRACT_32BITS(dp);
+ ND_TCHECK_4(dp);
+ sa3->sa_gid = EXTRACT_BE_U_4(dp);
dp++;
}
- ND_TCHECK(dp[0]);
- sa3->sa_sizeset = EXTRACT_32BITS(dp);
+ ND_TCHECK_4(dp);
+ sa3->sa_sizeset = EXTRACT_BE_U_4(dp);
dp++;
if (sa3->sa_sizeset) {
- ND_TCHECK(dp[0]);
- sa3->sa_size = EXTRACT_32BITS(dp);
+ ND_TCHECK_4(dp);
+ sa3->sa_size = EXTRACT_BE_U_4(dp);
dp++;
}
- ND_TCHECK(dp[0]);
- sa3->sa_atimetype = EXTRACT_32BITS(dp);
+ ND_TCHECK_4(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);
+ ND_TCHECK_4(dp + 1);
+ 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);
+ ND_TCHECK_4(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);
+ ND_TCHECK_4(dp + 1);
+ 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++;
}
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 */
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:
}
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;
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:
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;
*/
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 = (uint32_t *)&rp->rm_call.cb_cred;
- ND_TCHECK(dp[1]);
- len = EXTRACT_32BITS(&dp[1]);
+ dp = (const uint32_t *)&rp->rm_call.cb_cred;
+ ND_TCHECK_4(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]);
+ ND_TCHECK_4(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);
}
}
*/
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;
+ ND_TCHECK_4(dp);
+ 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);
}
*/
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);
+ ND_TCHECK_4(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 = (u_char *)dp;
+ cp = (const u_char *)dp;
/* Update 32-bit pointer (NFS filenames padded to 32-bit boundaries) */
dp += ((len + 3) & ~3) / sizeof(*dp);
ND_PRINT((ndo, "\""));
*/
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)
}
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;
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];
case NFSPROC_ACCESS:
if ((dp = parsereq(ndo, rp, length)) != NULL &&
(dp = parsefh(ndo, dp, v3)) != NULL) {
- ND_TCHECK(dp[0]);
- access_flags = EXTRACT_32BITS(&dp[0]);
+ ND_TCHECK_4(dp);
+ 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));
if ((dp = parsereq(ndo, rp, length)) != NULL &&
(dp = parsefh(ndo, dp, v3)) != NULL) {
if (v3) {
- ND_TCHECK(dp[2]);
+ ND_TCHECK_4(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_TCHECK_4(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;
}
if ((dp = parsereq(ndo, rp, length)) != NULL &&
(dp = parsefh(ndo, dp, v3)) != NULL) {
if (v3) {
- ND_TCHECK(dp[2]);
+ ND_TCHECK_4(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) {
- dp += 3;
- ND_TCHECK(dp[0]);
ND_PRINT((ndo, " <%s>",
tok2str(nfsv3_writemodes,
- NULL, EXTRACT_32BITS(dp))));
+ NULL, EXTRACT_BE_U_4(dp + 3))));
}
} else {
- ND_TCHECK(dp[3]);
+ ND_TCHECK_4(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;
}
break;
case NFSPROC_SYMLINK:
- if ((dp = parsereq(ndo, rp, length)) != 0 &&
- (dp = parsefhn(ndo, dp, v3)) != 0) {
+ if ((dp = parsereq(ndo, rp, length)) != NULL &&
+ (dp = parsefhn(ndo, dp, v3)) != NULL) {
ND_PRINT((ndo, " ->"));
- if (v3 && (dp = parse_sattr3(ndo, dp, &sa3)) == 0)
+ if (v3 && (dp = parse_sattr3(ndo, dp, &sa3)) == NULL)
break;
- if (parsefn(ndo, dp) == 0)
+ if (parsefn(ndo, dp) == NULL)
break;
if (v3 && ndo->ndo_vflag)
print_sattr3(ndo, &sa3, ndo->ndo_vflag);
break;
case NFSPROC_MKNOD:
- if ((dp = parsereq(ndo, rp, length)) != 0 &&
- (dp = parsefhn(ndo, dp, v3)) != 0) {
- ND_TCHECK(*dp);
- type = (nfs_type)EXTRACT_32BITS(dp);
+ if ((dp = parsereq(ndo, rp, length)) != NULL &&
+ (dp = parsefhn(ndo, dp, v3)) != NULL) {
+ ND_TCHECK_4(dp);
+ type = (nfs_type) EXTRACT_BE_U_4(dp);
dp++;
- if ((dp = parse_sattr3(ndo, dp, &sa3)) == 0)
+ if ((dp = parse_sattr3(ndo, dp, &sa3)) == NULL)
break;
ND_PRINT((ndo, " %s", tok2str(type2str, "unk-ft %d", type)));
if (ndo->ndo_vflag && (type == NFCHR || type == NFBLK)) {
- ND_TCHECK(dp[1]);
+ ND_TCHECK_4(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)
if ((dp = parsereq(ndo, rp, length)) != NULL &&
(dp = parsefh(ndo, dp, v3)) != NULL) {
if (v3) {
- ND_TCHECK(dp[4]);
+ ND_TCHECK_4(dp + 4);
/*
* We shouldn't really try to interpret the
* offset cookie here.
*/
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]));
+ EXTRACT_BE_U_4(dp + 4),
+ EXTRACT_BE_U_8(dp)));
+ if (ndo->ndo_vflag) {
+ /*
+ * This displays the 8 bytes
+ * of the verifier in order,
+ * from the low-order byte
+ * to the high-order byte.
+ */
+ ND_PRINT((ndo, " verf %08x%08x",
+ EXTRACT_BE_U_4(dp + 2),
+ EXTRACT_BE_U_4(dp + 3)));
+ }
} else {
- ND_TCHECK(dp[1]);
+ ND_TCHECK_4(dp + 1);
/*
* Print the offset as signed, since -1 is
* 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;
}
case NFSPROC_READDIRPLUS:
if ((dp = parsereq(ndo, rp, length)) != NULL &&
(dp = parsefh(ndo, dp, v3)) != NULL) {
- ND_TCHECK(dp[4]);
+ ND_TCHECK_4(dp + 4);
/*
* We don't try to interpret the 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_TCHECK(dp[5]);
+ ND_TCHECK_4(dp + 5);
+ /*
+ * This displays the 8 bytes
+ * of the verifier in order,
+ * from the low-order byte
+ * to the high-order byte.
+ */
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;
}
case NFSPROC_COMMIT:
if ((dp = parsereq(ndo, rp, length)) != NULL &&
(dp = parsefh(ndo, dp, v3)) != NULL) {
- ND_TCHECK(dp[2]);
+ ND_TCHECK_4(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;
*/
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;
ND_PRINT((ndo, " fh["));
for (i=0; i<len; i++) {
- ND_PRINT((ndo, "%s%x", sep, dp[i]));
+ /*
+ * This displays 4 bytes in big-endian byte
+ * order. That's as good a choice as little-
+ * endian, as there's no guarantee that the
+ * server is big-endian or little-endian or
+ * that the file handle contains 4-byte
+ * integral fields, and is better than "the
+ * byte order of the host running tcpdump", as
+ * the latter means that different hosts
+ * running tcpdump may show the same file
+ * handle in different ways.
+ */
+ ND_PRINT((ndo, "%s%x", sep, EXTRACT_BE_U_4(dp + i)));
sep = ":";
}
ND_PRINT((ndo, "]"));
if (sfsname) {
/* file system ID is ASCII, not numeric, for this server OS */
- static char temp[NFSX_V3FHMAX+1];
+ char temp[NFSX_V3FHMAX+1];
+ u_int stringlen;
/* Make sure string is null-terminated */
- strncpy(temp, sfsname, NFSX_V3FHMAX);
- temp[sizeof(temp) - 1] = '\0';
+ stringlen = len;
+ if (stringlen > NFSX_V3FHMAX)
+ stringlen = NFSX_V3FHMAX;
+ strncpy(temp, sfsname, stringlen);
+ temp[stringlen] = '\0';
/* Remove trailing spaces */
spacep = strchr(temp, ' ');
if (spacep)
struct xid_map_entry {
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) */
-#endif
uint32_t proc; /* call proc number (host order) */
uint32_t vers; /* program version (host order) */
};
#define XIDMAPSIZE 64
-struct xid_map_entry xid_map[XIDMAPSIZE];
+static struct xid_map_entry xid_map[XIDMAPSIZE];
-int xid_map_next = 0;
-int xid_map_hint = 0;
+static int xid_map_next = 0;
+static int xid_map_hint = 0;
static int
xid_map_enter(netdissect_options *ndo,
const struct sunrpc_msg *rp, const u_char *bp)
{
- struct ip *ip = NULL;
-#ifdef INET6
- struct ip6_hdr *ip6 = NULL;
-#endif
+ const struct ip *ip = NULL;
+ const struct ip6_hdr *ip6 = NULL;
struct xid_map_entry *xmep;
- if (!ND_TTEST(rp->rm_call.cb_vers))
+ if (!ND_TTEST(rp->rm_call.cb_proc))
return (0);
- switch (IP_V((struct ip *)bp)) {
+ switch (IP_V((const struct ip *)bp)) {
case 4:
- ip = (struct ip *)bp;
+ ip = (const struct ip *)bp;
break;
-#ifdef INET6
case 6:
- ip6 = (struct ip6_hdr *)bp;
+ ip6 = (const struct ip6_hdr *)bp;
break;
-#endif
default:
return (1);
}
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);
+ xmep->proc = EXTRACT_BE_U_4(&rp->rm_call.cb_proc);
+ xmep->vers = EXTRACT_BE_U_4(&rp->rm_call.cb_vers);
return (1);
}
{
int i;
struct xid_map_entry *xmep;
- uint32_t xid = rp->rm_xid;
- struct ip *ip = (struct ip *)bp;
-#ifdef INET6
- struct ip6_hdr *ip6 = (struct ip6_hdr *)bp;
-#endif
+ uint32_t xid;
+ const struct ip *ip = (const struct ip *)bp;
+ const struct ip6_hdr *ip6 = (const struct ip6_hdr *)bp;
int cmp;
+ UNALIGNED_MEMCPY(&xid, &rp->rm_xid, sizeof(xmep->xid));
/* Start searching from where we last left off */
i = xid_map_hint;
do {
cmp = 0;
}
break;
-#ifdef INET6
case 6:
if (UNALIGNED_MEMCMP(&ip6->ip6_src, &xmep->server,
sizeof(ip6->ip6_src)) != 0 ||
cmp = 0;
}
break;
-#endif
default:
cmp = 0;
break;
*/
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;
* which is an "enum" and so occupies one 32-bit word.
*/
dp = ((const uint32_t *)&rp->rm_reply) + 1;
- ND_TCHECK(dp[1]);
- len = EXTRACT_32BITS(&dp[1]);
+ ND_TCHECK_4(dp + 1);
+ len = EXTRACT_BE_U_4(dp + 1);
if (len >= length)
return (NULL);
/*
* skip past the ar_verf credentials.
*/
dp += (len + (2*sizeof(uint32_t) + 3)) / sizeof(uint32_t);
- ND_TCHECK2(dp[0], 0);
/*
* now we can check the ar_stat field
*/
- astat = (enum sunrpc_accept_stat) EXTRACT_32BITS(dp);
+ ND_TCHECK_4(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));
- return ((uint32_t *) (sizeof(astat) + ((char *)dp)));
+ ND_TCHECK_LEN(dp, sizeof(astat));
+ return ((const uint32_t *) (sizeof(astat) + ((const char *)dp)));
trunc:
return (0);
}
{
int errnum;
- ND_TCHECK(dp[0]);
+ ND_TCHECK_4(dp);
- errnum = EXTRACT_32BITS(&dp[0]);
+ errnum = EXTRACT_BE_U_4(dp);
if (er)
*er = errnum;
if (errnum != 0) {
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((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 */
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((uint32_t *)&fap->fa3_fsid)));
+ EXTRACT_BE_U_8((const uint32_t *)&fap->fa3_fsid)));
ND_PRINT((ndo, " fileid %" PRIx64,
- EXTRACT_64BITS((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 *)((unsigned char *)dp +
+ return ((const uint32_t *)((const unsigned char *)dp +
(v3 ? NFSX_V3FATTR : NFSX_V2FATTR)));
trunc:
return (NULL);
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((uint32_t *)&sfsp->sf_tbytes),
- EXTRACT_64BITS((uint32_t *)&sfsp->sf_fbytes),
- EXTRACT_64BITS((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((uint32_t *)&sfsp->sf_tfiles),
- EXTRACT_64BITS((uint32_t *)&sfsp->sf_ffiles),
- EXTRACT_64BITS((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);
if (ndo->ndo_qflag)
return (1);
- ND_TCHECK(dp[2]);
+ ND_TCHECK_4(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);
parse_wcc_attr(netdissect_options *ndo,
const uint32_t *dp)
{
- ND_PRINT((ndo, " sz %" PRIu64, EXTRACT_64BITS(&dp[0])));
+ /* Our caller has already checked this */
+ 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);
}
parse_pre_op_attr(netdissect_options *ndo,
const uint32_t *dp, int verbose)
{
- ND_TCHECK(dp[0]);
- if (!EXTRACT_32BITS(&dp[0]))
+ ND_TCHECK_4(dp);
+ 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 {
parse_post_op_attr(netdissect_options *ndo,
const uint32_t *dp, int verbose)
{
- ND_TCHECK(dp[0]);
- if (!EXTRACT_32BITS(&dp[0]))
+ ND_TCHECK_4(dp);
+ if (!EXTRACT_BE_U_4(dp))
return (dp + 1);
dp++;
if (verbose) {
if (er)
dp = parse_wcc_data(ndo, dp, verbose);
else {
- ND_TCHECK(dp[0]);
- if (!EXTRACT_32BITS(&dp[0]))
+ ND_TCHECK_4(dp);
+ if (!EXTRACT_BE_U_4(dp))
return (dp + 1);
dp++;
if (!(dp = parsefh(ndo, dp, 1)))
if (!(dp = parsestatus(ndo, dp, &er)))
return (0);
- return parse_wcc_data(ndo, dp, verbose) != 0;
+ return parse_wcc_data(ndo, dp, verbose) != NULL;
}
static const uint32_t *
if (er)
return dp;
if (ndo->ndo_vflag) {
- ND_TCHECK(dp[1]);
- ND_PRINT((ndo, " verf %08x%08x", dp[0], dp[1]));
+ ND_TCHECK_4(dp + 1);
+ /*
+ * This displays the 8 bytes of the verifier in order,
+ * from the low-order byte to the high-order byte.
+ */
+ ND_PRINT((ndo, " verf %08x%08x",
+ EXTRACT_BE_U_4(dp), EXTRACT_BE_U_4(dp + 1)));
dp += 2;
}
return dp;
parsefsinfo(netdissect_options *ndo,
const uint32_t *dp)
{
- struct nfsv3_fsinfo *sfp;
+ const struct nfsv3_fsinfo *sfp;
int er;
if (!(dp = parsestatus(ndo, dp, &er)))
if (er)
return (1);
- sfp = (struct nfsv3_fsinfo *)dp;
+ sfp = (const struct nfsv3_fsinfo *)dp;
ND_TCHECK(*sfp);
ND_PRINT((ndo, " rtmax %u rtpref %u wtmax %u wtpref %u dtpref %u",
- EXTRACT_32BITS(&sfp->fs_rtmax),
- 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((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:
const uint32_t *dp)
{
int er;
- struct nfsv3_pathconf *spp;
+ const struct nfsv3_pathconf *spp;
if (!(dp = parsestatus(ndo, dp, &er)))
return (0);
if (er)
return (1);
- spp = (struct nfsv3_pathconf *)dp;
+ spp = (const struct nfsv3_pathconf *)dp;
ND_TCHECK(*spp);
ND_PRINT((ndo, " linkmax %u namemax %u %s %s %s %s",
- 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);
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);
ND_PRINT((ndo, " attr:"));
if (!(dp = parse_post_op_attr(ndo, dp, ndo->ndo_vflag)))
break;
- if (!er)
- ND_PRINT((ndo, " c %04x", EXTRACT_32BITS(&dp[0])));
+ if (!er) {
+ ND_TCHECK_4(dp);
+ ND_PRINT((ndo, " c %04x", EXTRACT_BE_U_4(dp)));
+ }
return;
case NFSPROC_READLINK:
if (er)
return;
if (ndo->ndo_vflag) {
- ND_TCHECK(dp[1]);
- ND_PRINT((ndo, " %u bytes", EXTRACT_32BITS(&dp[0])));
- if (EXTRACT_32BITS(&dp[1]))
+ ND_TCHECK_4(dp + 1);
+ ND_PRINT((ndo, " %u bytes", EXTRACT_BE_U_4(dp)));
+ if (EXTRACT_BE_U_4(dp + 1))
ND_PRINT((ndo, " EOF"));
}
return;
if (er)
return;
if (ndo->ndo_vflag) {
- ND_TCHECK(dp[0]);
- ND_PRINT((ndo, " %u bytes", EXTRACT_32BITS(&dp[0])));
+ ND_TCHECK_4(dp);
+ ND_PRINT((ndo, " %u bytes", EXTRACT_BE_U_4(dp)));
if (ndo->ndo_vflag > 1) {
- ND_TCHECK(dp[1]);
+ ND_TCHECK_4(dp + 1);
ND_PRINT((ndo, " <%s>",
tok2str(nfsv3_writemodes,
- NULL, EXTRACT_32BITS(&dp[1]))));
+ NULL, EXTRACT_BE_U_4(dp + 1))));
}
return;
}
if (!(dp = parserep(ndo, rp, length)))
break;
if (v3) {
- if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != 0)
+ if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != NULL)
return;
} else {
if (parsediropres(ndo, dp) != 0)
if (!(dp = parserep(ndo, rp, length)))
break;
if (v3) {
- if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != 0)
+ if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != NULL)
return;
} else {
- if (parsestatus(ndo, dp, &er) != 0)
+ if (parsestatus(ndo, dp, &er) != NULL)
return;
}
break;
case NFSPROC_MKNOD:
if (!(dp = parserep(ndo, rp, length)))
break;
- if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != 0)
+ if (parsecreateopres(ndo, dp, ndo->ndo_vflag) != NULL)
return;
break;
if (parsewccres(ndo, dp, ndo->ndo_vflag))
return;
} else {
- if (parsestatus(ndo, dp, &er) != 0)
+ if (parsestatus(ndo, dp, &er) != NULL)
return;
}
break;
}
return;
} else {
- if (parsestatus(ndo, dp, &er) != 0)
+ if (parsestatus(ndo, dp, &er) != NULL)
return;
}
break;
return;
}
} else {
- if (parsestatus(ndo, dp, &er) != 0)
+ if (parsestatus(ndo, dp, &er) != NULL)
return;
}
break;
projects / tcpdump / blobdiff