diff options
| author | Xin LI <delphij@FreeBSD.org> | 2015-01-06 19:03:11 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2015-01-06 19:03:11 +0000 |
| commit | e91eac244982a8728f370000c353b16e18174ec9 (patch) | |
| tree | b0af675e15d65cc0adac2367c37233a794389c9a /print-vjc.c | |
| parent | 05b21c9adf4d7f1b7b616a703b98e4df42633c9f (diff) | |
| download | src-e91eac244982a8728f370000c353b16e18174ec9.tar.gz src-e91eac244982a8728f370000c353b16e18174ec9.zip | |
Vendor import of tcpdump 4.6.2.vendor/tcpdump/4.6.2
Notes
Notes:
svn path=/vendor/tcpdump/dist/; revision=276761
svn path=/vendor/tcpdump/4.6.2/; revision=276762; tag=vendor/tcpdump/4.6.2
Diffstat (limited to 'print-vjc.c')
| -rw-r--r-- | print-vjc.c | 41 |
1 files changed, 16 insertions, 25 deletions
diff --git a/print-vjc.c b/print-vjc.c index 2dc89aa5f989..24f8a122c09b 100644 --- a/print-vjc.c +++ b/print-vjc.c @@ -19,23 +19,14 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-vjc.c,v 1.15 2004-03-25 03:31:17 mcr Exp $ (LBL)"; -#endif - #include <tcpdump-stdinc.h> -#include <pcap.h> -#include <stdio.h> - #include "interface.h" -#include "addrtoname.h" - #include "slcompress.h" #include "ppp.h" @@ -82,38 +73,38 @@ static const char rcsid[] _U_ = * unused argument remind us that we should fix this some day. */ int -vjc_print(register const char *bp, u_short proto _U_) +vjc_print(netdissect_options *ndo, register const char *bp, u_short proto _U_) { int i; switch (bp[0] & 0xf0) { case TYPE_IP: - if (eflag) - printf("(vjc type=IP) "); + if (ndo->ndo_eflag) + ND_PRINT((ndo, "(vjc type=IP) ")); return PPP_IP; case TYPE_UNCOMPRESSED_TCP: - if (eflag) - printf("(vjc type=raw TCP) "); + if (ndo->ndo_eflag) + ND_PRINT((ndo, "(vjc type=raw TCP) ")); return PPP_IP; case TYPE_COMPRESSED_TCP: - if (eflag) - printf("(vjc type=compressed TCP) "); + if (ndo->ndo_eflag) + ND_PRINT((ndo, "(vjc type=compressed TCP) ")); for (i = 0; i < 8; i++) { if (bp[1] & (0x80 >> i)) - printf("%c", "?CI?SAWU"[i]); + ND_PRINT((ndo, "%c", "?CI?SAWU"[i])); } if (bp[1]) - printf(" "); - printf("C=0x%02x ", bp[2]); - printf("sum=0x%04x ", *(u_short *)&bp[3]); + ND_PRINT((ndo, " ")); + ND_PRINT((ndo, "C=0x%02x ", bp[2])); + ND_PRINT((ndo, "sum=0x%04x ", *(u_short *)&bp[3])); return -1; case TYPE_ERROR: - if (eflag) - printf("(vjc type=error) "); + if (ndo->ndo_eflag) + ND_PRINT((ndo, "(vjc type=error) ")); return -1; default: - if (eflag) - printf("(vjc type=0x%02x) ", bp[0] & 0xf0); + if (ndo->ndo_eflag) + ND_PRINT((ndo, "(vjc type=0x%02x) ", bp[0] & 0xf0)); return -1; } } |