Author: hrs
Date: Thu Feb 16 01:41:34 2012
New Revision: 231803
URL: http://svn.freebsd.org/changeset/base/231803

Log:
  Add static routes to ::ffff:0.0.0.0/96 and ::0.0.0.0/96 unconditionally when
  the kernel supports PF_INET6.
  
  PR:   kern/161899

Modified:
  stable/8/etc/rc.d/network_ipv6
  stable/8/etc/rc.d/routing

Modified: stable/8/etc/rc.d/network_ipv6
==============================================================================
--- stable/8/etc/rc.d/network_ipv6      Thu Feb 16 01:32:23 2012        
(r231802)
+++ stable/8/etc/rc.d/network_ipv6      Thu Feb 16 01:41:34 2012        
(r231803)
@@ -41,10 +41,6 @@ start_cmd="network_ipv6_start"
 
 network_ipv6_start()
 {
-       # disallow "internal" addresses to appear on the wire
-       route add -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
-       route add -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
-
        case ${ipv6_network_interfaces} in
        [Aa][Uu][Tt][Oo])
                # Get a list of network interfaces

Modified: stable/8/etc/rc.d/routing
==============================================================================
--- stable/8/etc/rc.d/routing   Thu Feb 16 01:32:23 2012        (r231802)
+++ stable/8/etc/rc.d/routing   Thu Feb 16 01:41:34 2012        (r231803)
@@ -57,6 +57,14 @@ static_start()
                        atmconfig natm add ${route_args}
                done
        fi
+
+       # Disallow "internal" addresses to appear on the wire if inet6
+       # is enabled.
+       if afexists inet6; then
+               # disallow "internal" addresses to appear on the wire
+               route add -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
+               route add -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
+       fi
 }
 
 _ropts_initdone=
_______________________________________________
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-unsubscr...@freebsd.org"

Reply via email to