From owner-cvs-src@FreeBSD.ORG Wed Oct 31 05:00:39 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89FFA16A419; Wed, 31 Oct 2007 05:00:39 +0000 (UTC) (envelope-from darrenr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 793F213C4A6; Wed, 31 Oct 2007 05:00:39 +0000 (UTC) (envelope-from darrenr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V50d4p011814; Wed, 31 Oct 2007 05:00:39 GMT (envelope-from darrenr@repoman.freebsd.org) Received: (from darrenr@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V50dij011813; Wed, 31 Oct 2007 05:00:39 GMT (envelope-from darrenr) Message-Id: <200710310500.l9V50dij011813@repoman.freebsd.org> From: Darren Reed Date: Wed, 31 Oct 2007 05:00:38 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_7 Cc: Subject: cvs commit: src/contrib/ipfilter HISTORY Makefile ip_fil.c md5.h radix.c radix_ipf.h src/contrib/ipfilter/BSD Makefile kupgrade src/contrib/ipfilter/iplang Makefile src/contrib/ipfilter/ipsend iptests.c sock.c src/contrib/ipfilter/l4check Makefile l4check.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: Wed, 31 Oct 2007 05:00:39 -0000 darrenr 2007-10-31 05:00:38 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) contrib/ipfilter HISTORY Makefile ip_fil.c md5.h radix.c radix_ipf.h contrib/ipfilter/BSD Makefile kupgrade contrib/ipfilter/iplang Makefile contrib/ipfilter/ipsend iptests.c sock.c contrib/ipfilter/l4check Makefile l4check.c contrib/ipfilter/lib Makefile alist_new.c ipft_tx.c printnat.c printpacket.c printpool_live.c printstate.c contrib/ipfilter/man ippool.5 contrib/ipfilter/test Makefile dotest nattest test.format contrib/ipfilter/test/expected f11 i21 in1 in6 contrib/ipfilter/test/input f11 l1 contrib/ipfilter/test/regress i21 i3 in1 in6 contrib/ipfilter/tools ipf_y.y ipfstat.c ipmon.c ipnat.c ipnat_y.y lexer.c sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_compat.h ip_fil.h ip_fil_freebsd.c ip_frag.c ip_htable.c ip_log.c ip_lookup.c ip_lookup.h ip_nat.c ip_nat.h ip_pool.c ip_pool.h ip_proxy.c ip_rpcb_pxy.c ip_scan.c ip_state.c ip_state.h ip_sync.c ipl.h mlfk_ipl.c Log: MFC the following: Apply a few changes from ipfilter-current: * Do not hold any locks over calls to copyin/copyout. * Clean up some #ifdefs * fix a possible mbuf leak when NAT fails on policy routed packets PR: 117216 Approved by: re Revision Changes Path 1.1.1.12.2.1 +10 -2 src/contrib/ipfilter/BSD/Makefile 1.1.1.7.2.1 +9 -5 src/contrib/ipfilter/BSD/kupgrade 1.1.1.27.2.1 +99 -1 src/contrib/ipfilter/HISTORY 1.7.2.1 +9 -12 src/contrib/ipfilter/Makefile 1.5.2.1 +7 -4 src/contrib/ipfilter/ip_fil.c 1.1.1.4.10.1 +5 -4 src/contrib/ipfilter/iplang/Makefile 1.13.2.1 +7 -3 src/contrib/ipfilter/ipsend/iptests.c 1.18.2.1 +7 -3 src/contrib/ipfilter/ipsend/sock.c 1.1.1.1.24.1 +1 -1 src/contrib/ipfilter/l4check/Makefile 1.2.10.1 +31 -14 src/contrib/ipfilter/l4check/l4check.c 1.1.1.4.2.1 +1 -7 src/contrib/ipfilter/lib/Makefile 1.1.1.1.2.1 +5 -3 src/contrib/ipfilter/lib/alist_new.c 1.6.2.1 +24 -13 src/contrib/ipfilter/lib/ipft_tx.c 1.4.2.1 +10 -5 src/contrib/ipfilter/lib/printnat.c 1.4.2.1 +3 -3 src/contrib/ipfilter/lib/printpacket.c 1.1.1.1.2.1 +9 -4 src/contrib/ipfilter/lib/printpool_live.c 1.5.2.1 +3 -3 src/contrib/ipfilter/lib/printstate.c 1.2.10.1 +2 -2 src/contrib/ipfilter/man/ippool.5 1.2.10.1 +2 -2 src/contrib/ipfilter/md5.h 1.4.2.1 +7 -1 src/contrib/ipfilter/radix.c 1.4.2.1 +3 -3 src/contrib/ipfilter/radix_ipf.h 1.1.1.16.2.1 +14 -10 src/contrib/ipfilter/test/Makefile 1.1.1.4.2.1 +7 -1 src/contrib/ipfilter/test/dotest 1.1.1.2.24.1 +124 -0 src/contrib/ipfilter/test/expected/f11 1.1.1.1.2.1 +6 -0 src/contrib/ipfilter/test/expected/i21 1.1.1.5.2.1 +1 -0 src/contrib/ipfilter/test/expected/in1 1.1.1.2.2.1 +1 -0 src/contrib/ipfilter/test/expected/in6 1.1.1.3.10.1 +11 -11 src/contrib/ipfilter/test/input/f11 1.1.1.2.10.1 +8 -8 src/contrib/ipfilter/test/input/l1 1.1.1.2.10.1 +8 -1 src/contrib/ipfilter/test/nattest 1.1.1.1.2.1 +1 -0 src/contrib/ipfilter/test/regress/i21 1.1.1.3.10.1 +4 -2 src/contrib/ipfilter/test/regress/i3 1.1.1.4.2.1 +1 -0 src/contrib/ipfilter/test/regress/in1 1.1.1.2.2.1 +1 -0 src/contrib/ipfilter/test/regress/in6 1.1.1.4.2.1 +4 -1 src/contrib/ipfilter/test/test.format 1.6.2.1 +25 -1 src/contrib/ipfilter/tools/ipf_y.y 1.6.2.1 +4 -4 src/contrib/ipfilter/tools/ipfstat.c 1.7.2.1 +33 -4 src/contrib/ipfilter/tools/ipmon.c 1.5.2.1 +63 -4 src/contrib/ipfilter/tools/ipnat.c 1.5.2.1 +2 -1 src/contrib/ipfilter/tools/ipnat_y.y 1.4.2.1 +40 -17 src/contrib/ipfilter/tools/lexer.c 1.52.2.1 +164 -125 src/sys/contrib/ipfilter/netinet/fil.c 1.44.2.1 +19 -19 src/sys/contrib/ipfilter/netinet/ip_auth.c 1.33.2.1 +127 -57 src/sys/contrib/ipfilter/netinet/ip_compat.h 1.35.2.1 +32 -21 src/sys/contrib/ipfilter/netinet/ip_fil.h 1.6.2.1 +136 -149 src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c 1.32.2.1 +9 -9 src/sys/contrib/ipfilter/netinet/ip_frag.c 1.4.2.1 +40 -52 src/sys/contrib/ipfilter/netinet/ip_htable.c 1.33.2.1 +22 -16 src/sys/contrib/ipfilter/netinet/ip_log.c 1.1.1.3.2.1 +43 -7 src/sys/contrib/ipfilter/netinet/ip_lookup.c 1.1.1.3.2.1 +1 -2 src/sys/contrib/ipfilter/netinet/ip_lookup.h 1.42.2.1 +189 -69 src/sys/contrib/ipfilter/netinet/ip_nat.c 1.26.2.1 +7 -3 src/sys/contrib/ipfilter/netinet/ip_nat.h 1.1.1.3.2.1 +36 -49 src/sys/contrib/ipfilter/netinet/ip_pool.c 1.1.1.3.2.1 +2 -2 src/sys/contrib/ipfilter/netinet/ip_pool.h 1.29.2.1 +7 -5 src/sys/contrib/ipfilter/netinet/ip_proxy.c 1.1.1.3.2.1 +1 -1 src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c 1.1.1.4.2.1 +4 -2 src/sys/contrib/ipfilter/netinet/ip_scan.c 1.39.2.1 +109 -65 src/sys/contrib/ipfilter/netinet/ip_state.c 1.19.2.1 +5 -7 src/sys/contrib/ipfilter/netinet/ip_state.h 1.5.2.1 +6 -6 src/sys/contrib/ipfilter/netinet/ip_sync.c 1.26.2.1 +5 -5 src/sys/contrib/ipfilter/netinet/ipl.h 1.19.2.1 +11 -2 src/sys/contrib/ipfilter/netinet/mlfk_ipl.c