X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/4b440ad855abcf908a95d92b72a7e81a59647b09..153e205db74c3bc57d40c5118dbaedefc210ba07:/print-nfs.c?ds=inline

diff --git a/print-nfs.c b/print-nfs.c
index abae3709..c1354866 100644
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.81 2000-08-03 18:52:24 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.89 2001-07-08 08:01:43 itojun Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,15 +34,8 @@ static const char rcsid[] =
 
 struct mbuf;
 struct rtentry;
-#include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
 
 #include <rpc/rpc.h>
 
@@ -57,6 +50,11 @@ 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 u_char *);
 static int32_t xid_map_find(const struct rpc_msg *, const u_char *,
@@ -228,7 +226,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));
@@ -829,7 +827,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;
@@ -886,7 +884,7 @@ xid_map_find(const struct rpc_msg *rp, const u_char *bp, u_int32_t *proc,
 	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:
@@ -1207,7 +1205,7 @@ parserddires(const u_int32_t *dp)
 	int er;
 
 	dp = parsestatus(dp, &er);
-	if (dp == 0 || er)
+	if (dp == NULL || er)
 		return (0);
 	if (qflag)
 		return (1);
@@ -1489,7 +1487,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)