Default to first interface from pcap_findalldevs()

[tcpdump] / print-ipcomp.c

diff --git a/print-ipcomp.c b/print-ipcomp.c
index bc76448f00a8cfb3e5eb7f4da28be838c50119bb..a6d25257c133f5edebd9feadb20aee499764f480 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -19,55 +19,46 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.17 2002-12-11 07:14:03 guy Exp $";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <string.h>
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
+#include <netdissect-stdinc.h>

 
 struct ipcomp {
 
 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)
 #include <zlib.h>
 #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
 #include "extract.h"
 
 int

-ipcomp_print(register const u_char *bp, 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;
 {
        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
 
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
        int advance;
 #endif
 

-       ipcomp = (struct ipcomp *)bp;
+       ipcomp = (const struct ipcomp *)bp;

        cpi = EXTRACT_16BITS(&ipcomp->comp_cpi);
 
        /* 'ep' points to the end of available data. */
        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;
        }
                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)
 
 #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H)
        if (1)


@@ -82,12 +73,10 @@ ipcomp_print(register const u_char *bp, int *nhdr)
                *nhdr = ipcomp->comp_nxt;
        advance = sizeof(struct ipcomp);
 
                *nhdr = ipcomp->comp_nxt;
        advance = sizeof(struct ipcomp);
 

-       printf(": ");
+       ND_PRINT((ndo, ": "));

        return advance;
 
 #endif
 fail:
        return advance;
 
 #endif
 fail:

-       if (nhdr)
-               *nhdr = -1;
-       return 65536;
+       return -1;

 }
 }