madwifi: only start hostapd when necessary

[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 284c6609c6a7b3f2ac83f5bde476f39c01208722..0b24886903de29bc4b3c1288b7407a1d20e4519b 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -78,6 +78,7 @@ enable_atheros() {
 
        local first=1
        for vif in $vifs; do
+               local start_hostapd
                nosbeacon=
                config_get ifname "$vif" ifname
                config_get enc "$vif" encryption
@@ -94,25 +95,26 @@ enable_atheros() {
                }
                config_set "$vif" ifname "$ifname"
 
+               # only need to change freq band and channel on the first vif
+               config_get agmode "$device" agmode
+               [ -z "$agmode" ] && config_get agmode "$device" mode
+
+               pureg=0
+               case "$agmode" in
+                       *b) agmode=11b;;
+                       *bg) agmode=11g;;
+                       *g) agmode=11g; pureg=1;;
+                       *gdt) agmode=11gdt;;
+                       *a) agmode=11a;;
+                       *adt) agmode=11adt;;
+                       *ast) agmode=11ast;;
+                       *fh) agmode=fh;;
+                       *) agmode=auto;;
+               esac
+               iwpriv "$ifname" mode "$agmode"
+               iwpriv "$ifname" pureg "$pureg"
+
                [ "$first" = 1 ] && {
-                       # only need to change freq band and channel on the first vif
-                       config_get agmode "$device" agmode
-                       [ -z "$agmode" ] && config_get agmode "$device" mode
-
-                       pureg=0
-                       case "$agmode" in
-                               *b) agmode=11b;;
-                               *bg) agmode=11g;;
-                               *g) agmode=11g; pureg=1;;
-                               *gdt) agmode=11gdt;;
-                               *a) agmode=11a;;
-                               *adt) agmode=11adt;;
-                               *ast) agmode=11ast;;
-                               *fh) agmode=fh;;
-                               *) agmode=auto;;
-                       esac
-                       iwpriv "$ifname" mode "$agmode"
-                       iwpriv "$ifname" pureg "$pureg"
                        iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
                }
        
@@ -136,7 +138,6 @@ enable_atheros() {
                        [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
                }
 
-               wpa=
                case "$enc" in
                        WEP|wep)
                                for idx in 1 2 3 4; do
@@ -151,6 +152,7 @@ enable_atheros() {
                                esac
                        ;;
                        PSK|psk|PSK2|psk2)
+                               start_hostapd=1
                                config_get key "$vif" key
                        ;;
                esac
@@ -260,9 +262,9 @@ enable_atheros() {
                                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
+                               if [ -n "$start_hostapd" ] && 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
+                                               echo "enable_atheros($device): Failed to set up hostapd for interface $ifname" >&2
                                                # make sure this wifi interface won't accidentally stay open without encryption
                                                ifconfig "$ifname" down
                                                wlanconfig "$ifname" destroy
@@ -271,80 +273,14 @@ enable_atheros() {
                                fi
                        ;;
                        wds|sta)
-                               config_get_bool usepassphrase "$vif" passphrase 1
-                               case "$enc" in
-                                       PSK|psk|PSK2|psk2)
-                                               case "$enc" in
-                                                       PSK|psk)
-                                                               proto='proto=WPA'
-                                                               if [ "$usepassphrase" = "1" ]; then
-                                                                       passphrase="psk=\"${key}\""
-                                                               else
-                                                                       passphrase="psk=${key}"
-                                                               fi
-                                                               ;;
-                                                       PSK2|psk2)
-                                                               proto='proto=RSN'
-                                                                if [ "$usepassphrase" = "1" ]; then
-                                                                        passphrase="psk=\"${key}\""
-                                                                else
-                                                                        passphrase="psk=${key}"
-                                                                fi
-                                                               ;;
-                                               esac
-                                               cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
-network={
-       scan_ssid=1
-       ssid="$ssid"
-       key_mgmt=WPA-PSK
-       $proto
-       $passphrase
-}
-EOF
-                                       ;;
-                                       WPA|wpa|WPA2|wpa2i|8021x|8021X)
-                                               config_get ca_cert "$vif" ca_cert
-                                               eap_type=$(echo $eap_type | tr 'a-z' 'A-Z')
-                                               case "$eap_type" in
-                                                       tls|TLS)
-                                                               proto='proto=WPA2'
-                                                               pairwise='pairwise=CCMP'
-                                                               group='group=CCMP'
-                                                               config_get priv_key "$vif" priv_key
-                                                               config_get priv_key_pwd "$vif" priv_key_pwd
-                                                               priv_key="private_key=\"$priv_key\""
-                                                               priv_key_pwd="private_key_passwd=\"$priv_key_pwd\""
-                                                       ;;
-                                                       peap|PEAP|ttls|TTLS)
-                                                               proto='proto=WPA2'
-                                                               config_get auth "$vif" auth
-                                                               config_get identity "$vif" identity
-                                                               config_get password "$vif" password
-                                                               phase2="phase2=\"auth=${auth:-MSCHAPV2}\""
-                                                               identity="identity=\"$identity\""
-                                                               password="password=\"$password\""
-                                                       ;;
-                                               esac
-                                               cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
-network={
-       scan_ssid=1
-       ssid="$ssid"
-       key_mgmt=WPA-EAP
-       $proto
-       $pairwise
-       $group
-       eap=$eap_type
-       ca_cert="$ca_cert"
-       $priv_key
-       $priv_key_pwd
-       $phase2
-       $identity
-       $password
-}
-EOF
-                                       ;;
-                               esac
-                               [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D madwifi -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+                               if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
+                                       wpa_supplicant_setup_vif "$vif" madwifi || {
+                                               echo "enable_atheros($device): Failed to set up wpa_supplicant for interface $ifname" >&2
+                                               ifconfig "$ifname" down
+                                               wlanconfig "$ifname" destroy
+                                               continue
+                                       }
+                               fi
                        ;;
                esac
                first=0