Patch sent to Debian by Roderick Schertler <[email protected]> to print

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index 26a343ac2c21631fa76fb9c6385f74e26f9871ec..8e43bb5dcba8c566590ab97405047cd2eddac2fc 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.29 1999-11-21 12:38:24 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.38 2000-10-07 05:53:13 itojun Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,32 +34,23 @@ 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>
 #include <string.h>
 
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-
 #include "interface.h"
 #include "addrtoname.h"
 
+#include "ip.h"
+#ifdef INET6
+#include "ip6.h"
+#endif
+
 #ifndef AF_NS
 #define AF_NS          6               /* XEROX NS protocols */
 #endif
@@ -127,17 +118,17 @@ null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
        if (eflag)
                null_print(p, ip, length);
 
-       switch (ip->ip_v) {
-       case 4 :
-               ip_print((const void *)ip, length);
+       switch (IP_V(ip)) {
+       case 4:
+               ip_print((const u_char *)ip, length);
                break;
 #ifdef INET6
        case 6:
-               ip6_print((const void *)ip, length);
+               ip6_print((const u_char *)ip, length);
                break;
 #endif /* INET6 */
-       default :
-               printf("ip v%d", ip->ip_v);
+       default:
+               printf("ip v%d", IP_V(ip));
                break;
        }