Date: Wed, 16 Aug 2006 12:23:03 +0000 (UTC) From: Guido van Rooij <guido@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/ipfilter Makefile bpf_filter.c ip_fil.c ipf.h ipmon.h ipt.h radix.c src/contrib/ipfilter/iplang iplang_y.y src/contrib/ipfilter/ipsd sbpf.c src/contrib/ipfilter/ipsend ipsend.c iptests.c lsock.c resend.c sbpf.c sock.c ... Message-ID: <200608161223.k7GCN3pl056758@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
guido 2006-08-16 12:23:03 UTC
FreeBSD src repository
Modified files:
contrib/ipfilter Makefile bpf_filter.c ip_fil.c ipf.h
ipmon.h ipt.h radix.c
contrib/ipfilter/iplang iplang_y.y
contrib/ipfilter/ipsd sbpf.c
contrib/ipfilter/ipsend ipsend.c iptests.c lsock.c resend.c
sbpf.c sock.c
contrib/ipfilter/lib addicmp.c facpri.c getport.c icmpcode.c
ipft_tx.c optprint.c printfr.c printlog.c
contrib/ipfilter/man ipmon.8
contrib/ipfilter/samples proxy.c
contrib/ipfilter/tools ipf.c ipf_y.y ipfcomp.c ipfs.c
ipfstat.c ipftest.c ipmon.c ipnat_y.y
ipsyncm.c ipsyncs.c lexer.c
Removed files:
contrib/ipfilter/lib addkeep.c make_range.c
Log:
Resolve conflicts
MFC after: 1 weeks
Revision Changes Path
1.6 +3 -2 src/contrib/ipfilter/Makefile
1.5 +105 -28 src/contrib/ipfilter/bpf_filter.c
1.4 +38 -5 src/contrib/ipfilter/ip_fil.c
1.4 +1 -2 src/contrib/ipfilter/ipf.h
1.8 +2 -2 src/contrib/ipfilter/iplang/iplang_y.y
1.4 +2 -1 src/contrib/ipfilter/ipmon.h
1.3 +15 -1 src/contrib/ipfilter/ipsd/sbpf.c
1.14 +3 -1 src/contrib/ipfilter/ipsend/ipsend.c
1.12 +31 -2 src/contrib/ipfilter/ipsend/iptests.c
1.4 +3 -1 src/contrib/ipfilter/ipsend/lsock.c
1.4 +6 -1 src/contrib/ipfilter/ipsend/resend.c
1.8 +15 -1 src/contrib/ipfilter/ipsend/sbpf.c
1.17 +37 -8 src/contrib/ipfilter/ipsend/sock.c
1.4 +1 -1 src/contrib/ipfilter/ipt.h
1.4 +1 -74 src/contrib/ipfilter/lib/addicmp.c
1.4 +0 -86 src/contrib/ipfilter/lib/addkeep.c (dead)
1.4 +8 -24 src/contrib/ipfilter/lib/facpri.c
1.3 +27 -0 src/contrib/ipfilter/lib/getport.c
1.4 +1 -26 src/contrib/ipfilter/lib/icmpcode.c
1.5 +7 -28 src/contrib/ipfilter/lib/ipft_tx.c
1.4 +0 -26 src/contrib/ipfilter/lib/make_range.c (dead)
1.4 +5 -1 src/contrib/ipfilter/lib/optprint.c
1.4 +15 -15 src/contrib/ipfilter/lib/printfr.c
1.4 +4 -7 src/contrib/ipfilter/lib/printlog.c
1.17 +6 -1 src/contrib/ipfilter/man/ipmon.8
1.4 +1 -1 src/contrib/ipfilter/radix.c
1.4 +0 -1 src/contrib/ipfilter/samples/proxy.c
1.5 +2 -2 src/contrib/ipfilter/tools/ipf.c
1.5 +41 -18 src/contrib/ipfilter/tools/ipf_y.y
1.4 +2 -2 src/contrib/ipfilter/tools/ipfcomp.c
1.4 +38 -17 src/contrib/ipfilter/tools/ipfs.c
1.4 +1 -3 src/contrib/ipfilter/tools/ipfstat.c
1.4 +3 -3 src/contrib/ipfilter/tools/ipftest.c
1.6 +33 -23 src/contrib/ipfilter/tools/ipmon.c
1.4 +50 -13 src/contrib/ipfilter/tools/ipnat_y.y
1.4 +6 -3 src/contrib/ipfilter/tools/ipsyncm.c
1.4 +10 -8 src/contrib/ipfilter/tools/ipsyncs.c
1.3 +2 -0 src/contrib/ipfilter/tools/lexer.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608161223.k7GCN3pl056758>