X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/23dee2fc00056bdd0199f58b8dd459b2c4a43207..f243e70b91b9a25a4cda052f37f48fb5aa49bf39:/print-sunrpc.c

diff --git a/print-sunrpc.c b/print-sunrpc.c
index 9c2043ec..54e32d86 100644
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.32 2000-06-10 05:38:00 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.39 2000-10-07 05:53:13 itojun Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,20 +32,10 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
-#include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
 
 #include <rpc/rpc.h>
 #ifdef HAVE_RPC_RPCENT_H
@@ -61,6 +51,11 @@ struct rtentry;
 #include "interface.h"
 #include "addrtoname.h"
 
+#include "ip.h"
+#ifdef INET6
+#include "ip6.h"
+#endif
+
 static struct tok proc2str[] = {
 	{ PMAPPROC_NULL,	"null" },
 	{ PMAPPROC_SET,		"set" },
@@ -98,7 +93,7 @@ sunrpcrequest_print(register const u_char *bp, register u_int length,
 		snprintf(dstid, sizeof(dstid), "0x%x", PMAPPORT);
 	}
 
-	switch (((struct ip *)bp2)->ip_v) {
+	switch (IP_V((struct ip *)bp2)) {
 	case 4:
 		ip = (struct ip *)bp2;
 		printf("%s.%s > %s.%s: %d",