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-sl.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-sl.c')
| -rw-r--r-- | contrib/tcpdump/print-sl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/tcpdump/print-sl.c b/contrib/tcpdump/print-sl.c index 87f31bb..97389d8 100644 --- a/contrib/tcpdump/print-sl.c +++ b/contrib/tcpdump/print-sl.c @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.62.2.2 2003/11/16 08:51:44 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.65 2005/04/06 21:32:42 mcr Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -71,7 +71,7 @@ sl_if_print(const struct pcap_pkthdr *h, const u_char *p) switch (IP_V(ip)) { case 4: - ip_print((u_char *)ip, length); + ip_print(gndo, (u_char *)ip, length); break; #ifdef INET6 case 6: @@ -106,7 +106,7 @@ sl_bsdos_if_print(const struct pcap_pkthdr *h, const u_char *p) sliplink_print(p, ip, length); #endif - ip_print((u_char *)ip, length); + ip_print(gndo, (u_char *)ip, length); return (SLIP_HDRLEN); } |
