Allow tcpdump to work with earlier libpcaps.

[tcpdump] / print-ipcomp.c

diff --git a/print-ipcomp.c b/print-ipcomp.c
index ba2987ae480dfb94f299dbfc81c3864c50503806..56172ea181a07680e4864efb2996a89b534b0a35 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.12 2000-10-07 05:46:21 itojun Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,33 +34,15 @@ static const char rcsid[] =
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <net/route.h>
-#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_icmp.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
 
 #include <stdio.h>
 
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-#ifdef HAVE_NETINET6_IPCOMP_H
-#include <netinet6/ipcomp.h>
-#else
 struct ipcomp {
        u_int8_t comp_nxt;      /* Next Header */
        u_int8_t comp_flags;    /* Length of data, in 32bit */
        u_int16_t comp_cpi;     /* Compression parameter index */
 };
-#endif
 
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
 #include <zlib.h>
@@ -82,7 +64,7 @@ ipcomp_print(register const u_char *bp, register const u_char *bp2, int *nhdr)
        ipcomp = (struct ipcomp *)bp;
        cpi = (u_int16_t)ntohs(ipcomp->comp_cpi);
 
-       /* 'ep' points to the end of avaible data. */
+       /* 'ep' points to the end of available data. */
        ep = snapend;
 
        if ((u_char *)(ipcomp + 1) >= ep - sizeof(struct ipcomp)) {