diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-10-08 11:09:36 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-10-08 11:09:36 +0000 |
| commit | f12ff74e963af24cabaf72c9d9df418dbe713b07 (patch) | |
| tree | 094c10faa463ea0597d6bf6fb26c30f50221b087 /package/network/services/hostapd/files/hostapd.sh | |
| parent | 5028cc59d71b635205988d91a92be7a5d6f7b34f (diff) | |
hostapd: Add WPS unconfigured & WPS pin method support
Signed-off-by: Mathieu Olivari <mathieu@qca.qualcomm.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38335 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/hostapd/files/hostapd.sh')
| -rw-r--r-- | package/network/services/hostapd/files/hostapd.sh | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 0f1a619a55..aace21ce67 100644 --- 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 @@ -182,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" |