diff options
| author | delphij <delphij@FreeBSD.org> | 2015-01-07 19:55:18 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-01-07 19:55:18 +0000 |
| commit | f49c5d523af9076a4a59e8dd664f9a897108432e (patch) | |
| tree | e268839e08c106e178b33bd461d8d0a9c6fb5ad9 /contrib/tcpdump/print-raw.c | |
| parent | c371846049d370ab78d943e60e789cdffe0aad3d (diff) | |
| parent | 08263d19579d35a7a65e0c8bcb768504ce76d04e (diff) | |
| download | FreeBSD-src-f49c5d523af9076a4a59e8dd664f9a897108432e.zip FreeBSD-src-f49c5d523af9076a4a59e8dd664f9a897108432e.tar.gz | |
MFV r276761: tcpdump 4.6.2.
MFC after: 1 month
Diffstat (limited to 'contrib/tcpdump/print-raw.c')
| -rw-r--r-- | contrib/tcpdump/print-raw.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/contrib/tcpdump/print-raw.c b/contrib/tcpdump/print-raw.c index 8e376ce5..d20387c 100644 --- a/contrib/tcpdump/print-raw.c +++ b/contrib/tcpdump/print-raw.c @@ -19,22 +19,13 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.41 2003-11-16 09:36:34 guy Exp $ (LBL)"; -#endif - +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif #include <tcpdump-stdinc.h> -#include <pcap.h> -#include <stdio.h> -#include <string.h> - -#include "addrtoname.h" #include "interface.h" /* @@ -42,12 +33,12 @@ static const char rcsid[] _U_ = */ u_int -raw_if_print(const struct pcap_pkthdr *h, const u_char *p) +raw_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { - if (eflag) - printf("ip: "); + if (ndo->ndo_eflag) + ND_PRINT((ndo, "ip: ")); - ipN_print(p, h->len); + ipN_print(ndo, p, h->len); return (0); } |
