Date: Sun, 29 May 2005 19:09:28 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/tcpdump addrtoname.c ethertype.h interface.h parsenfsfh.c ppp.h print-arp.c print-atalk.c print-atm.c print-bootp.c print-domain.c print-ether.c print-fddi.c print-fr.c print-icmp.c print-ip.c print-ip6.c ... Message-ID: <200505291909.j4TJ9S4g024266@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
sam 2005-05-29 19:09:28 UTC
FreeBSD src repository
Modified files:
contrib/tcpdump addrtoname.c ethertype.h interface.h
parsenfsfh.c ppp.h print-arp.c
print-atalk.c print-atm.c print-bootp.c
print-domain.c print-ether.c print-fddi.c
print-fr.c print-icmp.c print-ip.c
print-ip6.c print-ipx.c print-isoclns.c
print-llc.c print-nfs.c print-ntp.c
print-null.c print-pim.c print-ppp.c
print-sl.c print-sunrpc.c print-token.c
print-udp.c tcpdump-stdinc.h tcpdump.1
tcpdump.c
Log:
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
Revision Changes Path
1.13 +52 -35 src/contrib/tcpdump/addrtoname.c
1.9 +14 -1 src/contrib/tcpdump/ethertype.h
1.10 +54 -42 src/contrib/tcpdump/interface.h
1.9 +2 -2 src/contrib/tcpdump/parsenfsfh.c
1.7 +6 -2 src/contrib/tcpdump/ppp.h
1.10 +77 -66 src/contrib/tcpdump/print-arp.c
1.13 +9 -2 src/contrib/tcpdump/print-atalk.c
1.10 +96 -7 src/contrib/tcpdump/print-atm.c
1.10 +1 -1 src/contrib/tcpdump/print-bootp.c
1.11 +1 -1 src/contrib/tcpdump/print-domain.c
1.15 +66 -6 src/contrib/tcpdump/print-ether.c
1.10 +2 -2 src/contrib/tcpdump/print-fddi.c
1.5 +434 -249 src/contrib/tcpdump/print-fr.c
1.10 +113 -6 src/contrib/tcpdump/print-icmp.c
1.12 +304 -238 src/contrib/tcpdump/print-ip.c
1.6 +44 -44 src/contrib/tcpdump/print-ip6.c
1.8 +11 -8 src/contrib/tcpdump/print-ipx.c
1.13 +858 -448 src/contrib/tcpdump/print-isoclns.c
1.10 +26 -7 src/contrib/tcpdump/print-llc.c
1.11 +64 -118 src/contrib/tcpdump/print-nfs.c
1.10 +72 -85 src/contrib/tcpdump/print-ntp.c
1.10 +9 -3 src/contrib/tcpdump/print-null.c
1.7 +184 -104 src/contrib/tcpdump/print-pim.c
1.15 +287 -120 src/contrib/tcpdump/print-ppp.c
1.9 +3 -3 src/contrib/tcpdump/print-sl.c
1.10 +13 -11 src/contrib/tcpdump/print-sunrpc.c
1.7 +2 -2 src/contrib/tcpdump/print-token.c
1.9 +42 -25 src/contrib/tcpdump/print-udp.c
1.2 +22 -19 src/contrib/tcpdump/tcpdump-stdinc.h
1.14 +82 -36 src/contrib/tcpdump/tcpdump.1
1.9 +394 -102 src/contrib/tcpdump/tcpdump.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505291909.j4TJ9S4g024266>