From owner-freebsd-ipfw@FreeBSD.ORG  Wed Jul  6 05:50:09 2011
Return-Path: <owner-freebsd-ipfw@FreeBSD.ORG>
Delivered-To: freebsd-ipfw@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E707B1065677
	for <freebsd-ipfw@hub.freebsd.org>;
	Wed,  6 Jul 2011 05:50:09 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id BDAC38FC13
	for <freebsd-ipfw@hub.freebsd.org>;
	Wed,  6 Jul 2011 05:50:09 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p665o9cr037754
	for <freebsd-ipfw@freefall.freebsd.org>; Wed, 6 Jul 2011 05:50:09 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p665o9ZA037753;
	Wed, 6 Jul 2011 05:50:09 GMT (envelope-from gnats)
Date: Wed, 6 Jul 2011 05:50:09 GMT
Message-Id: <201107060550.p665o9ZA037753@freefall.freebsd.org>
To: freebsd-ipfw@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: kern/157239: commit references a PR
X-BeenThere: freebsd-ipfw@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: IPFW Technical Discussions <freebsd-ipfw.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ipfw>,
	<mailto:freebsd-ipfw-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ipfw>
List-Post: <mailto:freebsd-ipfw@freebsd.org>
List-Help: <mailto:freebsd-ipfw-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ipfw>,
	<mailto:freebsd-ipfw-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jul 2011 05:50:10 -0000

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/157239: commit references a PR
Date: Wed,  6 Jul 2011 05:43:13 +0000 (UTC)

 Author: ae
 Date: Wed Jul  6 05:42:52 2011
 New Revision: 223817
 URL: http://svn.freebsd.org/changeset/base/223817
 
 Log:
   MFC r223358:
     Do not use SET_HOST_IPLEN() macro for IPv6 packets.
   
     PR:		kern/157239
 
 Modified:
   stable/8/sys/netinet/ipfw/ip_dn_io.c
   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_dn_io.c
 ==============================================================================
 --- stable/8/sys/netinet/ipfw/ip_dn_io.c	Wed Jul  6 05:40:22 2011	(r223816)
 +++ stable/8/sys/netinet/ipfw/ip_dn_io.c	Wed Jul  6 05:42:52 2011	(r223817)
 @@ -664,7 +664,6 @@ dummynet_send(struct mbuf *m)
  			break;
  
  		case DIR_OUT | PROTO_IPV6:
 -			SET_HOST_IPLEN(mtod(m, struct ip *));
  			ip6_output(m, NULL, NULL, IPV6_FORWARDING, NULL, NULL, NULL);
  			break;
  #endif
 
 Modified: stable/8/sys/netinet/ipfw/ip_fw_pfil.c
 ==============================================================================
 --- stable/8/sys/netinet/ipfw/ip_fw_pfil.c	Wed Jul  6 05:40:22 2011	(r223816)
 +++ stable/8/sys/netinet/ipfw/ip_fw_pfil.c	Wed Jul  6 05:42:52 2011	(r223817)
 @@ -127,8 +127,9 @@ again:
  		args.rule = *((struct ipfw_rule_ref *)(tag+1));
  		m_tag_delete(*m0, tag);
  		if (args.rule.info & IPFW_ONEPASS) {
 -			SET_HOST_IPLEN(mtod(*m0, struct ip *));
 -			return 0;
 +			if (mtod(*m0, struct ip *)->ip_v == 4)
 +				SET_HOST_IPLEN(mtod(*m0, struct ip *));
 +			return (0);
  		}
  	}
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"