From 281e9d71408deb6e8c5046c746c2e97002b0e7fe Mon Sep 17 00:00:00 2001 From: bms Date: Wed, 31 Mar 2004 09:17:26 +0000 Subject: Import tcpdump 3.8.3, from http://www.tcpdump.org/releases/tcpdump-3.8.3.tar.gz --- contrib/tcpdump/print-raw.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) (limited to 'contrib/tcpdump/print-raw.c') diff --git a/contrib/tcpdump/print-raw.c b/contrib/tcpdump/print-raw.c index a3bfda8..00153e5 100644 --- a/contrib/tcpdump/print-raw.c +++ b/contrib/tcpdump/print-raw.c @@ -20,19 +20,15 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.34.4.1 2002/06/01 23:51:15 guy Exp $ (LBL)"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.39.2.2 2003/11/16 08:51:40 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include -#include -#include - -#include +#include #include #include @@ -45,32 +41,13 @@ static const char rcsid[] = * The DLT_RAW packet has no header. It contains a raw IP packet. */ -void -raw_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) +u_int +raw_if_print(const struct pcap_pkthdr *h, const u_char *p) { - u_int length = h->len; - u_int caplen = h->caplen; - - ++infodelay; - ts_print(&h->ts); - - /* - * Some printers want to get back at the link level addresses, - * and/or check that they're not walking off the end of the packet. - * Rather than pass them all the way down, we set these globals. - */ - packetp = p; - snapend = p + caplen; - if (eflag) printf("ip: "); - ipN_print(p, length); + ipN_print(p, h->len); - if (xflag) - default_print(p, caplen); - putchar('\n'); - --infodelay; - if (infoprint) - info(0); + return (0); } -- cgit v1.1