hostapd: Add WPS unconfigured & WPS pin method support

[openwrt/openwrt.git] / package / network / services / hostapd / files / hostapd.sh

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 94f75c1c956652eaec14de328f8f635daecc7d04..aace21ce6711da3407cefe67a7fc306e3aacbe0b 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -3,7 +3,7 @@ hostapd_set_bss_options() {
        local vif="$2"
        local enc wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wps_possible
 
-       config_get enc "$vif" encryption
+       config_get enc "$vif" encryption "none"
        config_get wep_rekey        "$vif" wep_rekey        # 300
        config_get wpa_group_rekey  "$vif" wpa_group_rekey  # 300
        config_get wpa_pair_rekey   "$vif" wpa_pair_rekey   # 300
@@ -73,6 +73,14 @@ hostapd_set_bss_options() {
 
        # use crypto/auth settings for building the hostapd config
        case "$enc" in
+               none)
+                       wps_possible=1
+                       wpa=0
+                       crypto=
+                       # Here we make the assumption that if we're in open mode
+                       # with WPS enabled, we got to be in unconfigured state.
+                       wps_not_configured=1
+               ;;
                *psk*)
                        config_get psk "$vif" key
                        if [ ${#psk} -eq 64 ]; then
@@ -108,6 +116,15 @@ hostapd_set_bss_options() {
                        [ -n "$acct_port" ] && append "$var" "acct_server_port=$acct_port" "$N"
                        config_get acct_secret "$vif" acct_secret
                        [ -n "$acct_secret" ] && append "$var" "acct_server_shared_secret=$acct_secret" "$N"
+                       config_get eap_reauth_period "$vif" eap_reauth_period
+                       [ -n "$eap_reauth_period" ] && append "$var" "eap_reauth_period=$eap_reauth_period" "$N"
+                       config_get dae_client "$vif" dae_client
+                       config_get dae_secret "$vif" dae_secret
+                       [ -n "$dae_client" -a -n "$dae_secret" ] && {
+                               config_get dae_port  "$vif" dae_port
+                               append "$var" "radius_das_port=${dae_port:-3799}" "$N"
+                               append "$var" "radius_das_client=$dae_client $dae_secret" "$N"
+                       }
                        config_get nasid "$vif" nasid
                        append "$var" "nas_identifier=$nasid" "$N"
                        append "$var" "eapol_key_index_workaround=1" "$N"
@@ -173,10 +190,12 @@ hostapd_set_bss_options() {
                config_get device_type "$vif" wps_device_type "6-0050F204-1"
                config_get device_name "$vif" wps_device_name "OpenWrt AP"
                config_get manufacturer "$vif" wps_manufacturer "openwrt.org"
+               config_get wps_pin "$vif" wps_pin "12345670"
 
                append "$var" "eap_server=1" "$N"
-               append "$var" "wps_state=2" "$N"
-               append "$var" "ap_setup_locked=1" "$N"
+               append "$var" "ap_pin=$wps_pin" "$N"
+               append "$var" "wps_state=${wps_not_configured:-2}" "$N"
+               append "$var" "ap_setup_locked=0" "$N"
                append "$var" "device_type=$device_type" "$N"
                append "$var" "device_name=$device_name" "$N"
                append "$var" "manufacturer=$manufacturer" "$N"