keep track of the wifi interface state in /var/state/wireless

[openwrt/svn-archive/archive.git] / package / madwifi / files / lib / wifi / madwifi.sh

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 15e7850eb9a2d4fd848aaa74088510d023723c54..07a6cd78bf74b1285d527dd8bb4b90c237fd5559 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -14,7 +14,7 @@ scan_atheros() {
                
                config_get mode "$vif" mode
                case "$mode" in
-                       adhoc|sta|ap)
+                       adhoc|ahdemo|sta|ap)
                                append $mode "$vif"
                        ;;
                        wds)
@@ -35,6 +35,7 @@ scan_atheros() {
        case "${adhoc:+1}:${sta:+1}:${ap+1}" in
                # valid mode combinations
                1::) wds="";;
+               1::1);;
                :1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
                :1:);;
                ::1);;
@@ -42,13 +43,14 @@ scan_atheros() {
                *) echo "$device: Invalid mode combination in config"; return 1;;
        esac
 
-       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${wds:+$wds }"
+       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }"
 }
 
 
 disable_atheros() (
        local device="$1"
 
+       set_wifi_down "$device"
        # kill all running hostapd and wpa_supplicant processes that
        # are running on atheros vifs 
        for pid in `pidof hostapd wpa_supplicant`; do
@@ -72,7 +74,6 @@ enable_atheros() {
        config_get channel "$device" channel
        config_get vifs "$device" vifs
        
-       disable_atheros "$device"
        local first=1
        for vif in $vifs; do
                nosbeacon=
@@ -103,14 +104,18 @@ enable_atheros() {
                        esac
                        iwconfig "$ifname" channel 0 >/dev/null 2>/dev/null 
                        ifconfig "$ifname" up
+                       sleep 1
                        iwpriv "$ifname" mode "$agmode"
                        iwpriv "$ifname" pureg "$pureg"
                        iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
                }
        
-               config_get_bool hidden "$vif" hidden
+               config_get_bool hidden "$vif" hidden 0
                iwpriv "$ifname" hide_ssid "$hidden"
 
+               config_get_bool ff "$vif" ff 0
+               iwpriv "$ifname" ff "$ff"
+
                config_get wds "$vif" wds
                case "$wds" in
                        1|on|enabled) wds=1;;
@@ -142,16 +147,14 @@ enable_atheros() {
                                config_get addr "$vif" bssid
                                iwpriv "$ifname" wds_add "$addr"
                        ;;
-                       *)
-                               config_get ssid "$vif" ssid
-                       ;;
-                       adhoc)
+                       adhoc|ahdemo)
                                config_get addr "$vif" bssid
                                [ -z "$addr" ] || { 
                                        iwconfig "$ifname" ap "$addr"
                                }
                        ;;
                esac
+               config_get ssid "$vif" ssid
 
                [ "$mode" = "sta" ] && {
                        config_get_bool bgscan "$vif" bgscan 1
@@ -181,6 +184,16 @@ enable_atheros() {
                        iwconfig "$ifname" txpower "${txpwr%%.*}"
                fi
 
+               config_get frag "$vif" frag
+               if [ -n "$frag" ]; then
+                       iwconfig "$ifname" frag "${frag%%.*}"
+               fi
+
+               config_get rts "$vif" rts
+               if [ -n "$rts" ]; then
+                       iwconfig "$ifname" rts "${rts%%.*}"
+               fi
+
                ifconfig "$ifname" up
                iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
 
@@ -192,15 +205,21 @@ enable_atheros() {
                        start_net "$ifname" "$net_cfg"
                }
                iwconfig "$ifname" essid "$ssid"
+               set_wifi_up "$vif" "$ifname"
                case "$mode" in
                        ap)
-                               hostapd_setup_vif "$vif" madwifi || {
-                                       echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2
-                                       # make sure this wifi interface won't accidentally stay open without encryption
-                                       ifconfig "$ifname" down
-                                       wlanconfig "$ifname" destroy
-                                       continue
-                               }
+                               config_get_bool isolate "$vif" isolate 0
+                               iwpriv "$ifname" ap_bridge "$((isolate^1))"
+
+                               if eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
+                                       hostapd_setup_vif "$vif" madwifi || {
+                                               echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2
+                                               # make sure this wifi interface won't accidentally stay open without encryption
+                                               ifconfig "$ifname" down
+                                               wlanconfig "$ifname" destroy
+                                               continue
+                                       }
+                               fi
                        ;;
                        wds|sta)
                                case "$enc" in 
@@ -244,24 +263,16 @@ detect_atheros() {
 config wifi-device  $dev
        option type     atheros
        option channel  5
-#       option diversity 1
-#       option txantenna 0
-#       option rxantenna 0
-#       option distance  2000
-# disable radio to prevent an open ap after reflashing:
-       option disabled 1
 
+       # REMOVE THIS LINE TO ENABLE WIFI:
+       option disabled 1
 
 config wifi-iface
        option device   $dev
        option network  lan
        option mode     ap
        option ssid     OpenWrt
-       option hidden   0
-#      option txpower  15
-#      option bgscan   enable
        option encryption none
-
 EOF
        done
 }