revert r19964 for now, there are issues with opkg/ipkg.py generating the status db

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

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 8b65e4567d5b9b02c2d59bc650bf0551cd971fa8..e21ea6ba9edfbad5e9a5545663f31f0341dcd273 100755 (executable)
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -34,9 +34,60 @@ bridge_interface() {(
        [ "$iftype" = bridge ] && config_get "$cfg" ifname
 )}
 
+prepare_key_wep() {
+       local key="$1"
+       local hex=1
+
+       echo -n "$key" | grep -qE "[^a-fA-F0-9]" && hex=0
+       [ "${#key}" -eq 10 -a $hex -eq 1 ] || \
+       [ "${#key}" -eq 26 -a $hex -eq 1 ] || {
+               [ "${key:0:2}" = "s:" ] && key="${key#s:}"
+               key="$(echo -n "$key" | hexdump -ve '1/1 "%02x" ""')"
+       }
+       echo "$key"
+}
+
+wifi_fixup_hwmode() {
+       local device="$1"
+       local default="$2"
+       local hwmode hwmode_11n
+
+       config_get channel "$device" channel
+       config_get hwmode "$device" hwmode
+       case "$hwmode" in
+               11bg) hwmode=bg;;
+               11a) hwmode=a;;
+               11b) hwmode=b;;
+               11g) hwmode=g;;
+               11n*)
+                       hwmode_11n="${hwmode##11n}"
+                       case "$hwmode_11n" in
+                               a|g) ;;
+                               default) hwmode_11n="$default"
+                       esac
+                       config_set "$device" hwmode_11n "$hwmode_11n"
+               ;;
+               *)
+                       hwmode=
+                       if [ "${channel:-0}" -gt 0 ]; then 
+                               if [ "${channel:-0}" -gt 14 ]; then
+                                       hwmode=a
+                               else
+                                       hwmode=g
+                               fi
+                       else
+                               hwmode="$default"
+                       fi
+               ;;
+       esac
+       config_set "$device" hwmode "$hwmode"
+}
 
 wifi_updown() {
-       [ enable = "$1" ] && wifi_updown disable "$2"
+       [ enable = "$1" ] && {
+               wifi_updown disable "$2"
+               scan_wifi
+       }
        for device in ${2:-$DEVICES}; do (
                config_get disabled "$device" disabled
                [ 1 == "$disabled" ] && {
@@ -66,40 +117,43 @@ wifi_detect() {
 start_net() {(
        local iface="$1"
        local config="$2"
+       local vifmac="$3"
 
+       [ -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 "$iface" "$config" "" "$vifmac"
 )}
 
 set_wifi_up() {
        local cfg="$1"
        local ifname="$2"
-       uci set "/var/state/wireless.${cfg}.up=1"
-       uci set "/var/state/wireless.${cfg}.ifname=$ifname"
+       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/state/wireless ] || return
 
+       [ -f "/var/run/wifi-${cfg}.pid" ] &&
+               kill "$(cat "/var/run/wifi-${cfg}.pid")" 2>/dev/null
+       uci_revert_state wireless "$cfg"
        config_get vifs "$cfg" vifs
        for vif in $vifs; do
-               append vifstr "$vif" "|"
+               uci_revert_state wireless "$vif"
        done
-       FILE="/var/state/wireless.$$"
-       grep -vE "^config_set '($vifstr)' " /var/state/wireless > "$FILE"
-       mv "$FILE" /var/state/wireless
 }
 
 scan_wifi() {
        local cfgfile="$1"
+       DEVICES=
        config_cb() {
                config_get TYPE "$CONFIG_SECTION" TYPE
                case "$TYPE" in
                        wifi-device)
                                append DEVICES "$CONFIG_SECTION"
+                               config_set "$CONFIG_SECTION" vifs ""
                        ;;
                        wifi-iface)
                                config_get device "$CONFIG_SECTION" device