KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hostapd: Add WPS unconfigured & WPS pin method support

Browse source 
Signed-off-by: Mathieu Olivari <mathieu@qca.qualcomm.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>

SVN-Revision: 38335
This commit is contained in:
Felix Fietkau 2013-10-08 11:09:36 +00:00
parent 4689bc8517
commit 40aec9ed46
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
package/network/services/hostapd/files/hostapd.sh
View file

@ -3,7 +3,7 @@ hostapd_set_bss_options() {
local vif="$2" local vif="$2"
local enc wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wps_possible 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 wep_rekey "$vif" wep_rekey # 300
config_get wpa_group_rekey "$vif" wpa_group_rekey # 300 config_get wpa_group_rekey "$vif" wpa_group_rekey # 300
config_get wpa_pair_rekey "$vif" wpa_pair_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 # use crypto/auth settings for building the hostapd config
case "$enc" in 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*) *psk*)
config_get psk "$vif" key config_get psk "$vif" key
if [ ${#psk} -eq 64 ]; then 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_type "$vif" wps_device_type "6-0050F204-1"
config_get device_name "$vif" wps_device_name "OpenWrt AP" config_get device_name "$vif" wps_device_name "OpenWrt AP"
config_get manufacturer "$vif" wps_manufacturer "openwrt.org" config_get manufacturer "$vif" wps_manufacturer "openwrt.org"
config_get wps_pin "$vif" wps_pin "12345670"
append "$var" "eap_server=1" "$N" append "$var" "eap_server=1" "$N"
append "$var" "wps_state=2" "$N" append "$var" "ap_pin=$wps_pin" "$N"
append "$var" "ap_setup_locked=1" "$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_type=$device_type" "$N"
append "$var" "device_name=$device_name" "$N" append "$var" "device_name=$device_name" "$N"
append "$var" "manufacturer=$manufacturer" "$N" append "$var" "manufacturer=$manufacturer" "$N"