diff options
| author | sam <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
| commit | 7dacff5dd0aeebda55a754dc5d25feab441b5d03 (patch) | |
| tree | 71f0f8d5860cc5ba4d96abee0d8048a044b51cd3 /contrib/tcpdump/print-null.c | |
| parent | d9db21b8bcec89e09ac680f84c6d7d0ca014d6df (diff) | |
| download | FreeBSD-src-7dacff5dd0aeebda55a754dc5d25feab441b5d03.zip FreeBSD-src-7dacff5dd0aeebda55a754dc5d25feab441b5d03.tar.gz | |
resolve merge conflicts and update for proper build; including:
o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h
Reviewed by: bms
Diffstat (limited to 'contrib/tcpdump/print-null.c')
| -rw-r--r-- | contrib/tcpdump/print-null.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/contrib/tcpdump/print-null.c b/contrib/tcpdump/print-null.c index a9f08ba..bc6af00 100644 --- a/contrib/tcpdump/print-null.c +++ b/contrib/tcpdump/print-null.c @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.49.2.2 2003/11/16 08:51:36 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.53 2005/04/06 21:32:41 mcr Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -127,7 +127,7 @@ null_print(u_int family, u_int length) /* * This is the top level routine of the printer. 'p' points * to the ether header of the packet, 'h->ts' is the timestamp, - * 'h->length' is the length of the packet off the wire, and 'h->caplen' + * 'h->len' is the length of the packet off the wire, and 'h->caplen' * is the number of bytes actually captured. */ u_int @@ -165,7 +165,7 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p) switch (family) { case BSD_AF_INET: - ip_print(p, length); + ip_print(gndo, p, length); break; #ifdef INET6 @@ -199,3 +199,9 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p) return (NULL_HDRLEN); } +/* + * Local Variables: + * c-style: whitesmith + * c-basic-offset: 8 + * End: + */ |
