[patch] gentoo_fbsd_inet6.patch

gentoo_fbsd_inet6.patch (text/plain), 2.06 KB, created by Friedrich Oslage (RETIRED) on 2007-07-06 16:38:47 UTC

--- /root/PATCH/lib/rcscripts/net/ifconfig.sh	2007-07-06 17:03:47 +0200
+++ /lib/rcscripts/net/ifconfig.sh	2007-07-06 18:03:02 +0200
@@ -63,7 +63,11 @@
 		set -- "$@" metric ${metric}
 	fi
 
-	ifconfig "${IFACE}" add "$@"
+	if [ "$(echo "$@" | grep -q ":" ; echo "$?")" = "0" ] ; then
+		ifconfig "${IFACE}" inet6 add "$@"
+	else
+		ifconfig "${IFACE}" add "$@"
+	fi
 }
 
 _add_route() {
@@ -75,7 +79,27 @@
 		fi
 	fi
 
-	route add "$@"
+	if [ "$(echo "$@" | grep -q ":" ; echo "$?")" = "0" ] ; then
+		route add -inet6 "$@"
+	else
+		route add "$@"
+	fi
+}
+
+_del_route() {
+	if [ $# -gt 3 ] ; then
+		if [ "$3" = "gw" -o "$3" = "via" ] ; then
+			local one=$1 two=$2
+			shift ; shift; shift
+			set -- "${one}" "${two}" "$@"
+		fi
+	fi
+
+	if [ "$(echo "$@" | grep -q ":" ; echo "$?")" = "0" ] ; then
+		route delete -inet6 "$@"
+	else
+		route delete "$@"
+	fi
 }
 
 _delete_addresses() {
--- /root/PATCH/etc/init.d/net.lo0	2007-07-06 17:45:44 +0200
+++ /etc/init.d/net.lo0	2007-07-06 18:03:32 +0200
@@ -563,6 +563,42 @@
 		fi
 	done
 
+	# Remove routes(ifconfig already does this for inet4 but not for inet6 routes)
+	local hidefirstroute=false first=true routes=
+	eval "$(_get_array "routes_${IFVAR}")"
+	if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ] ; then
+		set -- "127.0.0.0/8 via 127.0.0.1" "$@"
+		hidefirstroute=true
+	fi
+	for cmd in "$@" ; do
+		if ${first} ; then
+			first=false
+			einfo "Removing routes"
+		fi
+		eindent
+		ebegin "${cmd}"
+		# Work out if we're a host or a net if not told
+		case "${cmd}" in
+			*" -net "*|*" -host "*) ;;
+			*" netmask "*) cmd="-net ${cmd}" ;;
+			*)
+				case "${cmd%% *}" in
+					*.*.*.*/32) cmd="-host ${cmd}" ;;
+					*.*.*.*/*|0.0.0.0|default) cmd="-net ${cmd}" ;;
+					*) cmd="-host ${cmd}" ;;
+				esac
+				;;
+		esac
+		if ${hidefirstroute} ; then
+			_del_route ${cmd} >/dev/null 2>/dev/null
+			hidefirstroute=false
+		else
+			_del_route ${cmd} >/dev/null
+		fi
+		eend $?
+		eoutdent
+	done
+	
 	# Only delete addresses for non PPP interfaces
 	if ! type is_ppp >/dev/null 2>/dev/null || ! is_ppp ; then
 		_delete_addresses "${IFACE}"