From owner-svn-src-stable@FreeBSD.ORG  Fri Dec 10 05:18:38 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3379F1065670;
	Fri, 10 Dec 2010 05:18:38 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 229038FC1D;
	Fri, 10 Dec 2010 05:18:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBA5IcWR062278;
	Fri, 10 Dec 2010 05:18:38 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBA5IcgC062276;
	Fri, 10 Dec 2010 05:18:38 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201012100518.oBA5IcgC062276@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Fri, 10 Dec 2010 05:18:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216348 - stable/8/sys/netinet/ipfw
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Dec 2010 05:18:38 -0000

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 */