From owner-cvs-src@FreeBSD.ORG Mon Jun 4 02:54:37 2007 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4E04916A41F; Mon, 4 Jun 2007 02:54:37 +0000 (UTC) (envelope-from darrenr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3B3F413C457; Mon, 4 Jun 2007 02:54:37 +0000 (UTC) (envelope-from darrenr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l542sbe2089178; Mon, 4 Jun 2007 02:54:37 GMT (envelope-from darrenr@repoman.freebsd.org) Received: (from darrenr@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l542saoc089176; Mon, 4 Jun 2007 02:54:36 GMT (envelope-from darrenr) Message-Id: <200706040254.l542saoc089176@repoman.freebsd.org> From: Darren Reed Date: Mon, 4 Jun 2007 02:54:36 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/contrib/ipfilter Makefile bpf_filter.c ip_fil.c ipf.h radix_ipf.h src/contrib/ipfilter/iplang iplang_y.y src/contrib/ipfilter/ipsend 44arp.c arp.c ip.c iptests.c resend.c sdlpi.c sock.c src/contrib/ipfilter/lib addicmp.c addipopt.c ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jun 2007 02:54:37 -0000 darrenr 2007-06-04 02:54:36 UTC FreeBSD src repository Modified files: contrib/ipfilter Makefile bpf_filter.c ip_fil.c ipf.h radix_ipf.h contrib/ipfilter/iplang iplang_y.y contrib/ipfilter/ipsend 44arp.c arp.c ip.c iptests.c resend.c sdlpi.c sock.c contrib/ipfilter/lib addicmp.c addipopt.c bcopywrap.c binprint.c buildopts.c checkrev.c count4bits.c count6bits.c debug.c facpri.c facpri.h fill6bits.c flags.c gethost.c getifname.c getnattype.c getport.c getportproto.c getproto.c getsumd.c hostname.c icmpcode.c initparse.c ionames.c ipf_dotuning.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 kmemcpywrap.c kvatoname.c load_hash.c load_hashnode.c load_pool.c load_poolnode.c mutex_emul.c nametokva.c nat_setgroupmap.c ntomask.c optname.c optprint.c optprintv6.c optvalue.c portname.c print_toif.c printactivenat.c printaps.c printbuf.c printfr.c printfraginfo.c printhash.c printhashnode.c printhostmap.c printhostmask.c printifname.c printip.c printlog.c printmask.c printnat.c printpacket.c printpacket6.c printpool.c printpoolnode.c printportcmp.c printsbuf.c printstate.c printtunable.c remove_hash.c remove_hashnode.c remove_pool.c remove_poolnode.c resetlexer.c rwlock_emul.c tcp_flags.c tcpflags.c tcpoptnames.c v6ionames.c v6optvalue.c var.c verbose.c contrib/ipfilter/man ipf.8 ipfstat.8 ipmon.8 contrib/ipfilter/tools ipf.c ipf_y.y ipfcomp.c ipfs.c ipfstat.c ipftest.c ipmon.c ipmon_y.y ipnat.c ipnat_y.y ippool.c ippool_y.y ipscan_y.y ipsyncm.c ipsyncs.c lex_var.h lexer.c lexer.h sbin/ipf/libipf Makefile sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_auth.h ip_compat.h ip_fil.h ip_fil_freebsd.c ip_frag.c ip_frag.h ip_ftp_pxy.c ip_htable.c ip_log.c ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h ip_raudio_pxy.c ip_rcmd_pxy.c ip_state.c ip_state.h ip_sync.c ipl.h mlfk_ipl.c Log: Merge IPFilter 4.1.23 back to HEAD See src/contrib/ipfilter/HISTORY for details of changes since 4.1.13 Revision Changes Path 1.7 +10 -1 src/contrib/ipfilter/Makefile 1.6 +3 -2 src/contrib/ipfilter/bpf_filter.c 1.5 +20 -220 src/contrib/ipfilter/ip_fil.c 1.5 +14 -21 src/contrib/ipfilter/ipf.h 1.9 +7 -4 src/contrib/ipfilter/iplang/iplang_y.y 1.3 +3 -1 src/contrib/ipfilter/ipsend/44arp.c 1.4 +6 -3 src/contrib/ipfilter/ipsend/arp.c 1.4 +4 -1 src/contrib/ipfilter/ipsend/ip.c 1.13 +4 -1 src/contrib/ipfilter/ipsend/iptests.c 1.5 +4 -1 src/contrib/ipfilter/ipsend/resend.c 1.4 +2 -1 src/contrib/ipfilter/ipsend/sdlpi.c 1.18 +8 -2 src/contrib/ipfilter/ipsend/sock.c 1.5 +2 -2 src/contrib/ipfilter/lib/addicmp.c 1.4 +2 -2 src/contrib/ipfilter/lib/addipopt.c 1.3 +8 -0 src/contrib/ipfilter/lib/bcopywrap.c 1.4 +2 -2 src/contrib/ipfilter/lib/binprint.c 1.4 +2 -2 src/contrib/ipfilter/lib/buildopts.c 1.4 +2 -2 src/contrib/ipfilter/lib/checkrev.c 1.4 +2 -2 src/contrib/ipfilter/lib/count4bits.c 1.4 +2 -2 src/contrib/ipfilter/lib/count6bits.c 1.4 +2 -2 src/contrib/ipfilter/lib/debug.c 1.5 +3 -3 src/contrib/ipfilter/lib/facpri.c 1.4 +2 -2 src/contrib/ipfilter/lib/facpri.h 1.4 +2 -2 src/contrib/ipfilter/lib/fill6bits.c 1.4 +2 -2 src/contrib/ipfilter/lib/flags.c 1.3 +8 -0 src/contrib/ipfilter/lib/gethost.c 1.3 +16 -0 src/contrib/ipfilter/lib/getifname.c 1.4 +18 -11 src/contrib/ipfilter/lib/getnattype.c 1.4 +8 -0 src/contrib/ipfilter/lib/getport.c 1.3 +8 -0 src/contrib/ipfilter/lib/getportproto.c 1.4 +8 -0 src/contrib/ipfilter/lib/getproto.c 1.3 +8 -0 src/contrib/ipfilter/lib/getsumd.c 1.3 +9 -0 src/contrib/ipfilter/lib/hostname.c 1.5 +2 -2 src/contrib/ipfilter/lib/icmpcode.c 1.4 +2 -2 src/contrib/ipfilter/lib/initparse.c 1.4 +2 -2 src/contrib/ipfilter/lib/ionames.c 1.5 +8 -0 src/contrib/ipfilter/lib/ipf_dotuning.c 1.4 +14 -9 src/contrib/ipfilter/lib/ipft_ef.c 1.4 +2 -2 src/contrib/ipfilter/lib/ipft_hx.c 1.4 +3 -3 src/contrib/ipfilter/lib/ipft_pc.c 1.4 +3 -3 src/contrib/ipfilter/lib/ipft_sn.c 1.4 +7 -3 src/contrib/ipfilter/lib/ipft_td.c 1.6 +8 -9 src/contrib/ipfilter/lib/ipft_tx.c 1.4 +2 -2 src/contrib/ipfilter/lib/ipoptsec.c 1.4 +2 -2 src/contrib/ipfilter/lib/kmem.c 1.4 +2 -2 src/contrib/ipfilter/lib/kmem.h 1.3 +8 -0 src/contrib/ipfilter/lib/kmemcpywrap.c 1.3 +8 -0 src/contrib/ipfilter/lib/kvatoname.c 1.4 +5 -3 src/contrib/ipfilter/lib/load_hash.c 1.4 +2 -2 src/contrib/ipfilter/lib/load_hashnode.c 1.4 +2 -2 src/contrib/ipfilter/lib/load_pool.c 1.4 +3 -3 src/contrib/ipfilter/lib/load_poolnode.c 1.3 +8 -0 src/contrib/ipfilter/lib/mutex_emul.c 1.3 +8 -0 src/contrib/ipfilter/lib/nametokva.c 1.4 +2 -2 src/contrib/ipfilter/lib/nat_setgroupmap.c 1.3 +8 -0 src/contrib/ipfilter/lib/ntomask.c 1.4 +2 -2 src/contrib/ipfilter/lib/optname.c 1.5 +2 -2 src/contrib/ipfilter/lib/optprint.c 1.4 +2 -2 src/contrib/ipfilter/lib/optprintv6.c 1.4 +2 -2 src/contrib/ipfilter/lib/optvalue.c 1.4 +2 -2 src/contrib/ipfilter/lib/portname.c 1.4 +2 -2 src/contrib/ipfilter/lib/print_toif.c 1.4 +9 -7 src/contrib/ipfilter/lib/printactivenat.c 1.4 +2 -2 src/contrib/ipfilter/lib/printaps.c 1.4 +2 -2 src/contrib/ipfilter/lib/printbuf.c 1.5 +7 -2 src/contrib/ipfilter/lib/printfr.c 1.4 +7 -6 src/contrib/ipfilter/lib/printfraginfo.c 1.3 +8 -94 src/contrib/ipfilter/lib/printhash.c 1.3 +2 -1 src/contrib/ipfilter/lib/printhashnode.c 1.4 +9 -3 src/contrib/ipfilter/lib/printhostmap.c 1.4 +2 -2 src/contrib/ipfilter/lib/printhostmask.c 1.4 +2 -2 src/contrib/ipfilter/lib/printifname.c 1.4 +2 -2 src/contrib/ipfilter/lib/printip.c 1.5 +2 -2 src/contrib/ipfilter/lib/printlog.c 1.4 +2 -2 src/contrib/ipfilter/lib/printmask.c 1.4 +10 -4 src/contrib/ipfilter/lib/printnat.c 1.4 +3 -2 src/contrib/ipfilter/lib/printpacket.c 1.3 +8 -0 src/contrib/ipfilter/lib/printpacket6.c 1.3 +5 -51 src/contrib/ipfilter/lib/printpool.c 1.3 +4 -4 src/contrib/ipfilter/lib/printpoolnode.c 1.4 +2 -2 src/contrib/ipfilter/lib/printportcmp.c 1.3 +8 -0 src/contrib/ipfilter/lib/printsbuf.c 1.5 +78 -78 src/contrib/ipfilter/lib/printstate.c 1.3 +8 -0 src/contrib/ipfilter/lib/printtunable.c 1.4 +2 -2 src/contrib/ipfilter/lib/remove_hash.c 1.4 +2 -2 src/contrib/ipfilter/lib/remove_hashnode.c 1.4 +2 -2 src/contrib/ipfilter/lib/remove_pool.c 1.4 +2 -2 src/contrib/ipfilter/lib/remove_poolnode.c 1.3 +8 -0 src/contrib/ipfilter/lib/resetlexer.c 1.3 +8 -0 src/contrib/ipfilter/lib/rwlock_emul.c 1.4 +2 -2 src/contrib/ipfilter/lib/tcp_flags.c 1.4 +2 -2 src/contrib/ipfilter/lib/tcpflags.c 1.4 +2 -2 src/contrib/ipfilter/lib/tcpoptnames.c 1.4 +2 -2 src/contrib/ipfilter/lib/v6ionames.c 1.4 +2 -2 src/contrib/ipfilter/lib/v6optvalue.c 1.3 +8 -0 src/contrib/ipfilter/lib/var.c 1.4 +2 -2 src/contrib/ipfilter/lib/verbose.c 1.8 +12 -0 src/contrib/ipfilter/man/ipf.8 1.11 +5 -1 src/contrib/ipfilter/man/ipfstat.8 1.18 +1 -0 src/contrib/ipfilter/man/ipmon.8 1.4 +1 -1 src/contrib/ipfilter/radix_ipf.h 1.6 +7 -5 src/contrib/ipfilter/tools/ipf.c 1.6 +33 -11 src/contrib/ipfilter/tools/ipf_y.y 1.5 +20 -7 src/contrib/ipfilter/tools/ipfcomp.c 1.5 +18 -2 src/contrib/ipfilter/tools/ipfs.c 1.5 +412 -96 src/contrib/ipfilter/tools/ipfstat.c 1.5 +15 -13 src/contrib/ipfilter/tools/ipftest.c 1.7 +33 -10 src/contrib/ipfilter/tools/ipmon.c 1.3 +6 -0 src/contrib/ipfilter/tools/ipmon_y.y 1.5 +178 -59 src/contrib/ipfilter/tools/ipnat.c 1.5 +9 -3 src/contrib/ipfilter/tools/ipnat_y.y 1.4 +346 -168 src/contrib/ipfilter/tools/ippool.c 1.3 +110 -3 src/contrib/ipfilter/tools/ippool_y.y 1.3 +6 -0 src/contrib/ipfilter/tools/ipscan_y.y 1.5 +2 -2 src/contrib/ipfilter/tools/ipsyncm.c 1.5 +2 -2 src/contrib/ipfilter/tools/ipsyncs.c 1.3 +5 -0 src/contrib/ipfilter/tools/lex_var.h 1.4 +11 -5 src/contrib/ipfilter/tools/lexer.c 1.3 +5 -0 src/contrib/ipfilter/tools/lexer.h 1.6 +22 -22 src/sbin/ipf/libipf/Makefile 1.51 +1125 -173 src/sys/contrib/ipfilter/netinet/fil.c 1.44 +471 -232 src/sys/contrib/ipfilter/netinet/ip_auth.c 1.16 +3 -1 src/sys/contrib/ipfilter/netinet/ip_auth.h 1.33 +62 -55 src/sys/contrib/ipfilter/netinet/ip_compat.h 1.35 +166 -20 src/sys/contrib/ipfilter/netinet/ip_fil.h 1.6 +82 -166 src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c 1.32 +162 -32 src/sys/contrib/ipfilter/netinet/ip_frag.c 1.19 +21 -4 src/sys/contrib/ipfilter/netinet/ip_frag.h 1.28 +4 -30 src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c 1.4 +303 -103 src/sys/contrib/ipfilter/netinet/ip_htable.c 1.33 +10 -5 src/sys/contrib/ipfilter/netinet/ip_log.c 1.42 +725 -244 src/sys/contrib/ipfilter/netinet/ip_nat.c 1.26 +13 -22 src/sys/contrib/ipfilter/netinet/ip_nat.h 1.29 +9 -8 src/sys/contrib/ipfilter/netinet/ip_proxy.c 1.17 +2 -1 src/sys/contrib/ipfilter/netinet/ip_proxy.h 1.13 +3 -3 src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c 1.15 +2 -2 src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c 1.39 +503 -230 src/sys/contrib/ipfilter/netinet/ip_state.c 1.19 +4 -3 src/sys/contrib/ipfilter/netinet/ip_state.h 1.5 +4 -3 src/sys/contrib/ipfilter/netinet/ip_sync.c 1.26 +2 -2 src/sys/contrib/ipfilter/netinet/ipl.h 1.19 +27 -9 src/sys/contrib/ipfilter/netinet/mlfk_ipl.c