hostapd: don't set htmode for wpa_supplicant

[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 e92cbc5d1a1c738165db0f1e9318f67740478cea..f4f8b8e6cad490c3edec3a2166dfa914a4f0fcfe 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
@@ -178,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 ft_psk_generate_local
+       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
@@ -208,6 +215,7 @@ 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 \
@@ -223,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
 
@@ -382,23 +391,24 @@ 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 ft_psk_generate_local
+                               reassociation_deadline pmk_r1_push ft_psk_generate_local ft_over_ds
                        json_get_values r0kh r0kh
                        json_get_values r1kh r1kh
 
                        set_default mobility_domain "4f57"
                        set_default r0_key_lifetime 10000
-                       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"
+                       [ -n "$r1_key_holder" ] && 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"
@@ -408,6 +418,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
@@ -582,8 +594,31 @@ EOF
        return 0
 }
 
+wpa_supplicant_set_fixed_freq() {
+       local freq="$1"
+       local htmode="$2"
+
+       append network_data "fixed_freq=1" "$N$T"
+       append network_data "frequency=$freq" "$N$T"
+       case "$htmode" in
+               NOHT) append network_data "disable_ht=1" "$N$T";;
+               HT20|VHT20) append network_data "disable_ht40=1" "$N$T";;
+               HT40*|VHT40*|VHT80*|VHT160*) append network_data "ht40=1" "$N$T";;
+       esac
+       case "$htmode" in
+               VHT*) append network_data "vht=1" "$N$T";;
+       esac
+       case "$htmode" in
+               VHT80) append network_data "max_oper_chwidth=1" "$N$T";;
+               VHT160) append network_data "max_oper_chwidth=2" "$N$T";;
+               *) append network_data "max_oper_chwidth=0" "$N$T";;
+       esac
+}
+
 wpa_supplicant_add_network() {
        local ifname="$1"
+       local freq="$2"
+       local htmode="$3"
 
        _wpa_supplicant_common "$1"
        wireless_vif_parse_encryption
@@ -605,11 +640,7 @@ wpa_supplicant_add_network() {
 
        [[ "$_w_mode" = "adhoc" ]] && {
                append network_data "mode=1" "$N$T"
-               [ -n "$channel" ] && {
-                       freq="$(get_freq "$phy" "$channel")"
-                       append network_data "fixed_freq=1" "$N$T"
-                       append network_data "frequency=$freq" "$N$T"
-               }
+               [ -n "$channel" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
 
                scan_ssid="scan_ssid=0"
 
@@ -621,10 +652,7 @@ wpa_supplicant_add_network() {
                ssid="${mesh_id}"
 
                append network_data "mode=5" "$N$T"
-               [ -n "$channel" ] && {
-                       freq="$(get_freq "$phy" "$channel")"
-                       append network_data "frequency=$freq" "$N$T"
-               }
+               [ -n "$channel" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
                append wpa_key_mgmt "SAE"
                scan_ssid=""
        }
@@ -718,6 +746,7 @@ wpa_supplicant_add_network() {
                esac
        }
        [ -n "$bssid" ] && append network_data "bssid=$bssid" "$N$T"
+       [ -n "$beacon_int" ] && append network_data "beacon_int=$beacon_int" "$N$T"
 
        local bssid_blacklist bssid_whitelist
        json_get_values bssid_blacklist bssid_blacklist
@@ -741,8 +770,6 @@ wpa_supplicant_add_network() {
        }
 
        local ht_str
-       [[ "$_w_mode" = adhoc ]] || ibss_htmode=
-       [ -n "$ibss_htmode" ] && append network_data "htmode=$ibss_htmode" "$N$T"
 
        cat >> "$_config" <<EOF
 network={
@@ -760,7 +787,7 @@ wpa_supplicant_run() {
 
        _wpa_supplicant_common "$ifname"
 
-       /usr/sbin/wpa_supplicant -B -s \
+       /usr/sbin/wpa_supplicant -B \
                ${network_bridge:+-b $network_bridge} \
                -P "/var/run/wpa_supplicant-${ifname}.pid" \
                -D ${_w_driver:-wext} \