diff options
| author | delphij <delphij@FreeBSD.org> | 2015-01-06 19:03:11 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-01-06 19:03:11 +0000 |
| commit | 08263d19579d35a7a65e0c8bcb768504ce76d04e (patch) | |
| tree | b0af675e15d65cc0adac2367c37233a794389c9a /print-ipcomp.c | |
| parent | 89918529102669b0d24d8aac9e5516b010b1c81c (diff) | |
| download | FreeBSD-src-08263d19579d35a7a65e0c8bcb768504ce76d04e.zip FreeBSD-src-08263d19579d35a7a65e0c8bcb768504ce76d04e.tar.gz | |
Vendor import of tcpdump 4.6.2.
Diffstat (limited to 'print-ipcomp.c')
| -rw-r--r-- | print-ipcomp.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/print-ipcomp.c b/print-ipcomp.c index 89130a3..1ba687e 100644 --- a/print-ipcomp.c +++ b/print-ipcomp.c @@ -19,24 +19,17 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.20 2003-11-19 00:36:08 guy Exp $"; -#endif - +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <string.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 */ - 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) @@ -44,15 +37,14 @@ struct ipcomp { #endif #include "interface.h" -#include "addrtoname.h" #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; - u_int16_t cpi; + uint16_t cpi; #if defined(HAVE_LIBZ) && defined(HAVE_ZLIB_H) int advance; #endif @@ -61,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. */ - ep = snapend; + ep = ndo->ndo_snapend; if ((u_char *)(ipcomp + 1) >= ep - sizeof(struct ipcomp)) { - fputs("[|IPCOMP]", stdout); + 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) @@ -82,7 +74,7 @@ ipcomp_print(register const u_char *bp, int *nhdr _U_) *nhdr = ipcomp->comp_nxt; advance = sizeof(struct ipcomp); - printf(": "); + ND_PRINT((ndo, ": ")); return advance; #endif |
