Date: Fri, 30 Dec 2005 11:52:26 +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 ipf.h ipmon.h ipt.h kmem.h mlfk_rule.c opts.h radix.c radix_ipf.h snoop.h src/contrib/ipfilter/iplang iplang_l.l iplang_y.y src/contrib/ipfilter/ipsd ipsd.c ipsdr.c ... Message-ID: <200512301152.jBUBqRBi044102@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
guido 2005-12-30 11:52:26 UTC
FreeBSD src repository
Modified files:
contrib/ipfilter Makefile bpf_filter.c ipf.h ipmon.h ipt.h
kmem.h mlfk_rule.c opts.h radix.c
radix_ipf.h snoop.h
contrib/ipfilter/iplang iplang_l.l iplang_y.y
contrib/ipfilter/ipsd ipsd.c ipsdr.c
contrib/ipfilter/ipsend arp.c ip.c ipresend.c ipsend.c
ipsopt.c iptest.c iptests.c larp.c
lsock.c resend.c sbpf.c sdlpi.c
slinux.c snit.c sock.c tcpip.h
contrib/ipfilter/lib addicmp.c addipopt.c addkeep.c binprint.c
buildopts.c checkrev.c count4bits.c
count6bits.c debug.c extras.c facpri.c
facpri.h fill6bits.c flags.c genmask.c
getline.c getnattype.c getproto.c
hostmask.c hostnum.c icmpcode.c
inet_addr.c initparse.c ionames.c
ipft_ef.c ipft_hx.c ipft_pc.c ipft_sn.c
ipft_td.c ipft_tx.c ipoptsec.c kmem.c
kmem.h load_hash.c load_hashnode.c
load_pool.c load_poolnode.c loglevel.c
make_range.c nat_setgroupmap.c natparse.c
optname.c optprint.c optprintv6.c
optvalue.c parse.c portname.c portnum.c
ports.c print_toif.c printactivenat.c
printaps.c printbuf.c printfr.c
printfraginfo.c printhostmap.c
printhostmask.c printifname.c printip.c
printlog.c printmask.c printnat.c
printpacket.c printportcmp.c printstate.c
ratoi.c ratoui.c remove_hash.c
remove_hashnode.c remove_pool.c
remove_poolnode.c tcp_flags.c tcpflags.c
tcpoptnames.c to_interface.c v6ionames.c
v6optvalue.c verbose.c
contrib/ipfilter/man ipf.5 ipftest.1 ipmon.8 ipnat.5 ipnat.8
contrib/ipfilter/samples proxy.c relay.c
contrib/ipfilter/tools ipf.c ipf_y.y ipfcomp.c ipfstat.c
ipftest.c ipmon.c ipnat.c ipnat_y.y
ipsyncm.c ipsyncs.c
Log:
Resolve conflicts (and believe me...you don't want to know).
Revision Changes Path
1.5 +23 -1 src/contrib/ipfilter/Makefile
1.4 +1 -1 src/contrib/ipfilter/bpf_filter.c
1.3 +2 -1 src/contrib/ipfilter/ipf.h
1.3 +1 -1 src/contrib/ipfilter/iplang/iplang_l.l
1.7 +7 -1 src/contrib/ipfilter/iplang/iplang_y.y
1.3 +1 -1 src/contrib/ipfilter/ipmon.h
1.3 +1 -1 src/contrib/ipfilter/ipsd/ipsd.c
1.3 +1 -1 src/contrib/ipfilter/ipsd/ipsdr.c
1.3 +2 -2 src/contrib/ipfilter/ipsend/arp.c
1.3 +1 -1 src/contrib/ipfilter/ipsend/ip.c
1.3 +1 -1 src/contrib/ipfilter/ipsend/ipresend.c
1.13 +1 -1 src/contrib/ipfilter/ipsend/ipsend.c
1.3 +1 -1 src/contrib/ipfilter/ipsend/ipsopt.c
1.3 +1 -1 src/contrib/ipfilter/ipsend/iptest.c
1.11 +2 -2 src/contrib/ipfilter/ipsend/iptests.c
1.3 +1 -1 src/contrib/ipfilter/ipsend/larp.c
1.3 +1 -1 src/contrib/ipfilter/ipsend/lsock.c
1.3 +1 -1 src/contrib/ipfilter/ipsend/resend.c
1.7 +1 -1 src/contrib/ipfilter/ipsend/sbpf.c
1.3 +1 -1 src/contrib/ipfilter/ipsend/sdlpi.c
1.3 +1 -1 src/contrib/ipfilter/ipsend/slinux.c
1.3 +1 -1 src/contrib/ipfilter/ipsend/snit.c
1.16 +1 -1 src/contrib/ipfilter/ipsend/sock.c
1.3 +1 -1 src/contrib/ipfilter/ipsend/tcpip.h
1.3 +1 -1 src/contrib/ipfilter/ipt.h
1.3 +1 -1 src/contrib/ipfilter/kmem.h
1.3 +1 -1 src/contrib/ipfilter/lib/addicmp.c
1.3 +1 -1 src/contrib/ipfilter/lib/addipopt.c
1.3 +1 -1 src/contrib/ipfilter/lib/addkeep.c
1.3 +1 -1 src/contrib/ipfilter/lib/binprint.c
1.3 +1 -1 src/contrib/ipfilter/lib/buildopts.c
1.3 +1 -1 src/contrib/ipfilter/lib/checkrev.c
1.3 +1 -1 src/contrib/ipfilter/lib/count4bits.c
1.3 +1 -1 src/contrib/ipfilter/lib/count6bits.c
1.3 +1 -1 src/contrib/ipfilter/lib/debug.c
1.3 +1 -1 src/contrib/ipfilter/lib/extras.c
1.3 +4 -4 src/contrib/ipfilter/lib/facpri.c
1.3 +1 -1 src/contrib/ipfilter/lib/facpri.h
1.3 +1 -1 src/contrib/ipfilter/lib/fill6bits.c
1.3 +1 -1 src/contrib/ipfilter/lib/flags.c
1.3 +1 -1 src/contrib/ipfilter/lib/genmask.c
1.3 +1 -1 src/contrib/ipfilter/lib/getline.c
1.3 +1 -1 src/contrib/ipfilter/lib/getnattype.c
1.3 +8 -0 src/contrib/ipfilter/lib/getproto.c
1.3 +1 -1 src/contrib/ipfilter/lib/hostmask.c
1.3 +1 -1 src/contrib/ipfilter/lib/hostnum.c
1.3 +1 -1 src/contrib/ipfilter/lib/icmpcode.c
1.3 +1 -1 src/contrib/ipfilter/lib/inet_addr.c
1.3 +1 -1 src/contrib/ipfilter/lib/initparse.c
1.3 +1 -1 src/contrib/ipfilter/lib/ionames.c
1.3 +2 -2 src/contrib/ipfilter/lib/ipft_ef.c
1.3 +5 -3 src/contrib/ipfilter/lib/ipft_hx.c
1.3 +25 -8 src/contrib/ipfilter/lib/ipft_pc.c
1.3 +2 -2 src/contrib/ipfilter/lib/ipft_sn.c
1.3 +2 -2 src/contrib/ipfilter/lib/ipft_td.c
1.4 +16 -7 src/contrib/ipfilter/lib/ipft_tx.c
1.3 +1 -1 src/contrib/ipfilter/lib/ipoptsec.c
1.3 +4 -3 src/contrib/ipfilter/lib/kmem.c
1.3 +1 -1 src/contrib/ipfilter/lib/kmem.h
1.3 +3 -3 src/contrib/ipfilter/lib/load_hash.c
1.3 +1 -1 src/contrib/ipfilter/lib/load_hashnode.c
1.3 +6 -3 src/contrib/ipfilter/lib/load_pool.c
1.3 +1 -1 src/contrib/ipfilter/lib/load_poolnode.c
1.3 +1 -1 src/contrib/ipfilter/lib/loglevel.c
1.3 +1 -1 src/contrib/ipfilter/lib/make_range.c
1.3 +1 -1 src/contrib/ipfilter/lib/nat_setgroupmap.c
1.3 +1 -1 src/contrib/ipfilter/lib/natparse.c
1.3 +1 -1 src/contrib/ipfilter/lib/optname.c
1.3 +1 -1 src/contrib/ipfilter/lib/optprint.c
1.3 +1 -1 src/contrib/ipfilter/lib/optprintv6.c
1.3 +1 -1 src/contrib/ipfilter/lib/optvalue.c
1.3 +1 -1 src/contrib/ipfilter/lib/parse.c
1.3 +1 -1 src/contrib/ipfilter/lib/portname.c
1.3 +1 -1 src/contrib/ipfilter/lib/portnum.c
1.3 +1 -1 src/contrib/ipfilter/lib/ports.c
1.3 +1 -1 src/contrib/ipfilter/lib/print_toif.c
1.3 +1 -1 src/contrib/ipfilter/lib/printactivenat.c
1.3 +1 -1 src/contrib/ipfilter/lib/printaps.c
1.3 +1 -1 src/contrib/ipfilter/lib/printbuf.c
1.3 +44 -13 src/contrib/ipfilter/lib/printfr.c
1.3 +1 -1 src/contrib/ipfilter/lib/printfraginfo.c
1.3 +4 -1 src/contrib/ipfilter/lib/printhostmap.c
1.3 +1 -1 src/contrib/ipfilter/lib/printhostmask.c
1.3 +1 -1 src/contrib/ipfilter/lib/printifname.c
1.3 +1 -1 src/contrib/ipfilter/lib/printip.c
1.3 +4 -7 src/contrib/ipfilter/lib/printlog.c
1.3 +1 -1 src/contrib/ipfilter/lib/printmask.c
1.3 +14 -32 src/contrib/ipfilter/lib/printnat.c
1.3 +3 -2 src/contrib/ipfilter/lib/printpacket.c
1.3 +1 -1 src/contrib/ipfilter/lib/printportcmp.c
1.4 +2 -2 src/contrib/ipfilter/lib/printstate.c
1.3 +1 -1 src/contrib/ipfilter/lib/ratoi.c
1.3 +1 -1 src/contrib/ipfilter/lib/ratoui.c
1.3 +1 -1 src/contrib/ipfilter/lib/remove_hash.c
1.3 +1 -1 src/contrib/ipfilter/lib/remove_hashnode.c
1.3 +1 -1 src/contrib/ipfilter/lib/remove_pool.c
1.3 +1 -1 src/contrib/ipfilter/lib/remove_poolnode.c
1.3 +1 -1 src/contrib/ipfilter/lib/tcp_flags.c
1.3 +1 -1 src/contrib/ipfilter/lib/tcpflags.c
1.3 +1 -1 src/contrib/ipfilter/lib/tcpoptnames.c
1.3 +1 -1 src/contrib/ipfilter/lib/to_interface.c
1.3 +2 -1 src/contrib/ipfilter/lib/v6ionames.c
1.3 +1 -1 src/contrib/ipfilter/lib/v6optvalue.c
1.3 +1 -1 src/contrib/ipfilter/lib/verbose.c
1.10 +5 -2 src/contrib/ipfilter/man/ipf.5
1.7 +17 -1 src/contrib/ipfilter/man/ipftest.1
1.16 +9 -1 src/contrib/ipfilter/man/ipmon.8
1.3 +2 -1 src/contrib/ipfilter/man/ipnat.5
1.3 +3 -3 src/contrib/ipfilter/man/ipnat.8
1.3 +1 -1 src/contrib/ipfilter/mlfk_rule.c
1.3 +1 -1 src/contrib/ipfilter/opts.h
1.3 +6 -0 src/contrib/ipfilter/radix.c
1.3 +9 -3 src/contrib/ipfilter/radix_ipf.h
1.3 +2 -2 src/contrib/ipfilter/samples/proxy.c
1.4 +3 -3 src/contrib/ipfilter/samples/relay.c
1.3 +1 -1 src/contrib/ipfilter/snoop.h
1.3 +1 -1 src/contrib/ipfilter/tools/ipf.c
1.4 +17 -14 src/contrib/ipfilter/tools/ipf_y.y
1.3 +1 -1 src/contrib/ipfilter/tools/ipfcomp.c
1.3 +12 -5 src/contrib/ipfilter/tools/ipfstat.c
1.3 +48 -20 src/contrib/ipfilter/tools/ipftest.c
1.5 +11 -2 src/contrib/ipfilter/tools/ipmon.c
1.4 +1 -1 src/contrib/ipfilter/tools/ipnat.c
1.3 +8 -7 src/contrib/ipfilter/tools/ipnat_y.y
1.3 +1 -1 src/contrib/ipfilter/tools/ipsyncm.c
1.3 +1 -1 src/contrib/ipfilter/tools/ipsyncs.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512301152.jBUBqRBi044102>