hostapd: add wpa_disable_eapol_key_retries option

[openwrt/openwrt.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 2c015f9c4b28705ef68e2c825dac46b616859544..16925d58a234bb04b5c8e22c72b762c0afd7fe9d 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
@@ -143,6 +149,7 @@ hostapd_common_add_bss_config() {
        config_add_int \
                wep_rekey eap_reauth_period \
                wpa_group_rekey wpa_pair_rekey wpa_master_rekey
+       config_add_boolean wpa_disable_eapol_key_retries
 
        config_add_boolean rsn_preauth auth_cache
        config_add_int ieee80211w
@@ -155,6 +162,7 @@ hostapd_common_add_bss_config() {
        config_add_string acct_server
        config_add_string acct_secret
        config_add_int acct_port
+       config_add_int acct_interval
 
        config_add_string dae_client
        config_add_string dae_secret
@@ -177,7 +185,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
@@ -207,12 +215,13 @@ hostapd_set_bss_options() {
 
        json_get_vars \
                wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey \
+               wpa_disable_eapol_key_retries \
                maxassoc max_inactivity disassoc_low_ack isolate auth_cache \
                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
+               iapp_interface eapol_version dynamic_vlan ieee80211w nasid \
+               acct_server acct_secret acct_port acct_interval
 
        set_default isolate 0
        set_default maxassoc 0
@@ -222,6 +231,7 @@ hostapd_set_bss_options() {
        set_default hidden 0
        set_default wmm 1
        set_default uapsd 1
+       set_default wpa_disable_eapol_key_retries 0
        set_default eapol_version 0
        set_default acct_port 1813
 
@@ -248,11 +258,14 @@ hostapd_set_bss_options() {
                [ -n "$wpa_master_rekey" ] && append bss_conf "wpa_gmk_rekey=$wpa_master_rekey"  "$N"
        }
 
+       [ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
        [ -n "$acct_server" ] && {
                append bss_conf "acct_server_addr=$acct_server" "$N"
                append bss_conf "acct_server_port=$acct_port" "$N"
                [ -n "$acct_secret" ] && \
                        append bss_conf "acct_server_shared_secret=$acct_secret" "$N"
+               [ -n "$acct_interval" ] && \
+                       append bss_conf "radius_acct_interim_interval=$acct_interval" "$N"
        }
 
        local vlan_possible=""
@@ -368,18 +381,17 @@ 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"
        }
 
        if [ "$wpa" -ge "1" ]; then
-               json_get_vars nasid ieee80211r
+               json_get_vars ieee80211r
                set_default ieee80211r 0
-               [ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
 
                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
 
@@ -388,12 +400,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"
@@ -403,6 +419,8 @@ hostapd_set_bss_options() {
                        done
                fi
 
+               append bss_conf "wpa_disable_eapol_key_retries=$wpa_disable_eapol_key_retries" "$N"
+
                hostapd_append_wpa_key_mgmt
                [ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N"
        fi
@@ -624,7 +642,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) ;;
@@ -755,7 +773,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} \