projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
kernel: bring ssb in sync with upstream (as of current wireless-testing)
[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 1bbe623..e64198b 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -24,8 +24,7 @@ find_config() {
 }
 
 scan_interfaces() {
 }
 
 scan_interfaces() {
-       local cfgfile="$1"
-       local mode iftype iface ifname device
+       local cfgfile="${1:-network}"
        interfaces=
        config_cb() {
                case "$1" in
        interfaces=
        config_cb() {
                case "$1" in
@@ -33,18 +32,19 @@ scan_interfaces() {
                                config_set "$2" auto 1
                        ;;
                esac
                                config_set "$2" auto 1
                        ;;
                esac
+               local iftype ifname device proto
                config_get iftype "$CONFIG_SECTION" TYPE
                case "$iftype" in
                        interface)
                config_get iftype "$CONFIG_SECTION" TYPE
                case "$iftype" in
                        interface)
-                               config_get proto "$CONFIG_SECTION" proto
                                append interfaces "$CONFIG_SECTION"
                                append interfaces "$CONFIG_SECTION"
+                               config_get proto "$CONFIG_SECTION" proto
                                config_get iftype "$CONFIG_SECTION" type
                                config_get ifname "$CONFIG_SECTION" ifname
                                config_get iftype "$CONFIG_SECTION" type
                                config_get ifname "$CONFIG_SECTION" ifname
-                               config_get device "$CONFIG_SECTION" device
-                               config_set "$CONFIG_SECTION" device "${device:-$ifname}"
+                               config_get device "$CONFIG_SECTION" device "$ifname"
+                               config_set "$CONFIG_SECTION" device "$device"
                                case "$iftype" in
                                        bridge)
                                case "$iftype" in
                                        bridge)
-                                               config_set "$CONFIG_SECTION" ifnames "${device:-$ifname}"
+                                               config_set "$CONFIG_SECTION" ifnames "$device"
                                                config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
                                        ;;
                                esac
                                                config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
                                        ;;
                                esac
@@ -52,7 +52,7 @@ scan_interfaces() {
                        ;;
                esac
        }
                        ;;
                esac
        }
