hostapd: add channel utilization as config option

[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 8217f8c2ab1db06835e70a7d24b6f3b97a2e9fc6..5065978f3c192520cec6747f551b0ec8c98b0b67 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -189,6 +189,10 @@ 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 ieee80211v wnm_sleep_mode bss_transition
+       config_add_int time_advertisement
+       config_add_string time_zone
+
        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
@@ -225,7 +229,8 @@ hostapd_set_bss_options() {
                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 dynamic_vlan ieee80211w nasid \
-               acct_server acct_secret acct_port acct_interval
+               acct_server acct_secret acct_port acct_interval \
+               bss_load_update_period chan_util_avg_period
 
        set_default isolate 0
        set_default maxassoc 0
@@ -239,7 +244,9 @@ hostapd_set_bss_options() {
        set_default tdls_prohibit 0
        set_default eapol_version 0
        set_default acct_port 1813
-
+       set_default bss_load_update_period 60
+       set_default chan_util_avg_period 600
+       
        append bss_conf "ctrl_interface=/var/run/hostapd"
        if [ "$isolate" -gt 0 ]; then
                append bss_conf "ap_isolate=$isolate" "$N"
@@ -251,6 +258,8 @@ hostapd_set_bss_options() {
                append bss_conf "ap_max_inactivity=$max_inactivity" "$N"
        fi
 
+       append bss_conf "bss_load_update_period=$bss_load_update_period" "$N"
+       append bss_conf "chan_util_avg_period=$chan_util_avg_period" "$N"
        append bss_conf "disassoc_low_ack=$disassoc_low_ack" "$N"
        append bss_conf "preamble=$short_preamble" "$N"
        append bss_conf "wmm_enabled=$wmm" "$N"
@@ -393,6 +402,21 @@ hostapd_set_bss_options() {
                append bss_conf "iapp_interface=$ifname" "$N"
        }
 
+       json_get_vars ieee80211v
+       set_default ieee80211v 0
+       if [ "$ieee80211v" -eq "1" ]; then
+               json_get_vars time_advertisement time_zone wnm_sleep_mode bss_transition
+
+               set_default time_advertisement 0
+               set_default wnm_sleep_mode 0
+               set_default bss_transition 0
+
+               append bss_conf "time_advertisement=$time_advertisement" "$N"
+               [ -n "$time_zone" ] && append bss_conf "time_zone=$time_zone" "$N"
+               append bss_conf "wnm_sleep_mode=$wnm_sleep_mode" "$N"
+               append bss_conf "bss_transition=$bss_transition" "$N"
+       fi
+
        if [ "$wpa" -ge "1" ]; then
                json_get_vars ieee80211r
                set_default ieee80211r 0
@@ -628,6 +652,7 @@ wpa_supplicant_add_network() {
        local ifname="$1"
        local freq="$2"
        local htmode="$3"
+       local noscan="$4"
 
        _wpa_supplicant_common "$1"
        wireless_vif_parse_encryption
@@ -657,11 +682,13 @@ wpa_supplicant_add_network() {
        }
 
        [[ "$_w_mode" = "mesh" ]] && {
-               json_get_vars mesh_id
+               json_get_vars mesh_id mesh_fwding
                ssid="${mesh_id}"
 
                append network_data "mode=5" "$N$T"
+               [ -n "$mesh_fwding" ] && append network_data "mesh_fwding=${mesh_fwding}" "$N$T"
                [ -n "$channel" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
+               [ "$noscan" = "1" ] && append network_data "noscan=1" "$N$T"
                append wpa_key_mgmt "SAE"
                scan_ssid=""
        }
@@ -687,7 +714,11 @@ wpa_supplicant_add_network() {
                        if [ ${#key} -eq 64 ]; then
                                passphrase="psk=${key}"
                        else
-                               passphrase="psk=\"${key}\""
+                               if [ "$_w_mode" = "mesh" ]; then
+                                       passphrase="sae_password=\"${key}\""
+                               else
+                                       passphrase="psk=\"${key}\""
+                               fi
                        fi
                        append network_data "$passphrase" "$N$T"
                ;;