Attachment #115442 for bug #157200

Lines 494-499 Link Here

(-)src/etc/defaults/rc.conf (+1 lines)
494	stf_interface_ipv6_ifid="0:0:0:1" # IPv6 interface id for stf0.	494	stf_interface_ipv6_ifid="0:0:0:1" # IPv6 interface id for stf0.
495	# If you like, you can set "AUTO" for this.	495	# If you like, you can set "AUTO" for this.
496	stf_interface_ipv6_slaid="0000" # IPv6 Site Level Aggregator for stf0	496	stf_interface_ipv6_slaid="0000" # IPv6 Site Level Aggregator for stf0
		497	stf_interface_mode="anycast" # Anycast router or edge router
497	ipv6_faith_prefix="NO" # Set faith prefix to enable a FAITH	498	ipv6_faith_prefix="NO" # Set faith prefix to enable a FAITH
498	# IPv6-to-IPv4 TCP translator. You also need	499	# IPv6-to-IPv4 TCP translator. You also need
499	# faithd(8) setup.	500	# faithd(8) setup.

Lines 1042-1047 Link Here

(-)src/etc/network.subr (+8 lines)
1042	route add -inet6 2002:7f00:: -prefixlen 24 ::1 -reject	1042	route add -inet6 2002:7f00:: -prefixlen 24 ::1 -reject
1043	route add -inet6 2002:0000:: -prefixlen 24 ::1 -reject	1043	route add -inet6 2002:0000:: -prefixlen 24 ::1 -reject
1044	route add -inet6 2002:ff00:: -prefixlen 24 ::1 -reject	1044	route add -inet6 2002:ff00:: -prefixlen 24 ::1 -reject
		1045	case ${stf_interface_mode} in
		1046	[Aa][Nn][Yy][Cc][Aa][Ss][Tt])
		1047	;;
		1048	[Ee][Dd][Gg][Ee])
		1049	route -q del -inet6 2002:${ipv4_in_hexformat}::/${stf_prefixlen}
		1050	route -q del -inet6 2002::/${stf_prefixlen}
		1051	;;
		1052	esac
1045	;;	1053	;;
1046	esac	1054	esac
1047	}	1055	}

Lines 479-489 Link Here

(-)src/sys/net/if_stf.c (-1 / +8 lines)
479	/*	479	/*
480	* Pickup the right outer dst addr from the list of candidates.	480	* Pickup the right outer dst addr from the list of candidates.
481	* ip6_dst has priority as it may be able to give us shorter IPv4 hops.	481	* ip6_dst has priority as it may be able to give us shorter IPv4 hops.
		482	*
		483	* NOTICE: dst is computed by routing tables and network prefix.
		484	* In broadcast segment, ip6->ip6_dst and dst6->sin6_addr are same.
		485	* Othersise, dst is found from routeing table.
482	*/	486	*/
483	ptr = NULL;	487	ptr = NULL;
		488	/*
484	if (IN6_IS_ADDR_6TO4(&ip6->ip6_dst))	489	if (IN6_IS_ADDR_6TO4(&ip6->ip6_dst))
485	ptr = GET_V4(&ip6->ip6_dst);	490	ptr = GET_V4(&ip6->ip6_dst);
486	else if (IN6_IS_ADDR_6TO4(&dst6->sin6_addr))	491	else
		492	*/
		493	if (IN6_IS_ADDR_6TO4(&dst6->sin6_addr))
487	ptr = GET_V4(&dst6->sin6_addr);	494	ptr = GET_V4(&dst6->sin6_addr);
488	else {	495	else {
489	ifa_free(&ia6->ia_ifa);	496	ifa_free(&ia6->ia_ifa);

Return to bug 157200