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

[openwrt.git] / package / base-files / files / lib / network / config.sh

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index c262282..5975f17 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -9,6 +9,23 @@ do_sysctl() {
                sysctl -n -e "$1"
 }
 
+map_sysctls() {
+       local cfg="$1"
+       local ifn="$2"
+
+       local fam
+       for fam in ipv4 ipv6; do
+               if [ -d /proc/sys/net/$fam ]; then
+                       local key
+                       for key in /proc/sys/net/$fam/*/$ifn/*; do
+                               local val
+                               config_get val "$cfg" "${fam}_${key##*/}"
+                               [ -n "$val" ] && echo -n "$val" > "$key"
+                       done
+               fi
+       done
+}
+
 find_config() {
        local iftype device iface ifaces ifn
        for ifn in $interfaces; do
@@ -96,8 +113,8 @@ add_dns() {
        done
 
        [ -n "$cfg" ] && {
-               uci_set_state network "$cfg" dns "$add"
-               uci_set_state network "$cfg" resolv_dns "$add"
+               uci_toggle_state network "$cfg" dns "$add"
+               uci_toggle_state network "$cfg" resolv_dns "$add"
        }
 }
 
@@ -156,6 +173,9 @@ prepare_interface() {
                        ifconfig "$iface" down
                        ifconfig "$iface" hw ether "$vifmac" up
                }
+
+               # Apply sysctl settings
+               map_sysctls "$config" "$iface"
        }
 
        # Setup VLAN interfaces
@@ -176,7 +196,7 @@ prepare_interface() {
                                        for dev in $(sort_list "$devices" "$iface"); do
                                                append newdevs "$dev"
                                        done
-                                       uci_set_state network "$config" device "$newdevs"
+                                       uci_toggle_state network "$config" device "$newdevs"
                                        $DEBUG ifconfig "$iface" 0.0.0.0
                                        $DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1
                                        $DEBUG brctl addif "br-$config" "$iface"
@@ -210,8 +230,8 @@ set_interface_ifname() {
 
        local device
        config_get device "$1" device
-       uci_set_state network "$config" ifname "$ifname"
-       uci_set_state network "$config" device "$device"
+       uci_toggle_state network "$config" ifname "$ifname"
+       uci_toggle_state network "$config" device "$device"
 }
 
 setup_interface_none() {
@@ -222,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
@@ -236,7 +256,13 @@ setup_interface_static() {
        config_get metric "$config" metric
 
        [ -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
@@ -325,7 +351,7 @@ setup_interface() {
        }
 
        # Interface settings
-       grep "$iface:" /proc/net/dev > /dev/null && {
+       grep -qE "^ *$iface:" /proc/net/dev && {
                local mtu macaddr txqueuelen
                config_get mtu "$config" mtu
                config_get macaddr "$config" macaddr