add Ken Hornstein's patches from /afs/transarc.com/public/afs-contrib/tools/tcpdump...

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 5ec960249424d4099ba6c4c16ac1ba5eacdb9a1e..4ce1e736355a40e5d8285459f408c38bb78232e6 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.44 1999-10-07 23:47:11 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.46 1999-10-30 05:11:13 itojun Exp $ (LBL)";
 #endif
 
 #include <sys/param.h>
@@ -41,11 +41,14 @@ struct rtentry;
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/tcp.h>
-#include <netinet/tcpip.h>
 
 #include <stdio.h>
 #include <pcap.h>
 
+#ifdef INET6
+#include <netinet/ip6.h>
+#endif
+
 #include "interface.h"
 #include "addrtoname.h"
 #include "ethertype.h"
@@ -166,6 +169,12 @@ ether_encap_print(u_short ethertype, const u_char *p,
                ip_print(p, length);
                return (1);
 
+#ifdef INET6
+       case ETHERTYPE_IPV6:
+               ip6_print(p, length);
+               return (1);
+#endif /*INET6*/
+
        case ETHERTYPE_ARP:
        case ETHERTYPE_REVARP:
                arp_print(p, length, caplen);