aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services
diff options
context:
space:
mode:
authorSteven Honson <steven@honson.id.au>2016-12-27 16:16:23 +1100
committerJo-Philipp Wich <jo@mein.io>2017-02-01 15:40:20 +0100
commit2f9568ac2ac745c5c8e6a3712df74478e3f05884 (patch)
tree35b697edd758e30c94d9dceb2329d1017a838f50 /package/network/services
parentf9519636f545066f64b1ac9cf1efdb9170001219 (diff)
downloadupstream-2f9568ac2ac745c5c8e6a3712df74478e3f05884.tar.gz
upstream-2f9568ac2ac745c5c8e6a3712df74478e3f05884.tar.bz2
upstream-2f9568ac2ac745c5c8e6a3712df74478e3f05884.zip
hostapd: expose wps_independent and ap_setup_locked as uci options
ap_setup_locked is named wps_ap_setup_locked in uci for consistency with other wps related uci options. Signed-off-by: Steven Honson <steven@honson.id.au>
Diffstat (limited to 'package/network/services')
-rw-r--r--package/network/services/hostapd/files/netifd.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index 937825de11..dfe4100d81 100644
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -158,6 +158,7 @@ hostapd_common_add_bss_config() {
config_add_string wpa_psk_file
config_add_boolean wps_pushbutton wps_label ext_registrar wps_pbc_in_m1
+ config_add_int wps_ap_setup_locked wps_independent
config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin
config_add_boolean ieee80211r pmk_r1_push
@@ -191,8 +192,8 @@ hostapd_set_bss_options() {
json_get_vars \
wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey \
maxassoc max_inactivity disassoc_low_ack isolate auth_cache \
- wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 \
- wps_device_type wps_device_name wps_manufacturer wps_pin \
+ wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 wps_ap_setup_locked \
+ wps_independent wps_device_type wps_device_name wps_manufacturer wps_pin \
macfilter ssid wmm uapsd hidden short_preamble rsn_preauth \
iapp_interface eapol_version acct_server acct_secret acct_port \
dynamic_vlan ieee80211w
@@ -337,11 +338,12 @@ hostapd_set_bss_options() {
append bss_conf "eap_server=1" "$N"
[ -n "$wps_pin" ] && append bss_conf "ap_pin=$wps_pin" "$N"
append bss_conf "wps_state=$wps_state" "$N"
- append bss_conf "ap_setup_locked=0" "$N"
append bss_conf "device_type=$wps_device_type" "$N"
append bss_conf "device_name=$wps_device_name" "$N"
append bss_conf "manufacturer=$wps_manufacturer" "$N"
append bss_conf "config_methods=$config_methods" "$N"
+ [ -n "$wps_ap_setup_locked" ] && append bss_conf "ap_setup_locked=$wps_ap_setup_locked" "$N"
+ [ -n "$wps_independent" ] && append bss_conf "wps_independent=$wps_independent" "$N"
[ "$wps_pbc_in_m1" -gt 0 ] && append bss_conf "pbc_in_m1=$wps_pbc_in_m1" "$N"
}