Module Name: src
Committed By: darrenr
Date: Sun Jul 22 14:27:52 UTC 2012
Modified Files:
src/external/bsd/ipf/dist: IPFILTER.LICENCE ip_dns_pxy.c ip_dstlist.c
ip_dstlist.h ip_fil.c ip_htable.c ip_irc_pxy.c ip_lookup.c
ip_lookup.h ip_nat6.c ip_pool.c ip_pool.h ip_pptp_pxy.c
ip_rpcb_pxy.c ip_scan.c ip_scan.h ip_sync.c ip_sync.h ip_tftp_pxy.c
ipf.h ipmon.h ipt.h kmem.h opts.h radix_ipf.c snoop.h
src/external/bsd/ipf/dist/iplang: iplang_l.l iplang_y.y
src/external/bsd/ipf/dist/ipsd: ipsd.c ipsdr.c
src/external/bsd/ipf/dist/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
src/external/bsd/ipf/dist/lib: addicmp.c addipopt.c alist_free.c
alist_new.c allocmbt.c assigndefined.c bcopywrap.c binprint.c
buildopts.c checkrev.c connecttcp.c count4bits.c count6bits.c
debug.c dupmbt.c facpri.c facpri.h fill6bits.c findword.c flags.c
freembt.c genmask.c gethost.c geticmptype.c getifname.c
getnattype.c getport.c getportproto.c getproto.c getsumd.c
hostname.c icmpcode.c icmptypename.c icmptypes.c initparse.c
interror.c ionames.c ipf_dotuning.c ipft_hx.c ipft_pc.c ipft_tx.c
ipoptsec.c kmem.c kmem.h kmemcpywrap.c kvatoname.c load_dstlist.c
load_dstlistnode.c load_file.c load_hash.c load_hashnode.c
load_http.c load_pool.c load_poolnode.c load_url.c mb_hexdump.c
msgdsize.c mutex_emul.c nametokva.c nat_setgroupmap.c ntomask.c
optname.c optprint.c optprintv6.c optvalue.c parsewhoisline.c
poolio.c portname.c prependmbt.c print_toif.c printactiveaddr.c
printactivenat.c printaddr.c printaps.c printbuf.c printfieldhdr.c
printfr.c printfraginfo.c printhost.c printhostmap.c
printhostmask.c printifname.c printip.c printlog.c printlookup.c
printmask.c printnat.c printnataddr.c printnatfield.c
printnatside.c printpacket.c printpacket6.c printpoolfield.c
printportcmp.c printproto.c printsbuf.c printstatefields.c
printtunable.c remove_hash.c remove_hashnode.c remove_pool.c
remove_poolnode.c resetlexer.c rwlock_emul.c tcpflags.c
tcpoptnames.c v6ionames.c v6optvalue.c var.c verbose.c
src/external/bsd/ipf/dist/man: ipf.4 ipf.5 ipfstat.8 ipnat.5 ippool.5
src/external/bsd/ipf/dist/tools: ipf.c ipfcomp.c ipfs.c ipfstat.c
ipfsyncd.c ipftest.c ipmon.c ipnat.c ippool.c ipsyncm.c ipsyncs.c
src/external/bsd/ipf/lib: Makefile
src/sys/external/bsd/ipf/netinet: fil.c ip_auth.c ip_auth.h ip_compat.h
ip_dns_pxy.c ip_dstlist.c ip_dstlist.h ip_fil.h ip_fil_compat.c
ip_fil_netbsd.c ip_frag.c ip_frag.h ip_ftp_pxy.c ip_htable.c
ip_htable.h ip_ipsec_pxy.c ip_irc_pxy.c ip_log.c ip_lookup.c
ip_lookup.h ip_nat.c ip_nat.h ip_nat6.c ip_netbios_pxy.c ip_pool.c
ip_pool.h ip_pptp_pxy.c ip_proxy.c ip_proxy.h ip_raudio_pxy.c
ip_rcmd_pxy.c ip_rpcb_pxy.c ip_scan.c ip_scan.h ip_state.c
ip_state.h ip_sync.c ip_sync.h ip_tftp_pxy.c ipf_rb.h ipl.h
radix_ipf.c radix_ipf.h
Removed Files:
src/external/bsd/ipf/dist/lib: ipferror.c tcp_flags.c
src/sys/external/bsd/ipf/netinet: ip_h323_pxy.c
Log Message:
Merge IPFilter 5.1.2 into HEAD
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ipf/dist/IPFILTER.LICENCE
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ipf/dist/ip_dns_pxy.c \
src/external/bsd/ipf/dist/ip_dstlist.c \
src/external/bsd/ipf/dist/ip_dstlist.h \
src/external/bsd/ipf/dist/ip_htable.c \
src/external/bsd/ipf/dist/ip_irc_pxy.c \
src/external/bsd/ipf/dist/ip_lookup.c \
src/external/bsd/ipf/dist/ip_lookup.h src/external/bsd/ipf/dist/ip_nat6.c \
src/external/bsd/ipf/dist/ip_pool.c src/external/bsd/ipf/dist/ip_pool.h \
src/external/bsd/ipf/dist/ip_pptp_pxy.c \
src/external/bsd/ipf/dist/ip_rpcb_pxy.c \
src/external/bsd/ipf/dist/ip_scan.h src/external/bsd/ipf/dist/ip_sync.c \
src/external/bsd/ipf/dist/ip_sync.h \
src/external/bsd/ipf/dist/ip_tftp_pxy.c src/external/bsd/ipf/dist/ipf.h \
src/external/bsd/ipf/dist/ipmon.h src/external/bsd/ipf/dist/ipt.h \
src/external/bsd/ipf/dist/kmem.h src/external/bsd/ipf/dist/opts.h \
src/external/bsd/ipf/dist/snoop.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/ip_fil.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/ip_scan.c \
src/external/bsd/ipf/dist/radix_ipf.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ipf/dist/iplang/iplang_l.l \
src/external/bsd/ipf/dist/iplang/iplang_y.y
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ipf/dist/ipsd/ipsd.c \
src/external/bsd/ipf/dist/ipsd/ipsdr.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ipf/dist/ipsend/arp.c \
src/external/bsd/ipf/dist/ipsend/ipresend.c \
src/external/bsd/ipf/dist/ipsend/ipsend.c \
src/external/bsd/ipf/dist/ipsend/ipsopt.c \
src/external/bsd/ipf/dist/ipsend/iptest.c \
src/external/bsd/ipf/dist/ipsend/larp.c \
src/external/bsd/ipf/dist/ipsend/lsock.c \
src/external/bsd/ipf/dist/ipsend/resend.c \
src/external/bsd/ipf/dist/ipsend/sdlpi.c \
src/external/bsd/ipf/dist/ipsend/slinux.c \
src/external/bsd/ipf/dist/ipsend/snit.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/ipsend/ip.c \
src/external/bsd/ipf/dist/ipsend/iptests.c \
src/external/bsd/ipf/dist/ipsend/sbpf.c \
src/external/bsd/ipf/dist/ipsend/sock.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ipf/dist/lib/addicmp.c \
src/external/bsd/ipf/dist/lib/addipopt.c \
src/external/bsd/ipf/dist/lib/alist_free.c \
src/external/bsd/ipf/dist/lib/alist_new.c \
src/external/bsd/ipf/dist/lib/allocmbt.c \
src/external/bsd/ipf/dist/lib/assigndefined.c \
src/external/bsd/ipf/dist/lib/bcopywrap.c \
src/external/bsd/ipf/dist/lib/binprint.c \
src/external/bsd/ipf/dist/lib/buildopts.c \
src/external/bsd/ipf/dist/lib/checkrev.c \
src/external/bsd/ipf/dist/lib/connecttcp.c \
src/external/bsd/ipf/dist/lib/count4bits.c \
src/external/bsd/ipf/dist/lib/count6bits.c \
src/external/bsd/ipf/dist/lib/debug.c \
src/external/bsd/ipf/dist/lib/dupmbt.c \
src/external/bsd/ipf/dist/lib/facpri.c \
src/external/bsd/ipf/dist/lib/facpri.h \
src/external/bsd/ipf/dist/lib/fill6bits.c \
src/external/bsd/ipf/dist/lib/findword.c \
src/external/bsd/ipf/dist/lib/flags.c \
src/external/bsd/ipf/dist/lib/freembt.c \
src/external/bsd/ipf/dist/lib/genmask.c \
src/external/bsd/ipf/dist/lib/gethost.c \
src/external/bsd/ipf/dist/lib/geticmptype.c \
src/external/bsd/ipf/dist/lib/getifname.c \
src/external/bsd/ipf/dist/lib/getnattype.c \
src/external/bsd/ipf/dist/lib/getport.c \
src/external/bsd/ipf/dist/lib/getportproto.c \
src/external/bsd/ipf/dist/lib/getproto.c \
src/external/bsd/ipf/dist/lib/getsumd.c \
src/external/bsd/ipf/dist/lib/hostname.c \
src/external/bsd/ipf/dist/lib/icmpcode.c \
src/external/bsd/ipf/dist/lib/icmptypename.c \
src/external/bsd/ipf/dist/lib/icmptypes.c \
src/external/bsd/ipf/dist/lib/initparse.c \
src/external/bsd/ipf/dist/lib/interror.c \
src/external/bsd/ipf/dist/lib/ionames.c \
src/external/bsd/ipf/dist/lib/ipf_dotuning.c \
src/external/bsd/ipf/dist/lib/ipft_hx.c \
src/external/bsd/ipf/dist/lib/ipft_pc.c \
src/external/bsd/ipf/dist/lib/ipft_tx.c \
src/external/bsd/ipf/dist/lib/ipoptsec.c \
src/external/bsd/ipf/dist/lib/kmem.c src/external/bsd/ipf/dist/lib/kmem.h \
src/external/bsd/ipf/dist/lib/kmemcpywrap.c \
src/external/bsd/ipf/dist/lib/kvatoname.c \
src/external/bsd/ipf/dist/lib/load_dstlist.c \
src/external/bsd/ipf/dist/lib/load_dstlistnode.c \
src/external/bsd/ipf/dist/lib/load_file.c \
src/external/bsd/ipf/dist/lib/load_hash.c \
src/external/bsd/ipf/dist/lib/load_hashnode.c \
src/external/bsd/ipf/dist/lib/load_pool.c \
src/external/bsd/ipf/dist/lib/load_poolnode.c \
src/external/bsd/ipf/dist/lib/load_url.c \
src/external/bsd/ipf/dist/lib/mb_hexdump.c \
src/external/bsd/ipf/dist/lib/msgdsize.c \
src/external/bsd/ipf/dist/lib/mutex_emul.c \
src/external/bsd/ipf/dist/lib/nametokva.c \
src/external/bsd/ipf/dist/lib/nat_setgroupmap.c \
src/external/bsd/ipf/dist/lib/ntomask.c \
src/external/bsd/ipf/dist/lib/optname.c \
src/external/bsd/ipf/dist/lib/optprint.c \
src/external/bsd/ipf/dist/lib/optprintv6.c \
src/external/bsd/ipf/dist/lib/optvalue.c \
src/external/bsd/ipf/dist/lib/parsewhoisline.c \
src/external/bsd/ipf/dist/lib/poolio.c \
src/external/bsd/ipf/dist/lib/portname.c \
src/external/bsd/ipf/dist/lib/prependmbt.c \
src/external/bsd/ipf/dist/lib/print_toif.c \
src/external/bsd/ipf/dist/lib/printactiveaddr.c \
src/external/bsd/ipf/dist/lib/printaddr.c \
src/external/bsd/ipf/dist/lib/printbuf.c \
src/external/bsd/ipf/dist/lib/printfieldhdr.c \
src/external/bsd/ipf/dist/lib/printfr.c \
src/external/bsd/ipf/dist/lib/printfraginfo.c \
src/external/bsd/ipf/dist/lib/printhost.c \
src/external/bsd/ipf/dist/lib/printhostmap.c \
src/external/bsd/ipf/dist/lib/printhostmask.c \
src/external/bsd/ipf/dist/lib/printifname.c \
src/external/bsd/ipf/dist/lib/printip.c \
src/external/bsd/ipf/dist/lib/printlog.c \
src/external/bsd/ipf/dist/lib/printlookup.c \
src/external/bsd/ipf/dist/lib/printmask.c \
src/external/bsd/ipf/dist/lib/printnat.c \
src/external/bsd/ipf/dist/lib/printnataddr.c \
src/external/bsd/ipf/dist/lib/printnatfield.c \
src/external/bsd/ipf/dist/lib/printnatside.c \
src/external/bsd/ipf/dist/lib/printpacket.c \
src/external/bsd/ipf/dist/lib/printpacket6.c \
src/external/bsd/ipf/dist/lib/printpoolfield.c \
src/external/bsd/ipf/dist/lib/printportcmp.c \
src/external/bsd/ipf/dist/lib/printproto.c \
src/external/bsd/ipf/dist/lib/printsbuf.c \
src/external/bsd/ipf/dist/lib/printstatefields.c \
src/external/bsd/ipf/dist/lib/printtunable.c \
src/external/bsd/ipf/dist/lib/remove_hash.c \
src/external/bsd/ipf/dist/lib/remove_hashnode.c \
src/external/bsd/ipf/dist/lib/remove_pool.c \
src/external/bsd/ipf/dist/lib/remove_poolnode.c \
src/external/bsd/ipf/dist/lib/resetlexer.c \
src/external/bsd/ipf/dist/lib/rwlock_emul.c \
src/external/bsd/ipf/dist/lib/tcpflags.c \
src/external/bsd/ipf/dist/lib/tcpoptnames.c \
src/external/bsd/ipf/dist/lib/v6ionames.c \
src/external/bsd/ipf/dist/lib/v6optvalue.c \
src/external/bsd/ipf/dist/lib/var.c \
src/external/bsd/ipf/dist/lib/verbose.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ipf/dist/lib/ipferror.c \
src/external/bsd/ipf/dist/lib/tcp_flags.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/lib/load_http.c \
src/external/bsd/ipf/dist/lib/printactivenat.c \
src/external/bsd/ipf/dist/lib/printaps.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/man/ipf.4 \
src/external/bsd/ipf/dist/man/ipf.5 \
src/external/bsd/ipf/dist/man/ipfstat.8 \
src/external/bsd/ipf/dist/man/ipnat.5 \
src/external/bsd/ipf/dist/man/ippool.5
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ipf/dist/tools/ipf.c \
src/external/bsd/ipf/dist/tools/ipfs.c \
src/external/bsd/ipf/dist/tools/ipfsyncd.c \
src/external/bsd/ipf/dist/tools/ipnat.c \
src/external/bsd/ipf/dist/tools/ipsyncm.c \
src/external/bsd/ipf/dist/tools/ipsyncs.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/tools/ipfcomp.c \
src/external/bsd/ipf/dist/tools/ipfstat.c \
src/external/bsd/ipf/dist/tools/ipftest.c \
src/external/bsd/ipf/dist/tools/ipmon.c \
src/external/bsd/ipf/dist/tools/ippool.c
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ipf/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/ipf/netinet/fil.c \
src/sys/external/bsd/ipf/netinet/ip_auth.c \
src/sys/external/bsd/ipf/netinet/ip_auth.h \
src/sys/external/bsd/ipf/netinet/ip_compat.h \
src/sys/external/bsd/ipf/netinet/ip_dns_pxy.c \
src/sys/external/bsd/ipf/netinet/ip_dstlist.c \
src/sys/external/bsd/ipf/netinet/ip_dstlist.h \
src/sys/external/bsd/ipf/netinet/ip_fil.h \
src/sys/external/bsd/ipf/netinet/ip_fil_compat.c \
src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c \
src/sys/external/bsd/ipf/netinet/ip_frag.c \
src/sys/external/bsd/ipf/netinet/ip_frag.h \
src/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c \
src/sys/external/bsd/ipf/netinet/ip_htable.c \
src/sys/external/bsd/ipf/netinet/ip_htable.h \
src/sys/external/bsd/ipf/netinet/ip_ipsec_pxy.c \
src/sys/external/bsd/ipf/netinet/ip_irc_pxy.c \
src/sys/external/bsd/ipf/netinet/ip_log.c \
src/sys/external/bsd/ipf/netinet/ip_lookup.c \
src/sys/external/bsd/ipf/netinet/ip_lookup.h \
src/sys/external/bsd/ipf/netinet/ip_nat.c \
src/sys/external/bsd/ipf/netinet/ip_nat.h \
src/sys/external/bsd/ipf/netinet/ip_nat6.c \
src/sys/external/bsd/ipf/netinet/ip_netbios_pxy.c \
src/sys/external/bsd/ipf/netinet/ip_pool.c \
src/sys/external/bsd/ipf/netinet/ip_pool.h \
src/sys/external/bsd/ipf/netinet/ip_pptp_pxy.c \
src/sys/external/bsd/ipf/netinet/ip_proxy.c \
src/sys/external/bsd/ipf/netinet/ip_proxy.h \
src/sys/external/bsd/ipf/netinet/ip_raudio_pxy.c \
src/sys/external/bsd/ipf/netinet/ip_rcmd_pxy.c \
src/sys/external/bsd/ipf/netinet/ip_rpcb_pxy.c \
src/sys/external/bsd/ipf/netinet/ip_scan.c \
src/sys/external/bsd/ipf/netinet/ip_scan.h \
src/sys/external/bsd/ipf/netinet/ip_state.c \
src/sys/external/bsd/ipf/netinet/ip_state.h \
src/sys/external/bsd/ipf/netinet/ip_sync.c \
src/sys/external/bsd/ipf/netinet/ip_sync.h \
src/sys/external/bsd/ipf/netinet/ip_tftp_pxy.c \
src/sys/external/bsd/ipf/netinet/ipf_rb.h \
src/sys/external/bsd/ipf/netinet/ipl.h \
src/sys/external/bsd/ipf/netinet/radix_ipf.c \
src/sys/external/bsd/ipf/netinet/radix_ipf.h
cvs rdiff -u -r1.1 -r0 src/sys/external/bsd/ipf/netinet/ip_h323_pxy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
