[package] sync macs with vif bssids in broadcom.sh, fixes multi-ssid with wpa

[openwrt/svn-archive/archive.git] / package / base-files / files / sbin / wifi

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 2b4f1ce1c2c90b403ab19a963e78619756491dc6..30ecb1b77c748d141b79105662a776a2fb916cc7 100755 (executable)
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -35,24 +35,18 @@ bridge_interface() {(
 )}
 
 
-wifi_up() {
+wifi_updown() {
+       [ enable = "$1" ] && wifi_updown disable "$2"
        for device in ${2:-$DEVICES}; do (
+               config_get disabled "$device" disabled
+               [ 1 == "$disabled" ] && {
+                       echo "'$device' is disabled"
+                       set disable
+               }
                config_get iftype "$device" type
-               if eval "type enable_$iftype" 2>/dev/null >/dev/null; then
+               if eval "type ${1}_$iftype" 2>/dev/null >/dev/null; then
                        eval "scan_$iftype '$device'"
-                       eval "enable_$iftype '$device'" || echo "$device($iftype): Setup failed"
-               else
-                       echo "$device($iftype): Interface type not supported"
-               fi
-       ); done
-}
-
-wifi_down() {
-       for device in ${2:-$DEVICES}; do (
-               config_get iftype "$device" type
-               if eval "type disable_$iftype" 2>/dev/null >/dev/null; then
-                       eval "scan_$iftype '$device'"
-                       eval "disable_$iftype '$device'" || echo "$device($iftype): Disable failed"
+                       eval "${1}_$iftype '$device'" || echo "$device($iftype): ${1} failed"
                else
                        echo "$device($iftype): Interface type not supported"
                fi
@@ -73,33 +67,58 @@ start_net() {(
        local iface="$1"
        local config="$2"
 
+       [ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
        include /lib/network
        scan_interfaces
-       setup_interface "$1" "$2"
+       setup_interface "$1" "$2" "$3"
 )}
 
-config_cb() {
-       config_get TYPE "$CONFIG_SECTION" TYPE
-       case "$TYPE" in
-               wifi-device)
-                       append DEVICES "$CONFIG_SECTION"
-               ;;
-               wifi-iface)
-                       config_get device "$CONFIG_SECTION" device
-                       config_get vifs "$device" vifs 
-                       append vifs "$CONFIG_SECTION"
-                       config_set "$device" vifs "$vifs"
-               ;;
-       esac
+set_wifi_up() {
+       local cfg="$1"
+       local ifname="$2"
+       uci_set_state wireless "$cfg" up 1
+       uci_set_state wireless "$cfg" ifname "$ifname"
+}
+
+set_wifi_down() {
+       local cfg="$1"
+       local vifs vif vifstr
+
+       [ -f "/var/run/wifi-${cfg}.pid" ] &&
+               kill "$(cat "/var/run/wifi-${cfg}.pid")"
+       uci_revert_state wireless "$cfg"
+       config_get vifs "$cfg" vifs
+       for vif in $vifs; do
+               uci_revert_state wireless "$vif"
+       done
+}
+
+scan_wifi() {
+       local cfgfile="$1"
+       config_cb() {
+               config_get TYPE "$CONFIG_SECTION" TYPE
+               case "$TYPE" in
+                       wifi-device)
+                               append DEVICES "$CONFIG_SECTION"
+                       ;;
+                       wifi-iface)
+                               config_get device "$CONFIG_SECTION" device
+                               config_get vifs "$device" vifs 
+                               append vifs "$CONFIG_SECTION"
+                               config_set "$device" vifs "$vifs"
+                       ;;
+               esac
+       }
+       config_load "${cfgfile:-wireless}"
 }
 
 DEVICES=
 DRIVERS=
-config_load wireless
 include /lib/wifi
+scan_wifi
 
 case "$1" in
-       down) wifi_down "$2";;
+       down) wifi_updown "disable" "$2";;
        detect) wifi_detect "$2";;
-       *) wifi_up "$2";;
+       *) wifi_updown "enable" "$2";;
 esac