View | Details | Raw Unified | Return to bug 157200 | Differences between
and this patch

Collapse All | Expand All

(-)src/etc/defaults/rc.conf (+1 lines)
Lines 494-499 Link Here
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.
(-)src/etc/network.subr (+8 lines)
Lines 1042-1047 Link Here
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
}
(-)src/sys/net/if_stf.c (-3 / +5 lines)
Lines 481-491 Link Here
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
	 */
482
	 */
483
	ptr = NULL;
483
	ptr = NULL;
484
	if (IN6_IS_ADDR_6TO4(&ip6->ip6_dst))
484
	if (IN6_IS_ADDR_6TO4(&ip6->ip6_dst)) {
485
		ptr = GET_V4(&ip6->ip6_dst);
485
		ptr = GET_V4(&ip6->ip6_dst);
486
	else if (IN6_IS_ADDR_6TO4(&dst6->sin6_addr))
486
	}
487
	if (IN6_IS_ADDR_6TO4(&dst6->sin6_addr)) {
487
		ptr = GET_V4(&dst6->sin6_addr);
488
		ptr = GET_V4(&dst6->sin6_addr);
488
	else {
489
	}
490
	if(ptr == NULL) {
489
		ifa_free(&ia6->ia_ifa);
491
		ifa_free(&ia6->ia_ifa);
490
		m_freem(m);
492
		m_freem(m);
491
		ifp->if_oerrors++;
493
		ifp->if_oerrors++;

Return to bug 157200