From: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
Date: Mon, 12 Sep 2011 21:07:00 +0000 (+0000)
Subject: base-files: Add support for assigning multiple IPv6 addresses on an interface
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=718c8ab94078a7bc23c28da1abdde5b9f2665210;p=openwrt%2Fstaging%2Fjow.git

base-files: Add support for assigning multiple IPv6 addresses on an interface

SVN-Revision: 28222
---

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index cf5b197b59..5975f17dfc 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -242,10 +242,10 @@ setup_interface_static() {
 	local iface="$1"
 	local config="$2"
 
-	local ipaddr netmask ip6addr
+	local ipaddr netmask ip6addrs ipaddr
 	config_get ipaddr "$config" ipaddr
 	config_get netmask "$config" netmask
-	config_get ip6addr "$config" ip6addr
+	config_get ip6addrs "$config" ip6addr
 	[ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1
 
 	local gateway ip6gw dns bcast metric
@@ -255,13 +255,14 @@ setup_interface_static() {
 	config_get bcast "$config" broadcast
 	config_get metric "$config" metric
 
-	case "$ip6addr" in
-		*/*) ;;
-		*:*) ip6addr="$ip6addr/64" ;;
-	esac
-
 	[ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}"
-	[ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr"
+	for ip6addr in $ip6addrs; do          
+		case "$ip6addr" in
+			*/*) ;;
+			*:*) ip6addr="$ip6addr/64" ;;
+		esac
+		$DEBUG ifconfig "$iface" add "$ip6addr"
+	done 
 	[ -z "$gateway" ] || $DEBUG route add default gw "$gateway" ${metric:+metric $metric} dev "$iface"
 	[ -z "$ip6gw" ] || $DEBUG route -A inet6 add default gw "$ip6gw" ${metric:+metric $metric} dev "$iface"
 	[ -z "$dns" ] || add_dns "$config" $dns