hostapd: add support for specifying device config options directly in uci

[openwrt/staging/lynxis.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 8e3f88a115f479497f07bade0298168e242d1e19..3766b7a7c92f46fb9a6db4b7aaf0dbb930eb451b 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -67,6 +67,7 @@ hostapd_common_add_device_config() {
        config_add_boolean legacy_rates
 
        config_add_string acs_chan_bias
+       config_add_array hostapd_options
 
        hostapd_add_log_config
 }
@@ -127,6 +128,11 @@ hostapd_prepare_device_config() {
        [ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N"
        append base_cfg "beacon_int=$beacon_int" "$N"
 
+       json_get_values opts hostapd_options
+       for val in $opts; do
+               append base_cfg "$val" "$N"
+       done
+
        cat > "$config" <<EOF
 driver=$driver
 $base_cfg
@@ -178,7 +184,7 @@ hostapd_common_add_bss_config() {
        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
+       config_add_boolean ieee80211r pmk_r1_push ft_psk_generate_local ft_over_ds
        config_add_int r0_key_lifetime reassociation_deadline
        config_add_string mobility_domain r1_key_holder
        config_add_array r0kh r1kh
@@ -372,7 +378,7 @@ hostapd_set_bss_options() {
        [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
        [ -n "$iapp_interface" ] && {
                local ifname
-               network_get_device ifname "$iapp_interface" || ifname = "$iapp_interface"
+               network_get_device ifname "$iapp_interface" || ifname="$iapp_interface"
                append bss_conf "iapp_interface=$ifname" "$N"
        }
 
@@ -382,7 +388,7 @@ hostapd_set_bss_options() {
 
                if [ "$ieee80211r" -gt "0" ]; then
                        json_get_vars mobility_domain r0_key_lifetime r1_key_holder \
-                       reassociation_deadline pmk_r1_push
+                               reassociation_deadline pmk_r1_push ft_psk_generate_local ft_over_ds
                        json_get_values r0kh r0kh
                        json_get_values r1kh r1kh
 
@@ -391,12 +397,16 @@ hostapd_set_bss_options() {
                        set_default r1_key_holder "00004f577274"
                        set_default reassociation_deadline 1000
                        set_default pmk_r1_push 0
+                       set_default ft_psk_generate_local 0
+                       set_default ft_over_ds 1
 
                        append bss_conf "mobility_domain=$mobility_domain" "$N"
                        append bss_conf "r0_key_lifetime=$r0_key_lifetime" "$N"
                        append bss_conf "r1_key_holder=$r1_key_holder" "$N"
                        append bss_conf "reassociation_deadline=$reassociation_deadline" "$N"
                        append bss_conf "pmk_r1_push=$pmk_r1_push" "$N"
+                       append bss_conf "ft_psk_generate_local=$ft_psk_generate_local" "$N"
+                       append bss_conf "ft_over_ds=$ft_over_ds" "$N"
 
                        for kh in $r0kh; do
                                append bss_conf "r0kh=${kh//,/ }" "$N"
@@ -627,7 +637,7 @@ wpa_supplicant_add_network() {
                scan_ssid=""
        }
 
-       [[ "$_w_mode" = "adhoc" -o "$_w_mode" = "mesh" ]] && append network_data "$_w_modestr" "$N$T"
+       [ "$_w_mode" = "adhoc" -o "$_w_mode" = "mesh" ] && append network_data "$_w_modestr" "$N$T"
 
        case "$auth_type" in
                none) ;;
@@ -758,7 +768,7 @@ wpa_supplicant_run() {
 
        _wpa_supplicant_common "$ifname"
 
-       /usr/sbin/wpa_supplicant -B \
+       /usr/sbin/wpa_supplicant -B -s \
                ${network_bridge:+-b $network_bridge} \
                -P "/var/run/wpa_supplicant-${ifname}.pid" \
                -D ${_w_driver:-wext} \