-       config_load "${cfgfile:-network}"
+       config_load "${cfgfile}"
 }
 
 add_vlan() {
 }
 
 add_vlan() {
@@ -84,7 +84,6 @@ prepare_interface() {
        local iface="$1"
        local config="$2"
        local vifmac="$3"
        local iface="$1"
        local config="$2"
        local vifmac="$3"
-       local proto
 
        # if we're called for the bridge interface itself, don't bother trying
        # to create any interfaces here. The scripts have already done that, otherwise
 
        # if we're called for the bridge interface itself, don't bother trying
        # to create any interfaces here. The scripts have already done that, otherwise
@@ -92,6 +91,7 @@ prepare_interface() {
        [ "br-$config" = "$iface" -o -e "$iface" ] && return 0;
 
        ifconfig "$iface" 2>/dev/null >/dev/null && {
        [ "br-$config" = "$iface" -o -e "$iface" ] && return 0;
 
        ifconfig "$iface" 2>/dev/null >/dev/null && {
+               local proto
                config_get proto "$config" proto
 
                # make sure the interface is removed from any existing bridge and deconfigured,
                config_get proto "$config" proto
 
                # make sure the interface is removed from any existing bridge and deconfigured,
@@ -111,27 +111,30 @@ prepare_interface() {
        ifconfig "$iface" 2>/dev/null >/dev/null || return 0
 
        # Setup bridging
        ifconfig "$iface" 2>/dev/null >/dev/null || return 0
 
        # Setup bridging
+       local iftype
        config_get iftype "$config" type
        config_get iftype "$config" type
-       config_get stp "$config" stp
        case "$iftype" in
                bridge)
                        [ -x /usr/sbin/brctl ] && {
                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
        case "$iftype" in
                bridge)
                        [ -x /usr/sbin/brctl ] && {
                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
-                                       local newdevs=
-
+                                       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"
                                        config_get devices "$config" device
                                        for dev in $(sort_list "$devices" "$iface"); do
                                                append newdevs "$dev"
                                        done
                                        uci_set_state network "$config" device "$newdevs"
+                                       $DEBUG ifconfig "$iface" 0.0.0.0
                                        $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
                                } || {
+                                       local stp
+                                       config_get_bool stp "$config" stp 0
                                        $DEBUG brctl addbr "br-$config"
                                        $DEBUG brctl setfd "br-$config" 0
                                        $DEBUG ifconfig "br-$config" up
                                        $DEBUG brctl addbr "br-$config"
                                        $DEBUG brctl setfd "br-$config" 0
                                        $DEBUG ifconfig "br-$config" up
+                                       $DEBUG ifconfig "$iface" 0.0.0.0
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        $DEBUG brctl addif "br-$config" "$iface"
-                                       $DEBUG brctl stp "br-$config" ${stp:-0}
+                                       $DEBUG brctl stp "br-$config" $stp
                                        # 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.
@@ -148,6 +151,7 @@ set_interface_ifname() {
        local config="$1"
        local ifname="$2"
 
        local config="$1"
        local ifname="$2"
 
+       local device
        config_get device "$1" device
        uci_set_state network "$config" ifname "$ifname"
        uci_set_state network "$config" device "$device"
        config_get device "$1" device
        uci_set_state network "$config" ifname "$ifname"
        uci_set_state network "$config" device "$device"
@@ -161,11 +165,13 @@ setup_interface_static() {
        local iface="$1"
        local config="$2"
 
        local iface="$1"
        local config="$2"
 
+       local ipaddr netmask ip6addr
        config_get ipaddr "$config" ipaddr
        config_get netmask "$config" netmask
        config_get ip6addr "$config" ip6addr
        [ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1
 
        config_get ipaddr "$config" ipaddr
        config_get netmask "$config" netmask
        config_get ip6addr "$config" ip6addr
        [ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1
 
+       local gateway ip6gw dns bcast
        config_get gateway "$config" gateway
        config_get ip6gw "$config" ip6gw
        config_get dns "$config" dns
        config_get gateway "$config" gateway
        config_get ip6gw "$config" ip6gw
        config_get dns "$config" dns
@@ -194,24 +200,30 @@ setup_interface_alias() {
        local parent="$2"
        local iface="$3"
 
        local parent="$2"
        local iface="$3"
 
+       local cfg
        config_get cfg "$config" interface
        [ "$parent" == "$cfg" ] || return 0
 
        # alias counter
        config_get cfg "$config" interface
        [ "$parent" == "$cfg" ] || return 0
 
        # alias counter
-       config_get ctr "$parent" alias_count
+       local ctr
+       config_get ctr "$parent" alias_count 0
        ctr="$(($ctr + 1))"
        config_set "$parent" alias_count "$ctr"
 
        # alias list
        ctr="$(($ctr + 1))"
        config_set "$parent" alias_count "$ctr"
 
        # alias list
+       local list
        config_get list "$parent" aliases
        append list "$config"
        config_set "$parent" aliases "$list"
 
        config_get list "$parent" aliases
        append list "$config"
        config_set "$parent" aliases "$list"
 
-       set_interface_ifname "$config" "$iface:$ctr"
-       config_get proto "$config" proto
-       case "${proto:-static}" in
+       iface="$iface:$ctr"
+       set_interface_ifname "$config" "$iface"
+
+       local proto
+       config_get proto "$config" proto "static"
+       case "${proto}" in
                static)
                static)
-                       setup_interface_static "$iface:$ctr" "$config"
+                       setup_interface_static "$iface" "$config"
                ;;
                *)
                        echo "Unsupported type '$proto' for alias config '$config'"
                ;;
                *)
                        echo "Unsupported type '$proto' for alias config '$config'"
@@ -221,59 +233,52 @@ setup_interface_alias() {
 }
 
 setup_interface() {
 }
 
 setup_interface() {
-       local iface="$1"
+       local iface_main="$1"
        local config="$2"
        local config="$2"
+       local proto="$3"
        local vifmac="$4"
        local vifmac="$4"
-       local proto
-       local macaddr
-       local hasipv6
+       local ip6addr_main=
 
        [ -n "$config" ] || {
 
        [ -n "$config" ] || {
-               config=$(find_config "$iface")
+               config=$(find_config "$iface_main")
                [ "$?" = 0 ] || return 1
        }
                [ "$?" = 0 ] || return 1
        }
-       proto="${3:-$(config_get "$config" proto)}"
 
 
-       prepare_interface "$iface" "$config" "$vifmac" || return 0
+       prepare_interface "$iface_main" "$config" "$vifmac" || return 0
 
 
-       [ "$iface" = "br-$config" ] && {
+       [ "$iface_main" = "br-$config" ] && {
                # need to bring up the bridge and wait a second for
                # it to switch to the 'forwarding' state, otherwise
                # it will lose its routes...
                # need to bring up the bridge and wait a second for
                # it to switch to the 'forwarding' state, otherwise
                # it will lose its routes...
-               ifconfig "$iface" up
+               ifconfig "$iface_main" up
                sleep 1
        }
 
                sleep 1
        }
 
-       # Check whether this interface has an IPv6 address
-       # defined and ensure that the kmod is loaded since
-       # ifup could be triggered before modules are loaded.
-       config_get hasipv6 "$config" ip6addr
-       [ -n "$hasipv6" ] && [ ! -d /proc/sys/net/ipv6 ] && {
-               grep -q '^ipv6' /etc/modules.d/* && insmod ipv6
-       }
-
        # Interface settings
        # Interface settings
-       config_get mtu "$config" mtu
-       config_get macaddr "$config" macaddr
-       grep "$iface:" /proc/net/dev > /dev/null && {
-               [ -n "$macaddr" ] && $DEBUG ifconfig "$iface" down
-               $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
+       grep "$iface_main:" /proc/net/dev > /dev/null && {
+               local mtu macaddr
+               config_get mtu "$config" mtu
+               config_get macaddr "$config" macaddr
+               [ -n "$macaddr" ] && $DEBUG ifconfig "$iface_main" down
+               $DEBUG ifconfig "$iface_main" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
        }
        }
-       set_interface_ifname "$config" "$iface"
+       set_interface_ifname "$config" "$iface_main"
 
 
-       pidfile="/var/run/$iface.pid"
+       pidfile="/var/run/$iface_main.pid"
+       [ -n "$proto" ] || config_get proto "$config" proto
        case "$proto" in
                static)
        case "$proto" in
                static)
-                       setup_interface_static "$iface" "$config"
+                       config_get ip6addr_main "$config" ip6addr
+                       setup_interface_static "$iface_main" "$config"
                ;;
                dhcp)
                        # prevent udhcpc from starting more than once
                ;;
                dhcp)
                        # prevent udhcpc from starting more than once
-                       lock "/var/lock/dhcp-$iface"
-                       pid="$(cat "$pidfile" 2>/dev/null)"
+                       lock "/var/lock/dhcp-$iface_main"
+                       local pid="$(cat "$pidfile" 2>/dev/null)"
                        if [ -d "/proc/$pid" ] && grep udhcpc "/proc/${pid}/cmdline" >/dev/null 2>/dev/null; then
                        if [ -d "/proc/$pid" ] && grep udhcpc "/proc/${pid}/cmdline" >/dev/null 2>/dev/null; then
-                               lock -u "/var/lock/dhcp-$iface"
+                               lock -u "/var/lock/dhcp-$iface_main"
                        else
                        else
-
+                               local ipaddr netmask hostname proto1 clientid
                                config_get ipaddr "$config" ipaddr
                                config_get netmask "$config" netmask
                                config_get hostname "$config" hostname
                                config_get ipaddr "$config" ipaddr
                                config_get netmask "$config" netmask
                                config_get hostname "$config" hostname
@@ -281,20 +286,21 @@ setup_interface() {
                                config_get clientid "$config" clientid
 
                                [ -z "$ipaddr" ] || \
                                config_get clientid "$config" clientid
 
                                [ -z "$ipaddr" ] || \
-                                       $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
+                                       $DEBUG ifconfig "$iface_main" "$ipaddr" ${netmask:+netmask "$netmask"}
 
                                # 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" ] && dhcpopts="-n -q"
-                               $DEBUG eval udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} ${clientid:+-c $clientid} -b -p "$pidfile" ${dhcpopts:- -R &}
-                               lock -u "/var/lock/dhcp-$iface"
+                               $DEBUG eval udhcpc -t 0 -i "$iface_main" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} ${clientid:+-c $clientid} -b -p "$pidfile" ${dhcpopts:- -O rootpath -R &}
+                               lock -u "/var/lock/dhcp-$iface_main"
                        fi
                ;;
                none)
                        fi
                ;;
                none)
-                       setup_interface_none "$iface" "$config"
+                       setup_interface_none "$iface_main" "$config"
                ;;
                *)
                        if ( eval "type setup_interface_$proto" ) >/dev/null 2>/dev/null; then
                ;;
                *)
                        if ( eval "type setup_interface_$proto" ) >/dev/null 2>/dev/null; then
-                               eval "setup_interface_$proto '$iface' '$config' '$proto'"
+                               eval "setup_interface_$proto '$iface_main' '$config' '$proto'"
                        else
                                echo "Interface type $proto not supported."
                                return 1
                        else
                                echo "Interface type $proto not supported."
                                return 1
@@ -302,15 +308,28 @@ setup_interface() {
                ;;
        esac
        [ "$proto" = none ] || {
                ;;
        esac
        [ "$proto" = none ] || {
-               for ifn in `ifconfig | grep "^$iface:" | awk '{print $1}'`; do
+               for ifn in `ifconfig | grep "^$iface_main:" | awk '{print $1}'`; do
                        ifconfig "$ifn" down
                done
        }
                        ifconfig "$ifn" down
                done
        }
+
+       local aliases
        config_set "$config" aliases ""
        config_set "$config" alias_count 0
        config_set "$config" aliases ""
        config_set "$config" alias_count 0
-       config_foreach setup_interface_alias alias "$config" "$iface"
+       config_foreach setup_interface_alias alias "$config" "$iface_main"
        config_get aliases "$config" aliases
        [ -z "$aliases" ] || uci_set_state network "$config" aliases "$aliases"
        config_get aliases "$config" aliases
        [ -z "$aliases" ] || uci_set_state network "$config" aliases "$aliases"
+
+       # put the ip6addr back to the beginning to become the main ip again
+       [ -z "$ip6addr_main" ] || {
+               $DEBUG ifconfig "$iface_main" del "$ip6addr_main"
+               $DEBUG ifconfig "$iface_main" add "$ip6addr_main"
+       }
+}
+
+stop_interface_dhcp() {
+       local config="$1"
+       uci -P /var/state revert "network.$config"
 }
 
 unbridge() {
 }
 
 unbridge() {
@@ -318,7 +337,7 @@ unbridge() {
        local brdev
 
        [ -x /usr/sbin/brctl ] || return 0
        local brdev
 
        [ -x /usr/sbin/brctl ] || return 0
-       brctl show | grep "$dev" >/dev/null && {
+       brctl show 2>/dev/null | grep "$dev" >/dev/null && {
                # interface is still part of a bridge, correct that
 
                for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
                # interface is still part of a bridge, correct that
 
                for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
Personal OpenWRT clone
This page took 0.036225 seconds and 4 git commands to generate.