svn commit: r223820 - stable/7/sys/netinet

[Andrey V. Elsukov]

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));