Fix a bunch of de-constifications.

[tcpdump] / print-ipcomp.c

diff --git a/print-ipcomp.c b/print-ipcomp.c
index 6509f9eddacfde588a1b28700d119e1408f5722e..633de9bedb09df76901393494a569c9d35882f72 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -19,29 +19,16 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.13 2000-12-12 09:58:41 itojun Exp $";
-#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 <netinet/in.h>
-
-#include <stdio.h>
+#include <tcpdump-stdinc.h>
 
 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 */
 };
 
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
@@ -49,29 +36,29 @@ struct ipcomp {
 #endif
 
 #include "interface.h"
-#include "addrtoname.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 available data. */
-       ep = snapend;
+       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=0x%04x)", cpi);
+       ND_PRINT((ndo, "IPComp(cpi=0x%04x)", cpi));
 
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
        if (1)
@@ -86,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;
 }