kern/147720: commit references a PR

[dfilter service]

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

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: kern/147720: commit references a PR
Date: Wed,  1 Jun 2011 19:45:02 +0000 (UTC)

 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) {
 _______________________________________________
 svn-src-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"