X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b9ac23ce92ca22483d56ee3192c54aa8f782f9ac..refs/pull/482/head:/print-ipcomp.c

diff --git a/print-ipcomp.c b/print-ipcomp.c
index ba2987ae..a6d25257 100644
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -19,77 +19,46 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#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)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <string.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#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 <netdissect-stdinc.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 */
+	uint8_t comp_nxt;	/* Next Header */
+	uint8_t comp_flags;	/* Length of data, in 32bit */
+	uint16_t comp_cpi;	/* Compression parameter index */
 };
-#endif
 
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
 #include <zlib.h>
 #endif
 
-#include "interface.h"
-#include "addrtoname.h"
+#include "netdissect.h"
+#include "extract.h"
 
 int
-ipcomp_print(register const u_char *bp, register const u_char *bp2, int *nhdr)
+ipcomp_print(netdissect_options *ndo, register const u_char *bp, int *nhdr _U_)
 {
 	register const struct ipcomp *ipcomp;
 	register const u_char *ep;
-	u_int16_t cpi;
+	uint16_t cpi;
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
 	int advance;
 #endif
 
-	ipcomp = (struct ipcomp *)bp;
-	cpi = (u_int16_t)ntohs(ipcomp->comp_cpi);
+	ipcomp = (const struct ipcomp *)bp;
+	cpi = EXTRACT_16BITS(&ipcomp->comp_cpi);
 
-	/* 'ep' points to the end of avaible data. */
-	ep = snapend;
+	/* 'ep' points to the end of available data. */
+	ep = ndo->ndo_snapend;
 
-	if ((u_char *)(ipcomp + 1) >= ep - sizeof(struct ipcomp)) {
-		fputs("[|IPCOMP]", stdout);
+	if ((const u_char *)(ipcomp + 1) >= ep - sizeof(struct ipcomp)) {
+		ND_PRINT((ndo, "[|IPCOMP]"));
 		goto fail;
 	}
-	printf("IPComp(cpi=%u)", cpi);
+	ND_PRINT((ndo, "IPComp(cpi=0x%04x)", cpi));
 
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
 	if (1)
@@ -104,12 +73,10 @@ ipcomp_print(register const u_char *bp, register const u_char *bp2, int *nhdr)
 		*nhdr = ipcomp->comp_nxt;
 	advance = sizeof(struct ipcomp);
 
-	printf(": ");
+	ND_PRINT((ndo, ": "));
 	return advance;
 
 #endif
 fail:
-	if (nhdr)
-		*nhdr = -1;
-	return 65536;
+	return -1;
 }