Enable bridge, disable wifi

[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 2a8465b9fd4e94dc10153c249e8118aa5bc1ae60..8083612af929d2a27a042921587fbe0bf9ba1c0e 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -38,7 +38,7 @@ scan_atheros() {
                :1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
                :1:);;
                ::1);;
-               :::);;
+               ::);;
                *) echo "$device: Invalid mode combination in config"; return 1;;
        esac
 
@@ -73,6 +73,7 @@ enable_atheros() {
        config_get vifs "$device" vifs
        
        disable_atheros "$device"
+       local first=1
        for vif in $vifs; do
                nosbeacon=
                config_get ifname "$vif" ifname
@@ -89,8 +90,25 @@ enable_atheros() {
                }
                config_set "$vif" ifname "$ifname"
 
-               config_get "$device" mode
-               iwpriv "$ifname" mode "${mode:-11g}"
+               [ "$first" = 1 ] && {
+                       # only need to change freq band and channel on the first vif
+                       config_get agmode "$device" mode
+                       pureg=0
+                       case "$agmode" in
+                               *b) agmode=11b;;
+                               *bg) agmode=11g;;
+                               *g) agmode=11g; pureg=1;;
+                               *a) agmode=11a;;
+                               *) agmode=11g;;
+                       esac
+                       iwconfig "$ifname" channel 0 
+                       iwpriv "$ifname" mode "$agmode"
+                       iwpriv "$ifname" pureg "$pureg"
+                       iwconfig "$ifname" channel "$channel"
+               }
+       
+               config_get_bool hidden "$vif" hidden
+               iwpriv "$ifname" hide_ssid "$hidden"
 
                config_get wds "$vif" wds
                case "$wds" in
@@ -107,7 +125,10 @@ enable_atheros() {
                                        iwconfig "$ifname" enc "[$idx]" "${key:-off}"
                                done
                                config_get key "$vif" key
-                               iwconfig "$ifname" enc "[${key:-1}]"
+                               iwconfig "$ifname" enc "${key:-1}"
+                       ;;
+                       PSK|psk|PSK2|psk2)
+                               config_get key "$vif" key
                        ;;
                esac
 
@@ -120,9 +141,37 @@ enable_atheros() {
                                config_get ssid "$vif" ssid
                        ;;
                esac
-               iwconfig "$ifname" channel "$channel"
+
+               [ "$mode" = "sta" ] && {
+                       config_get_bool bgscan "$vif" bgscan 1
+                       iwpriv "$ifname" bgscan "$bgscan"
+               }
+
+               config_get_bool antdiv "$device" diversity 1
+               sysctl -w dev."$device".diversity="$antdiv" >&-
+
+               config_get antrx "$device" rxantenna
+               if [ -n "$antrx" ]; then
+                       sysctl -w dev."$device".rxantenna="$antrx" >&-
+               fi
+
+               config_get anttx "$device" txantenna
+               if [ -n "$anttx" ]; then
+                       sysctl -w dev."$device".txantenna="$anttx" >&-
+               fi
+
+               config_get distance "$device" distance
+               if [ -n "$distance" ]; then
+                       athctrl -i "$device" -d "$distance" >&-
+               fi
+
+               config_get txpwr "$vif" txpower
+               if [ -n "$txpwr" ]; then
+                       iwconfig "$ifname" txpower "${txpwr%%.*}"
+               fi
+
                ifconfig "$ifname" up
-               
+
                local net_cfg bridge
                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {
@@ -130,6 +179,7 @@ enable_atheros() {
                        config_set "$vif" bridge "$bridge"
                        start_net "$ifname" "$net_cfg"
                }
+               iwconfig "$ifname" essid "$ssid"
                case "$mode" in
                        ap)
                                hostapd_setup_vif "$vif" madwifi || {
@@ -141,10 +191,37 @@ enable_atheros() {
                                }
                        ;;
                        wds|sta)
-                               iwconfig "$ifname" essid "$ssid"
-                               # FIXME: implement wpa_supplicant calls here
+                               case "$enc" in 
+                                       PSK|psk|PSK2|psk2)
+                                               case "$enc" in
+                                                       PSK|psk)
+                                                               proto='proto=WPA';;
+                                                       PSK2|psk2)
+                                                               proto='proto=RSN';;
+                                               esac
+                                               cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
+ctrl_interface=/var/run/wpa_supplicant
+network={
+       scan_ssid=1
+       ssid="$ssid"
+       key_mgmt=WPA-PSK
+       $proto
+       psk="$key"
+}
+EOF
+                                       ;;
+                                       WPA|wpa|WPA2|wpa2)
+                                               #add wpa_supplicant calls here
+                                       ;;
+                               esac
+                               net_cfg="$(find_net_config "$vif")"
+                               [ -z "$net_cfg" ] || {
+                                       bridge="$(bridge_interface "$net_cfg")"
+                               }
+                               wpa_supplicant ${bridge:+ -b $bridge} -Bw -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
                        ;;
                esac
+               first=0
        done
 }
 
@@ -159,16 +236,24 @@ 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 radio    0
+
 
 config wifi-iface
-       option device   $dev
-#      option network  lan
-       option mode     ap
-       option ssid     OpenWrt
-       option hidden   0
+       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
 }
-