NDOize OpenFlow, IEEE slow and telnet decoders

[tcpdump] / print-ipcomp.c

diff --git a/print-ipcomp.c b/print-ipcomp.c
index 67cb9fffa42f2ad897295ab5ec7a3cfc873f9172..caa4232723dcf56849f9e55b367f674308ae91a2 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -19,15 +19,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

+#define NETDISSECT_REWORKED

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

-#include <string.h>

 #include <tcpdump-stdinc.h>
 
 #include <tcpdump-stdinc.h>
 

-#include <stdio.h>
-

 struct ipcomp {
        u_int8_t comp_nxt;      /* Next Header */
        u_int8_t comp_flags;    /* Length of data, in 32bit */
 struct ipcomp {
        u_int8_t comp_nxt;      /* Next Header */
        u_int8_t comp_flags;    /* Length of data, in 32bit */


@@ -42,7 +40,7 @@ struct ipcomp {
 #include "extract.h"
 
 int
 #include "extract.h"
 
 int

-ipcomp_print(register const u_char *bp, int *nhdr _U_)
+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;


@@ -55,13 +53,13 @@ ipcomp_print(register const u_char *bp, int *nhdr _U_)
        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)) {
 
        if ((u_char *)(ipcomp + 1) >= ep - sizeof(struct ipcomp)) {

-               fputs("[|IPCOMP]", stdout);
+               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)


@@ -76,7 +74,7 @@ ipcomp_print(register const u_char *bp, int *nhdr _U_)
                *nhdr = ipcomp->comp_nxt;
        advance = sizeof(struct ipcomp);
 
                *nhdr = ipcomp->comp_nxt;
        advance = sizeof(struct ipcomp);
 

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

        return advance;
 
 #endif
        return advance;
 
 #endif