From owner-svn-src-stable-7@FreeBSD.ORG  Wed Jul  6 06:57:08 2011
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E3E781065672;
	Wed,  6 Jul 2011 06:57:07 +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 D300B8FC12;
	Wed,  6 Jul 2011 06:57:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p666v7KL003967;
	Wed, 6 Jul 2011 06:57:07 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p666v7aI003965;
	Wed, 6 Jul 2011 06:57:07 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201107060657.p666v7aI003965@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 6 Jul 2011 06:57:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223820 - stable/7/sys/netinet
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jul 2011 06:57:09 -0000

Author: ae
Date: Wed Jul  6 06:57:07 2011
New Revision: 223820
URL: http://svn.freebsd.org/changeset/base/223820

Log:
  MFC r222582:
    O_FORWARD_IP is only action which depends from the result of lookup of
    dynamic rules. We are doing forwarding in the following cases:
     o For the simple ipfw fwd rule, e.g.
  
          fwd 10.0.0.1 ip from any to any out xmit em0
          fwd 127.0.0.1,3128 tcp from any to any 80 in recv em1
  
     o For the dynamic fwd rule, e.g.
  
          fwd 192.168.0.1 tcp from any to 10.0.0.3 3333 setup keep-state
  
            When this rule triggers it creates a dynamic rule, but this
          dynamic rule should forward packets only in forward direction.
  
     o And the last case that does not work before - simple fwd rule which
     triggers when some dynamic rule is already executed.
  
    PR:           kern/136695, kern/147720, kern/150798

Modified:
  stable/7/sys/netinet/ip_fw2.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/netinet/ip_fw2.c
==============================================================================
--- stable/7/sys/netinet/ip_fw2.c	Wed Jul  6 06:56:31 2011	(r223819)
+++ stable/7/sys/netinet/ip_fw2.c	Wed Jul  6 06:57:07 2011	(r223820)
@@ -3284,7 +3284,8 @@ check_body:
 				sa = &(((ipfw_insn_sa *)cmd)->sa);
 				if (args->eh)	/* not valid on layer2 pkts */
 					break;
-				if (!q || dyn_dir == MATCH_FORWARD) {
+				if (q == NULL || q->rule != f ||
+				    dyn_dir == MATCH_FORWARD) {
 					if (sa->sin_addr.s_addr == INADDR_ANY) {
 						bcopy(sa, &args->hopstore,
 							sizeof(*sa));