From owner-svn-src-head@FreeBSD.ORG  Wed Jun  1 19:44:52 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B77A8106564A;
	Wed,  1 Jun 2011 19:44:52 +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 A6D768FC13;
	Wed,  1 Jun 2011 19:44:52 +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 p51Jiqbw084266;
	Wed, 1 Jun 2011 19:44:52 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p51JiqRh084264;
	Wed, 1 Jun 2011 19:44:52 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201106011944.p51JiqRh084264@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 1 Jun 2011 19:44:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222582 - head/sys/netinet/ipfw
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jun 2011 19:44:52 -0000

Author: ae
Date: Wed Jun  1 19:44:52 2011
New Revision: 222582
URL: http://svn.freebsd.org/changeset/base/222582

Log:
  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/147720, kern/150798
  MFC after:	1 month

Modified:
  head/sys/netinet/ipfw/ip_fw2.c

Modified: head/sys/netinet/ipfw/ip_fw2.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw2.c	Wed Jun  1 18:42:44 2011	(r222581)
+++ head/sys/netinet/ipfw/ip_fw2.c	Wed Jun  1 19:44:52 2011	(r222582)
@@ -2118,7 +2118,8 @@ do {								\
 			case O_FORWARD_IP:
 				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) {
 				    struct sockaddr_in *sa;
 				    sa = &(((ipfw_insn_sa *)cmd)->sa);
 				    if (sa->sin_addr.s_addr == INADDR_ANY) {