madwifi: fix encryption type check

[openwrt.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 010391e..001ea09 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -78,9 +78,11 @@ enable_atheros() {
 
        local first=1
        for vif in $vifs; do
 
        local first=1
        for vif in $vifs; do

+               local start_hostapd

                nosbeacon=
                config_get ifname "$vif" ifname
                config_get enc "$vif" encryption
                nosbeacon=
                config_get ifname "$vif" ifname
                config_get enc "$vif" encryption

+               config_get eap_type "$vif" eap_type

                config_get mode "$vif" mode
                
                [ "$mode" = sta ] && config_get nosbeacon "$device" nosbeacon
                config_get mode "$vif" mode
                
                [ "$mode" = sta ] && config_get nosbeacon "$device" nosbeacon


@@ -93,21 +95,26 @@ enable_atheros() {
                }
                config_set "$vif" ifname "$ifname"
 
                }
                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 ] && {
                [ "$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;;
-                               *a) agmode=11a;;
-                               *) agmode=auto;;
-                       esac
-                       iwpriv "$ifname" mode "$agmode"
-                       iwpriv "$ifname" pureg "$pureg"

                        iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
                }
        
                        iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
                }
        


@@ -119,9 +126,6 @@ enable_atheros() {
                        iwpriv "$ifname" ff "$ff"
                fi
 
                        iwpriv "$ifname" ff "$ff"
                fi
 

-               config_get wdssep "$vif" wdssep
-               [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
-

                config_get wds "$vif" wds
                case "$wds" in
                        1|on|enabled) wds=1;;
                config_get wds "$vif" wds
                case "$wds" in
                        1|on|enabled) wds=1;;


@@ -129,7 +133,11 @@ enable_atheros() {
                esac
                iwpriv "$ifname" wds "$wds"
 
                esac
                iwpriv "$ifname" wds "$wds"
 

-               wpa=
+               [ "$mode" = ap -a "$wds" = 1 ] && {
+                       config_get_bool wdssep "$vif" wdssep 1
+                       [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
+               }
+

                case "$enc" in
                        WEP|wep)
                                for idx in 1 2 3 4; do
                case "$enc" in
                        WEP|wep)
                                for idx in 1 2 3 4; do


@@ -143,8 +151,8 @@ enable_atheros() {
                                        *) iwconfig "$ifname" enc "$key";;
                                esac
                        ;;
                                        *) iwconfig "$ifname" enc "$key";;
                                esac
                        ;;

-                       PSK|psk|PSK2|psk2)
-                               config_get key "$vif" key
+                       psk*|wpa*)
+                               start_hostapd=1

                        ;;
                esac
 
                        ;;
                esac
 


@@ -253,9 +261,9 @@ enable_atheros() {
                                config_get_bool isolate "$vif" isolate 0
                                iwpriv "$ifname" ap_bridge "$((isolate^1))"
 
                                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 || {
                                        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
                                                # make sure this wifi interface won't accidentally stay open without encryption
                                                ifconfig "$ifname" down
                                                wlanconfig "$ifname" destroy


@@ -264,42 +272,14 @@ enable_atheros() {
                                fi
                        ;;
                        wds|sta)
                                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|wpa2)
-                                               #add wpa_supplicant calls here
-                                       ;;
-                               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
                        ;;
                esac
                first=0