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 bb7a1fd4ef12dcf0070e37fa9f6cac589746dece..8e43bb5dcba8c566590ab97405047cd2eddac2fc 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.24 1999-10-07 23:47:12 mcr 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
+#include "config.h"
 #endif
 
 #include <sys/param.h>
@@ -30,21 +34,10 @@ 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 <netinet/tcpip.h>
 
 #include <pcap.h>
 #include <stdio.h>
@@ -53,6 +46,11 @@ struct rtentry;
 #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
@@ -80,6 +78,12 @@ null_print(const u_char *p, const struct ip *ip, u_int length)
                printf("ip: ");
                break;
 
+#ifdef INET6
+       case AF_INET6:
+               printf("ip6: ");
+               break;
+#endif
+
        case AF_NS:
                printf("ns: ");
                break;
@@ -114,7 +118,19 @@ null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
        if (eflag)
                null_print(p, ip, length);
 
-       ip_print((const u_char *)ip, length);
+       switch (IP_V(ip)) {
+       case 4:
+               ip_print((const u_char *)ip, length);
+               break;
+#ifdef INET6
+       case 6:
+               ip6_print((const u_char *)ip, length);
+               break;
+#endif /* INET6 */
+       default:
+               printf("ip v%d", IP_V(ip));
+               break;
+       }
 
        if (xflag)
                default_print((const u_char *)ip, caplen - NULL_HDRLEN);