mac80211: update to wireless-testing 2011-06-22

[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 ec23145..e2dd0a3 100755 (executable)
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -3,6 +3,14 @@
 
 . /etc/functions.sh
 
 
 . /etc/functions.sh
 

+usage() {
+       cat <<EOF
+Usage: $0 [down|detect]
+enables (default), disables or detects a wifi configuration.
+EOF
+       exit 1
+}
+

 find_net_config() {(
        local vif="$1"
        local cfg
 find_net_config() {(
        local vif="$1"
        local cfg


@@ -34,6 +42,19 @@ bridge_interface() {(
        [ "$iftype" = bridge ] && config_get "$cfg" ifname
 )}
 
        [ "$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"
 wifi_fixup_hwmode() {
        local device="$1"
        local default="$2"


@@ -42,12 +63,13 @@ wifi_fixup_hwmode() {
        config_get channel "$device" channel
        config_get hwmode "$device" hwmode
        case "$hwmode" in
        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}"
                11a) hwmode=a;;
                11b) hwmode=b;;
                11g) hwmode=g;;
                11n*)
                        hwmode_11n="${hwmode##11n}"

-                       case "$hwmode" in
+                       case "$hwmode_11n" in

                                a|g) ;;
                                default) hwmode_11n="$default"
                        esac
                                a|g) ;;
                                default) hwmode_11n="$default"
                        esac


@@ -70,7 +92,10 @@ wifi_fixup_hwmode() {
 }
 
 wifi_updown() {
 }
 
 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" ] && {
        for device in ${2:-$DEVICES}; do (
                config_get disabled "$device" disabled
                [ 1 == "$disabled" ] && {


@@ -120,7 +145,7 @@ set_wifi_down() {
        local vifs vif vifstr
 
        [ -f "/var/run/wifi-${cfg}.pid" ] &&
        local vifs vif vifstr
 
        [ -f "/var/run/wifi-${cfg}.pid" ] &&

-               kill "$(cat "/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
        uci_revert_state wireless "$cfg"
        config_get vifs "$cfg" vifs
        for vif in $vifs; do


@@ -130,12 +155,23 @@ set_wifi_down() {
 
 scan_wifi() {
        local cfgfile="$1"
 
 scan_wifi() {
        local cfgfile="$1"

+       DEVICES=

        config_cb() {
        config_cb() {

-               config_get TYPE "$CONFIG_SECTION" TYPE
-               case "$TYPE" in
+               local type="$1"
+               local section="$2"
+
+               # section start
+               case "$type" in

                        wifi-device)
                        wifi-device)

-                               append DEVICES "$CONFIG_SECTION"
+                               append DEVICES "$section"
+                               config_set "$section" vifs ""
+                               config_set "$section" ht_capab ""

                        ;;
                        ;;

+               esac
+
+               # section end
+               config_get TYPE "$CONFIG_SECTION" TYPE
+               case "$TYPE" in

                        wifi-iface)
                                config_get device "$CONFIG_SECTION" device
                                config_get vifs "$device" vifs 
                        wifi-iface)
                                config_get device "$CONFIG_SECTION" device
                                config_get vifs "$device" vifs 


@@ -155,5 +191,6 @@ scan_wifi
 case "$1" in
        down) wifi_updown "disable" "$2";;
        detect) wifi_detect "$2";;
 case "$1" in
        down) wifi_updown "disable" "$2";;
        detect) wifi_detect "$2";;

+       --help|help) usage;;

        *) wifi_updown "enable" "$2";;
 esac
        *) wifi_updown "enable" "$2";;
 esac