add config option for autostart of network interfaces

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

diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
index 163e42e..502377b 100755 (executable)
--- a/package/base-files/default/lib/network/config.sh
+++ b/package/base-files/default/lib/network/config.sh
@@ -4,17 +4,15 @@
 # DEBUG="echo"
 
 find_config() {
-       local iftype iface ifn
+       local iftype device iface ifaces ifn
        for ifn in $interfaces; do
                config_get iftype "$ifn" type
                config_get iface "$ifn" ifname
                case "$iftype" in
-                       bridge)
-                               config_get iface "$ifn" ifnames
-                       ;;
+                       bridge) config_get ifaces "$ifn" ifnames;;
                esac
                config_get device "$ifn" device
-               for ifc in ${device:-iface}; do
+               for ifc in $device $iface $ifaces; do
                        [ "$ifc" = "$1" ] && {
                                echo "$ifn"
                                return 0
@@ -26,23 +24,29 @@ find_config() {
 }
 
 scan_interfaces() {
-       local mode iftype iface
+       local mode iftype iface ifname device
        interfaces=
        config_cb() {
+               case "$1" in
+                       interface)
+                               config_set "$2" auto 1
+                       ;;
+               esac
                config_get iftype "$CONFIG_SECTION" TYPE
                case "$iftype" in
                        interface)
+                               config_get proto "$CONFIG_SECTION" proto
+                               append interfaces "$CONFIG_SECTION"
                                config_get iftype "$CONFIG_SECTION" type
-                               config_get mode "$CONFIG_SECTION" proto
+                               config_get ifname "$CONFIG_SECTION" ifname
+                               config_set "$CONFIG_SECTION" device "$ifname"
                                case "$iftype" in
                                        bridge)
-                                               config_get iface "$CONFIG_SECTION" ifname
-                                               iface="${iface:-br-$CONFIG_SECTION}"
-                                               config_set "$CONFIG_SECTION" ifname "$iface"
+                                               config_set "$CONFIG_SECTION" ifnames "$ifname"
+                                               config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
                                        ;;
                                esac
-                               append interfaces "$CONFIG_SECTION"
-                               ( type "scan_$mode" ) >/dev/null 2>/dev/null && eval "scan_$mode '$CONFIG_SECTION'"
+                               ( type "scan_$proto" ) >/dev/null 2>/dev/null && eval "scan_$proto '$CONFIG_SECTION'"
                        ;;
                esac
        }
@@ -61,35 +65,36 @@ add_vlan() {
 setup_interface() {
        local iface="$1"
        local config="$2"
-       local proto="$3"
+       local proto
 
        [ -n "$config" ] || {
                config=$(find_config "$iface")
                [ "$?" = 0 ] || return 1
        }
 
-       [ -n "$proto" ] || {
-               config_get proto "$config" proto
-       }
-
+       proto="${3:-$(config_get "$config" proto)}"
        config_get iftype "$config" type
        
+       ifconfig "$iface" 2>/dev/null >/dev/null && {
+               # make sure the interface is removed from any existing bridge
+               unbridge "$iface"
+       }
+
        # Setup VLAN interfaces
        add_vlan "$iface"
 
        # Setup bridging
        case "$iftype" in
                bridge)
-                       config_get bridge_ifname "$config" ifname
                        ifconfig "$iface" up 2>/dev/null >/dev/null
-                       ifconfig "$bridge_ifname" 2>/dev/null >/dev/null && {
-                               $DEBUG brctl addif "$bridge_ifname" "$iface"
+                       ifconfig "br-$config" 2>/dev/null >/dev/null && {
+                               $DEBUG brctl addif "br-$config" "$iface"
                                return 0
                        } || {
-                               $DEBUG brctl addbr "$bridge_ifname"
-                               $DEBUG brctl setfd "$bridge_ifname" 0
-                               $DEBUG brctl addif "$bridge_ifname" "$iface"
-                               iface="$bridge_ifname"
+                               $DEBUG brctl addbr "br-$config"
+                               $DEBUG brctl setfd "br-$config" 0
+                               $DEBUG brctl addif "br-$config" "$iface"
+                               iface="br-$config"
                        }
                ;;
        esac
@@ -120,8 +125,13 @@ setup_interface() {
                        env -i ACTION="ifup" INTERFACE="config" DEVICE="$iface" PROTO=static /sbin/hotplug "iface" &
                ;;
                dhcp)
+                       # prevent udhcpc from starting more than once
+                       lock "/var/lock/dhcp-$iface"
                        pid="$(cat "$pidfile" 2>/dev/null)"
-                       [ -n "$pid" -a -d "/proc/$pid" ] && kill -9 "$pid"
+                       [ -d "/proc/$pid" ] && grep udhcpc "/proc/${pid}/cmdline" >/dev/null 2>/dev/null && {
+                               lock -u "/var/lock/dhcp-$iface"
+                               return 0
+                       }
 
                        config_get ipaddr "$config" ipaddr
                        config_get netmask "$config" netmask
@@ -134,6 +144,7 @@ setup_interface() {
                        # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
                        [ "$proto1" != "$proto" ] && dhcpopts="-n -q"
                        $DEBUG udhcpc -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &}
+                       lock -u "/var/lock/dhcp-$iface"
                ;;
                *)
                        if ( eval "type setup_interface_$proto" ) >/dev/null 2>/dev/null; then
@@ -146,3 +157,15 @@ setup_interface() {
        esac
 }
 
+unbridge() {
+       local dev="$1"
+       local brdev
+
+       brctl show | 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
+                       brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
+               done
+       }
+}