Re: kern/157239: commit references a PR

[dfilter service]

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

From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@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-...@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
 
_______________________________________________
freebsd-ipfw@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ipfw
To unsubscribe, send any mail to "freebsd-ipfw-unsubscr...@freebsd.org"