X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/200663f5d96c38484074fcb2849aae126dc6fb7f..525ee451c1d80d4cb5c99e5f4a901ddb21830d50:/package/hostapd/files/hostapd.sh?ds=inline diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh index acb92aac1..29d8c7297 100644 --- a/package/hostapd/files/hostapd.sh +++ b/package/hostapd/files/hostapd.sh @@ -68,13 +68,23 @@ hostapd_set_bss_options() { *wpa*) # required fields? formats? # hostapd is particular, maybe a default configuration for failures - config_get server "$vif" server - append "$var" "auth_server_addr=$server" "$N" - config_get port "$vif" port - port=${port:-1812} - append "$var" "auth_server_port=$port" "$N" - config_get secret "$vif" key - append "$var" "auth_server_shared_secret=$secret" "$N" + config_get auth_server "$vif" auth_server + [ -z "$auth_server" ] && config_get auth_server "$vif" server + append "$var" "auth_server_addr=$auth_server" "$N" + config_get auth_port "$vif" auth_port + [ -z "$auth_port" ] && config_get auth_port "$vif" port + auth_port=${auth_port:-1812} + append "$var" "auth_server_port=$auth_port" "$N" + config_get auth_secret "$vif" auth_secret + [ -z "$auth_secret" ] && config_get auth_secret "$vif" key + append "$var" "auth_server_shared_secret=$auth_secret" "$N" + config_get acct_server "$vif" acct_server + [ -n "$acct_server" ] && append "$var" "acct_server_addr=$acct_server" "$N" + config_get acct_port "$vif" acct_port + [ -n "$acct_port" ] && acct_port=${acct_port:-1813} + [ -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 nasid "$vif" nasid append "$var" "nas_identifier=$nasid" "$N" append "$var" "eapol_key_index_workaround=1" "$N" @@ -130,11 +140,23 @@ hostapd_set_bss_options() { config_get iapp_interface "$vif" iapp_interface config_get_bool wps_pbc "$vif" wps_pushbutton 0 - [ -n "$wps_possible" -a "$wps_pbc" -gt 0 ] && { + config_get_bool wps_label "$vif" wps_label 0 + + config_get config_methods "$vif" wps_config + [ "$wps_pbc" -gt 0 ] && append config_methods push_button + + [ -n "$wps_possible" -a -n "$config_methods" ] && { + 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" + 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" "device_type=$device_type" "$N" + append "$var" "device_name=$device_name" "$N" + append "$var" "manufacturer=$manufacturer" "$N" + append "$var" "config_methods=$config_methods" "$N" } append "$var" "ssid=$ssid" "$N"