[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 c948c83..5975f17 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -3,6 +3,29 @@
 
 # DEBUG="echo"
 
 
 # DEBUG="echo"
 

+do_sysctl() {
+       [ -n "$2" ] && \
+               sysctl -n -e -w "$1=$2" >/dev/null || \
+               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
 find_config() {
        local iftype device iface ifaces ifn
        for ifn in $interfaces; do


@@ -90,8 +113,8 @@ add_dns() {
        done
 
        [ -n "$cfg" ] && {
        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"

        }
 }
 
        }
 }
 


@@ -150,6 +173,9 @@ prepare_interface() {
                        ifconfig "$iface" down
                        ifconfig "$iface" hw ether "$vifmac" up
                }
                        ifconfig "$iface" down
                        ifconfig "$iface" hw ether "$vifmac" up
                }

+
+               # Apply sysctl settings
+               map_sysctls "$config" "$iface"

        }
 
        # Setup VLAN interfaces
        }
 
        # Setup VLAN interfaces


@@ -164,23 +190,15 @@ prepare_interface() {
                        local macaddr
                        config_get macaddr "$config" macaddr
                        [ -x /usr/sbin/brctl ] && {
                        local macaddr
                        config_get macaddr "$config" macaddr
                        [ -x /usr/sbin/brctl ] && {

-                               # Remove IPv6 link local addr before adding the iface to the bridge
-                               local llv6="$(ifconfig "$iface")"
-                               case "$llv6" in
-                                       *fe80:*/64*)
-                                               llv6="${llv6#* fe80:}"
-                                               ifconfig "$iface" del "fe80:${llv6%% *}"
-                                       ;;
-                               esac
-

                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
                                        local newdevs devices
                                        config_get devices "$config" device
                                        for dev in $(sort_list "$devices" "$iface"); do
                                                append newdevs "$dev"
                                        done
                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
                                        local newdevs devices
                                        config_get devices "$config" device
                                        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 ifconfig "$iface" 0.0.0.0

+                                       $DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1

                                        $DEBUG brctl addif "br-$config" "$iface"
                                        # Bridge existed already. No further processing necesary
                                } || {
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        # Bridge existed already. No further processing necesary
                                } || {


@@ -188,10 +206,12 @@ prepare_interface() {
                                        config_get_bool stp "$config" stp 0
                                        $DEBUG brctl addbr "br-$config"
                                        $DEBUG brctl setfd "br-$config" 0
                                        config_get_bool stp "$config" stp 0
                                        $DEBUG brctl addbr "br-$config"
                                        $DEBUG brctl setfd "br-$config" 0

-                                       $DEBUG ifconfig "br-$config" up

                                        $DEBUG ifconfig "$iface" 0.0.0.0
                                        $DEBUG ifconfig "$iface" 0.0.0.0

+                                       $DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1

                                        $DEBUG brctl addif "br-$config" "$iface"
                                        $DEBUG brctl stp "br-$config" $stp
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        $DEBUG brctl stp "br-$config" $stp

+                                       [ -z "$macaddr" ] && macaddr="$(cat /sys/class/net/$iface/address)"
+                                       $DEBUG ifconfig "br-$config" hw ether $macaddr up

                                        # Creating the bridge here will have triggered a hotplug event, which will
                                        # result in another setup_interface() call, so we simply stop processing
                                        # the current event at this point.
                                        # Creating the bridge here will have triggered a hotplug event, which will
                                        # result in another setup_interface() call, so we simply stop processing
                                        # the current event at this point.


@@ -210,8 +230,8 @@ set_interface_ifname() {
 
        local device
        config_get device "$1" device
 
        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() {
 }
 
 setup_interface_none() {


@@ -222,22 +242,29 @@ setup_interface_static() {
        local iface="$1"
        local config="$2"
 
        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 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
 
        [ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1
 

-       local gateway ip6gw dns bcast
+       local gateway ip6gw dns bcast metric

        config_get gateway "$config" gateway
        config_get ip6gw "$config" ip6gw
        config_get dns "$config" dns
        config_get bcast "$config" broadcast
        config_get gateway "$config" gateway
        config_get ip6gw "$config" ip6gw
        config_get dns "$config" dns
        config_get bcast "$config" broadcast

+       config_get metric "$config" metric

 
        [ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}"
 
        [ -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" dev "$iface"
-       [ -z "$ip6gw" ] || $DEBUG route -A inet6 add default gw "$ip6gw" dev "$iface"
+       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
 
        config_get type "$config" TYPE
        [ -z "$dns" ] || add_dns "$config" $dns
 
        config_get type "$config" TYPE


@@ -324,7 +351,7 @@ setup_interface() {
        }
 
        # Interface settings
        }
 
        # 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
                local mtu macaddr txqueuelen
                config_get mtu "$config" mtu
                config_get macaddr "$config" macaddr


@@ -344,28 +371,36 @@ setup_interface() {
                        local pidfile="/var/run/dhcp-${iface}.pid"
                        service_kill udhcpc "$pidfile"
 
                        local pidfile="/var/run/dhcp-${iface}.pid"
                        service_kill udhcpc "$pidfile"
 

-                       local ipaddr netmask hostname proto1 clientid broadcast
+                       local ipaddr netmask hostname proto1 clientid vendorid broadcast reqopts

                        config_get ipaddr "$config" ipaddr
                        config_get netmask "$config" netmask
                        config_get hostname "$config" hostname
                        config_get proto1 "$config" proto
                        config_get clientid "$config" clientid
                        config_get ipaddr "$config" ipaddr
                        config_get netmask "$config" netmask
                        config_get hostname "$config" hostname
                        config_get proto1 "$config" proto
                        config_get clientid "$config" clientid

+                       config_get vendorid "$config" vendorid

                        config_get_bool broadcast "$config" broadcast 0
                        config_get_bool broadcast "$config" broadcast 0

+                       config_get reqopts "$config" reqopts

 
                        [ -z "$ipaddr" ] || \
                                $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
 
 
                        [ -z "$ipaddr" ] || \
                                $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
 

+                       # additional request options
+                       local opt dhcpopts
+                       for opt in $reqopts; do
+                               append dhcpopts "-O $opt"
+                       done
+

                        # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
                        # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)

-                       local dhcpopts
-                       [ ."$proto1" != ."$proto" ] && dhcpopts="-n -q"
+                       [ "$proto1" != "$proto" ] && append dhcpopts "-n -q" || append dhcpopts "-O rootpath -R &"

                        [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast=
 
                        $DEBUG eval udhcpc -t 0 -i "$iface" \
                                ${ipaddr:+-r $ipaddr} \
                                ${hostname:+-H $hostname} \
                                ${clientid:+-c $clientid} \
                        [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast=
 
                        $DEBUG eval udhcpc -t 0 -i "$iface" \
                                ${ipaddr:+-r $ipaddr} \
                                ${hostname:+-H $hostname} \
                                ${clientid:+-c $clientid} \

+                               ${vendorid:+-V $vendorid} \

                                -b -p "$pidfile" $broadcast \
                                -b -p "$pidfile" $broadcast \

-                               ${dhcpopts:- -O rootpath -R &}
+                               ${dhcpopts}

                ;;
                none)
                        setup_interface_none "$iface" "$config"
                ;;
                none)
                        setup_interface_none "$iface" "$config"


@@ -408,6 +443,7 @@ unbridge() {
 
                for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
                        brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
 
                for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
                        brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null

+                       do_sysctl "net.ipv6.conf.$dev.disable_ipv6" 0

                done
        }
 }
                done
        }
 }