Get rid of unneeded includes of <net/if.h>.

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index f5b032273a6e0e10e4ea08de26ff3c30c27077b8..d4750c43e4139ae650a7b7cf43cf4ebd557bd4e5 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -21,7 +21,11 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.26 1999-10-30 05:11:18 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.35 2000-09-28 06:43:05 guy Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
 #include <sys/param.h>
@@ -30,20 +34,11 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
-#include <net/if.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
 
 #include <pcap.h>
 #include <stdio.h>
@@ -56,6 +51,8 @@ struct rtentry;
 #include "interface.h"
 #include "addrtoname.h"
 
+#include "ip.h"
+
 #ifndef AF_NS
 #define AF_NS          6               /* XEROX NS protocols */
 #endif
@@ -123,14 +120,19 @@ null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
        if (eflag)
                null_print(p, ip, length);
 
-#ifndef INET6
-       ip_print((const u_char *)ip, length);
-#else
-       if (ip->ip_v == IPVERSION)
+       switch (ip->ip_v) {
+       case 4:
                ip_print((const u_char *)ip, length);
-       else if (ip->ip_v == 6)
+               break;
+#ifdef INET6
+       case 6:
                ip6_print((const u_char *)ip, length);
-#endif /*INET6*/
+               break;
+#endif /* INET6 */
+       default:
+               printf("ip v%d", ip->ip_v);
+               break;
+       }
 
        if (xflag)
                default_print((const u_char *)ip, caplen - NULL_HDRLEN);