From owner-freebsd-ipfw@FreeBSD.ORG  Fri Dec 10 05:20:15 2010
Return-Path: <owner-freebsd-ipfw@FreeBSD.ORG>
Delivered-To: freebsd-ipfw@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2E6EF10656EF
	for <freebsd-ipfw@hub.freebsd.org>;
	Fri, 10 Dec 2010 05:20:15 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 03A788FC25
	for <freebsd-ipfw@hub.freebsd.org>;
	Fri, 10 Dec 2010 05:20:15 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oBA5KEGB099880
	for <freebsd-ipfw@freefall.freebsd.org>; Fri, 10 Dec 2010 05:20:14 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oBA5KEfs099878;
	Fri, 10 Dec 2010 05:20:14 GMT (envelope-from gnats)
Date: Fri, 10 Dec 2010 05:20:14 GMT
Message-Id: <201012100520.oBA5KEfs099878@freefall.freebsd.org>
To: freebsd-ipfw@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: kern/149572: commit references a PR
X-BeenThere: freebsd-ipfw@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: IPFW Technical Discussions <freebsd-ipfw.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ipfw>,
	<mailto:freebsd-ipfw-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ipfw>
List-Post: <mailto:freebsd-ipfw@freebsd.org>
List-Help: <mailto:freebsd-ipfw-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ipfw>,
	<mailto:freebsd-ipfw-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Dec 2010 05:20:15 -0000

The following reply was made to PR kern/149572; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/149572: commit references a PR
Date: Fri, 10 Dec 2010 05:18:46 +0000 (UTC)

 Author: ae
 Date: Fri Dec 10 05:18:37 2010
 New Revision: 216348
 URL: http://svn.freebsd.org/changeset/base/216348
 
 Log:
   MFC r213254 by luigi:
      fix breakage in in-kernel NAT: the code did not honor
      net.inet.ip.fw.one_pass and always moved to the next rule
      in case of a successful nat.
   
      This should fix several related PR (waiting for feedback
      before closing them)
   
      PR:		145167 149572 150141
   
   Approved by:	re (bz)
 
 Modified:
   stable/8/sys/netinet/ipfw/ip_fw_pfil.c
 Directory Properties:
   stable/8/sys/   (props changed)
   stable/8/sys/amd64/include/xen/   (props changed)
   stable/8/sys/cddl/contrib/opensolaris/   (props changed)
   stable/8/sys/contrib/dev/acpica/   (props changed)
   stable/8/sys/contrib/pf/   (props changed)
 
 Modified: stable/8/sys/netinet/ipfw/ip_fw_pfil.c
 ==============================================================================
 --- stable/8/sys/netinet/ipfw/ip_fw_pfil.c	Fri Dec 10 05:16:25 2010	(r216347)
 +++ stable/8/sys/netinet/ipfw/ip_fw_pfil.c	Fri Dec 10 05:18:37 2010	(r216348)
 @@ -231,6 +231,11 @@ again:
  		break;
  
  	case IP_FW_NAT:
 +		/* honor one-pass in case of successful nat */
 +		if (V_fw_one_pass)
 +			break; /* ret is already 0 */
 +		goto again;
 +
  	case IP_FW_REASS:
  		goto again;		/* continue with packet */
  	
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"