[package] hostapd: allow mixed TKIP/CCMP for 11n

[openwrt/svn-archive/archive.git] / package / hostapd / files / hostapd.sh

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index fdb047be6a76518f058fc014a8d4d6ce4e229585..acb92aac1778549341ddebf7862bc66b9b5cd161 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -1,7 +1,7 @@
 hostapd_set_bss_options() {
        local var="$1"
        local vif="$2"
-       local enc wpa_group_rekey
+       local enc wpa_group_rekey wps_possible
 
        config_get enc "$vif" encryption
        config_get wpa_group_rekey "$vif" wpa_group_rekey
@@ -9,6 +9,9 @@ hostapd_set_bss_options() {
 
        config_get device "$vif" device
        config_get hwmode "$device" hwmode
+       config_get phy "$device" phy
+
+       append "$var" "ctrl_interface=/var/run/hostapd-$phy" "$N"
 
        if [ "$ap_isolate" -gt 0 ]; then
                append "$var" "ap_isolate=$ap_isolate" "$N"
@@ -47,8 +50,8 @@ hostapd_set_bss_options() {
        esac
 
        # enforce CCMP for 11ng and 11na
-       case "$hwmode" in
-               *ng|*na) crypto="CCMP";;
+       case "$hwmode:$crypto" in
+               *ng:TKIP|*na:TKIP) crypto="CCMP TKIP";;
        esac
 
        # use crypto/auth settings for building the hostapd config
@@ -60,6 +63,7 @@ hostapd_set_bss_options() {
                        else
                                append "$var" "wpa_passphrase=$psk" "$N"
                        fi
+                       wps_possible=1
                ;;
                *wpa*)
                        # required fields? formats?
@@ -76,7 +80,6 @@ hostapd_set_bss_options() {
                        append "$var" "eapol_key_index_workaround=1" "$N"
                        append "$var" "radius_acct_interim_interval=300" "$N"
                        append "$var" "ieee8021x=1" "$N"
-                       append "$var" "auth_algs=1" "$N"
                        append "$var" "wpa_key_mgmt=WPA-EAP" "$N"
                        append "$var" "wpa_group_rekey=300" "$N"
                        append "$var" "wpa_gmk_rekey=640" "$N"
@@ -100,6 +103,14 @@ hostapd_set_bss_options() {
                                        append "$var" "wep_default_key=0" "$N"
                                ;;
                        esac
+                       case "$enc" in
+                               *shared*)
+                                       auth_algs=2
+                               ;;
+                               *mixed*)
+                                       auth_algs=3
+                               ;;
+                       esac
                        wpa=0
                        crypto=
                ;;
@@ -108,6 +119,7 @@ hostapd_set_bss_options() {
                        crypto=
                ;;
        esac
+       append "$var" "auth_algs=${auth_algs:-1}" "$N"
        append "$var" "wpa=$wpa" "$N"
        [ -n "$crypto" ] && append "$var" "wpa_pairwise=$crypto" "$N"
        [ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N"
@@ -115,25 +127,47 @@ hostapd_set_bss_options() {
        config_get ssid "$vif" ssid
        config_get bridge "$vif" bridge
        config_get ieee80211d "$vif" ieee80211d
+       config_get iapp_interface "$vif" iapp_interface
+
+       config_get_bool wps_pbc "$vif" wps_pushbutton 0
+       [ -n "$wps_possible" -a "$wps_pbc" -gt 0 ] && {
+               append "$var" "eap_server=1" "$N"
+               append "$var" "wps_state=2" "$N"
+               append "$var" "ap_setup_locked=1" "$N"
+               append "$var" "config_methods=push_button" "$N"
+       }
 
        append "$var" "ssid=$ssid" "$N"
        [ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N"
        [ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N"
+       [ -n "$iapp_interface" ] && append "$var" iapp_interface=$(uci_get_state network "$iapp_interface" ifname "$iapp_interface") "$N"
 
-       [ "$wpa" -ge "2" ] && config_get ieee80211w "$vif" ieee80211w
-       case "$ieee80211w" in
-               [012])
-                       append "$var" "ieee80211w=$ieee80211w" "$N"
-                       [ "$ieee80211w" -gt "0" ] && {
-                               config_get ieee80211w_max_timeout "$vif" ieee80211w_max_timeout
-                               config_get ieee80211w_retry_timeout "$vif" ieee80211w_retry_timeout
-                               [ -n "$ieee80211w_max_timeout" ] && \
-                                       append "$var" "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
-                               [ -n "$ieee80211w_retry_timeout" ] && \
-                                       append "$var" "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N"
-                       }
-               ;;
-       esac
+       if [ "$wpa" -ge "2" ]
+       then
+               # RSN -> allow preauthentication
+               config_get rsn_preauth "$vif" rsn_preauth
+               if [ -n "$bridge" -a "$rsn_preauth" = 1 ]
+               then
+                       append "$var" "rsn_preauth=1" "$N"
+                       append "$var" "rsn_preauth_interfaces=$bridge" "$N"
+               fi
+
+               # RSN -> allow management frame protection
+               config_get ieee80211w "$vif" ieee80211w
+               case "$ieee80211w" in
+                       [012])
+                               append "$var" "ieee80211w=$ieee80211w" "$N"
+                               [ "$ieee80211w" -gt "0" ] && {
+                                       config_get ieee80211w_max_timeout "$vif" ieee80211w_max_timeout
+                                       config_get ieee80211w_retry_timeout "$vif" ieee80211w_retry_timeout
+                                       [ -n "$ieee80211w_max_timeout" ] && \
+                                               append "$var" "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
+                                       [ -n "$ieee80211w_retry_timeout" ] && \
+                                               append "$var" "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N"
+                               }
+                       ;;
+               esac
+       fi
 }
 
 hostapd_setup_vif() {
@@ -153,7 +187,6 @@ hostapd_setup_vif() {
        [ "$channel" = auto ] && channel=
        [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
        cat > /var/run/hostapd-$ifname.conf <<EOF
-ctrl_interface=/var/run/hostapd-$ifname
 driver=$driver
 interface=$ifname
 ${hwmode:+hw_mode=${hwmode#11}}