KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "[package] base-files: Add support for assigning multiple IPv6 addresses on an interface"

Browse source 
Multiple IPv6 addresses should be handled with alias sections

SVN-Revision: 28240
This commit is contained in:
Vasilis Tsiligiannis 2011-09-14 13:37:40 +00:00
parent 34f2cfc657
commit 200fd7bce1
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
package/base-files/files/lib/network/config.sh
View file

@ -242,10 +242,10 @@ setup_interface_static() {
local iface="$1"
local config="$2"
local ipaddr netmask ip6addrs ipaddr
local ipaddr netmask ip6addr
config_get ipaddr "$config" ipaddr
config_get netmask "$config" netmask
config_get ip6addrs "$config" ip6addr
config_get ip6addr "$config" ip6addr
[ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1
local gateway ip6gw dns bcast metric
@ -255,14 +255,13 @@ setup_interface_static() {
config_get bcast "$config" broadcast
config_get metric "$config" metric
[ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}"
for ip6addr in $ip6addrs; do
case "$ip6addr" in
*/*) ;;
*:*) ip6addr="$ip6addr/64" ;;
esac
$DEBUG ifconfig "$iface" add "$ip6addr"
done
[ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}"
[ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr"
[ -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