hostapd: enable ht40 in wpa_supplicant when using wider HE modes

[openwrt/staging/chunkeey.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 5bc5f8497408fb8151ee6102d050de5d9b72cf9e..4f306317c733882fccc8c3bce5816dd34bf23034 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -91,14 +91,19 @@ hostapd_add_log_config() {
 hostapd_common_add_device_config() {
        config_add_array basic_rate
        config_add_array supported_rates
+       config_add_string beacon_rate
 
-       config_add_string country
+       config_add_string country country3
        config_add_boolean country_ie doth
        config_add_boolean spectrum_mgmt_required
        config_add_int local_pwr_constraint
        config_add_string require_mode
        config_add_boolean legacy_rates
        config_add_int cell_density
+       config_add_int rts_threshold
+       config_add_int rssi_reject_assoc_rssi
+       config_add_int rssi_ignore_probe_request
+       config_add_int maxassoc
 
        config_add_string acs_chan_bias
        config_add_array hostapd_options
@@ -114,8 +119,9 @@ hostapd_prepare_device_config() {
 
        local base_cfg=
 
-       json_get_vars country country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
-               acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density
+       json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
+               acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density \
+               rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc
 
        hostapd_set_log_options base_cfg
 
@@ -128,6 +134,7 @@ hostapd_prepare_device_config() {
 
        [ -n "$country" ] && {
                append base_cfg "country_code=$country" "$N"
+               [ -n "$country3" ] && append base_cfg "country3=$country3" "$N"
 
                [ "$country_ie" -gt 0 ] && {
                        append base_cfg "ieee80211d=1" "$N"
@@ -206,11 +213,16 @@ hostapd_prepare_device_config() {
                hostapd_add_rate brlist "$br"
        done
 
+       [ -n "$rssi_reject_assoc_rssi" ] && append base_cfg "rssi_reject_assoc_rssi=$rssi_reject_assoc_rssi" "$N"
+       [ -n "$rssi_ignore_probe_request" ] && append base_cfg "rssi_ignore_probe_request=$rssi_ignore_probe_request" "$N"
+       [ -n "$beacon_rate" ] && append base_cfg "beacon_rate=$beacon_rate" "$N"
        [ -n "$rlist" ] && append base_cfg "supported_rates=$rlist" "$N"
        [ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N"
        append base_cfg "beacon_int=$beacon_int" "$N"
+       [ -n "$rts_threshold" ] && append base_cfg "rts_threshold=$rts_threshold" "$N"
        append base_cfg "dtim_period=$dtim_period" "$N"
        [ "$airtime_mode" -gt 0 ] && append base_cfg "airtime_mode=$airtime_mode" "$N"
+       [ -n "$maxassoc" ] && append base_cfg "iface_max_num_sta=$maxassoc" "$N"
 
        json_get_values opts hostapd_options
        for val in $opts; do
@@ -251,6 +263,8 @@ hostapd_common_add_bss_config() {
        config_add_int acct_port
        config_add_int acct_interval
 
+       config_add_int bss_load_update_period chan_util_avg_period
+
        config_add_string dae_client
        config_add_string dae_secret
        config_add_int dae_port
@@ -281,9 +295,10 @@ hostapd_common_add_bss_config() {
        config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin
        config_add_string multi_ap_backhaul_ssid multi_ap_backhaul_key
 
-       config_add_boolean wnm_sleep_mode bss_transition
+       config_add_boolean wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition
        config_add_int time_advertisement
        config_add_string time_zone
+       config_add_string vendor_elements
 
        config_add_boolean ieee80211k rrm_neighbor_report rrm_beacon_report
 
@@ -308,6 +323,7 @@ hostapd_common_add_bss_config() {
        config_add_array supported_rates
 
        config_add_boolean sae_require_mfp
+       config_add_int sae_pwe
 
        config_add_string 'owe_transition_bssid:macaddr' 'owe_transition_ssid:string'
 
@@ -332,9 +348,17 @@ hostapd_common_add_bss_config() {
        config_add_array airtime_sta_weight
        config_add_int airtime_bss_weight airtime_bss_limit
 
-       config_add_boolean multicast_to_unicast per_sta_vif
+       config_add_boolean multicast_to_unicast proxy_arp per_sta_vif
 
        config_add_array hostapd_bss_options
+       config_add_boolean default_disabled
+
+       config_add_boolean request_cui
+       config_add_array radius_auth_req_attr
+       config_add_array radius_acct_req_attr
+
+       config_add_int eap_server
+       config_add_string eap_user_file ca_cert server_cert private_key private_key_passwd server_id
 }
 
 hostapd_set_vlan_file() {
@@ -471,6 +495,14 @@ append_hs20_conn_capab() {
        [ -n "$1" ] && append bss_conf "hs20_conn_capab=$1" "$N"
 }
 
+append_radius_acct_req_attr() {
+       [ -n "$1" ] && append bss_conf "radius_acct_req_attr=$1" "$N"
+}
+
+append_radius_auth_req_attr() {
+       [ -n "$1" ] && append bss_conf "radius_auth_req_attr=$1" "$N"
+}
+
 append_airtime_sta_weight() {
        [ -n "$1" ] && append bss_conf "airtime_sta_weight=$1" "$N"
 }
@@ -494,10 +526,12 @@ hostapd_set_bss_options() {
                macfilter ssid utf8_ssid wmm uapsd hidden short_preamble rsn_preauth \
                iapp_interface eapol_version dynamic_vlan ieee80211w nasid \
                acct_server acct_secret acct_port acct_interval \
-               bss_load_update_period chan_util_avg_period sae_require_mfp \
+               bss_load_update_period chan_util_avg_period sae_require_mfp sae_pwe \
                multi_ap multi_ap_backhaul_ssid multi_ap_backhaul_key skip_inactivity_poll \
                airtime_bss_weight airtime_bss_limit airtime_sta_weight \
-               multicast_to_unicast per_sta_vif
+               multicast_to_unicast proxy_arp per_sta_vif \
+               eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id \
+               vendor_elements
 
        set_default isolate 0
        set_default maxassoc 0
@@ -518,6 +552,7 @@ hostapd_set_bss_options() {
        set_default multi_ap 0
        set_default airtime_bss_weight 0
        set_default airtime_bss_limit 0
+       set_default eap_server 0
 
        append bss_conf "ctrl_interface=/var/run/hostapd"
        if [ "$isolate" -gt 0 ]; then
@@ -544,6 +579,7 @@ hostapd_set_bss_options() {
        append bss_conf "uapsd_advertisement_enabled=$uapsd" "$N"
        append bss_conf "utf8_ssid=$utf8_ssid" "$N"
        append bss_conf "multi_ap=$multi_ap" "$N"
+       [ -n "$vendor_elements" ] && append bss_conf "vendor_elements=$vendor_elements" "$N"
 
        [ "$tdls_prohibit" -gt 0 ] && append bss_conf "tdls_prohibit=$tdls_prohibit" "$N"
 
@@ -562,6 +598,7 @@ hostapd_set_bss_options() {
                        append bss_conf "acct_server_shared_secret=$acct_secret" "$N"
                [ -n "$acct_interval" ] && \
                        append bss_conf "radius_acct_interim_interval=$acct_interval" "$N"
+               json_for_each_item append_radius_acct_req_attr radius_acct_req_attr
        }
 
        case "$auth_type" in
@@ -575,6 +612,7 @@ hostapd_set_bss_options() {
                ;;
        esac
        [ -n "$sae_require_mfp" ] && append bss_conf "sae_require_mfp=$sae_require_mfp" "$N"
+       [ -n "$sae_pwe" ] && append bss_conf "sae_pwe=$sae_pwe" "$N"
 
        local vlan_possible=""
 
@@ -616,7 +654,7 @@ hostapd_set_bss_options() {
                                auth_server auth_secret auth_port \
                                dae_client dae_secret dae_port \
                                ownip radius_client_addr \
-                               eap_reauth_period
+                               eap_reauth_period request_cui
 
                        # radius can provide VLAN ID for clients
                        vlan_possible=1
@@ -628,18 +666,22 @@ hostapd_set_bss_options() {
 
                        set_default auth_port 1812
                        set_default dae_port 3799
+                       set_default request_cui 0
 
+                       [ "$eap_server" -eq 0 ] && {
+                               append bss_conf "auth_server_addr=$auth_server" "$N"
+                               append bss_conf "auth_server_port=$auth_port" "$N"
+                               append bss_conf "auth_server_shared_secret=$auth_secret" "$N"
+                       }
 
-                       append bss_conf "auth_server_addr=$auth_server" "$N"
-                       append bss_conf "auth_server_port=$auth_port" "$N"
-                       append bss_conf "auth_server_shared_secret=$auth_secret" "$N"
-
+                       [ "$request_cui" -gt 0 ] && append bss_conf "radius_request_cui=$request_cui" "$N"
                        [ -n "$eap_reauth_period" ] && append bss_conf "eap_reauth_period=$eap_reauth_period" "$N"
 
                        [ -n "$dae_client" -a -n "$dae_secret" ] && {
                                append bss_conf "radius_das_port=$dae_port" "$N"
                                append bss_conf "radius_das_client=$dae_client $dae_secret" "$N"
                        }
+                       json_for_each_item append_radius_auth_req_attr radius_auth_req_attr
 
                        [ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N"
                        [ -n "$radius_client_addr" ] && append bss_conf "radius_client_addr=$radius_client_addr" "$N"
@@ -712,19 +754,24 @@ hostapd_set_bss_options() {
 
        append bss_conf "ssid=$ssid" "$N"
        [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
+       [ -n "$network_ifname" ] && append bss_conf "snoop_iface=$network_ifname" "$N"
        [ -n "$iapp_interface" ] && {
                local ifname
                network_get_device ifname "$iapp_interface" || ifname="$iapp_interface"
                append bss_conf "iapp_interface=$ifname" "$N"
        }
 
-       json_get_vars time_advertisement time_zone wnm_sleep_mode bss_transition
+       json_get_vars time_advertisement time_zone wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition
        set_default bss_transition 0
        set_default wnm_sleep_mode 0
+       set_default wnm_sleep_mode_no_keys 0
 
        [ -n "$time_advertisement" ] && append bss_conf "time_advertisement=$time_advertisement" "$N"
        [ -n "$time_zone" ] && append bss_conf "time_zone=$time_zone" "$N"
-       [ "$wnm_sleep_mode" -eq "1" ] && append bss_conf "wnm_sleep_mode=1" "$N"
+       if [ "$wnm_sleep_mode" -eq "1" ]; then
+               append bss_conf "wnm_sleep_mode=1" "$N"
+               [ "$wnm_sleep_mode_no_keys" -eq "1" ] && append bss_conf "wnm_sleep_mode_no_keys=1" "$N"
+       fi
        [ "$bss_transition" -eq "1" ] && append bss_conf "bss_transition=1" "$N"
 
        json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report
@@ -772,6 +819,7 @@ hostapd_set_bss_options() {
                                ;;
                        esac
 
+                       [ -n "$network_ifname" ] && append bss_conf "ft_iface=$network_ifname" "$N"
                        append bss_conf "mobility_domain=$mobility_domain" "$N"
                        append bss_conf "ft_psk_generate_local=$ft_psk_generate_local" "$N"
                        append bss_conf "ft_over_ds=$ft_over_ds" "$N"
@@ -786,6 +834,13 @@ hostapd_set_bss_options() {
                                set_default r0_key_lifetime 10000
                                set_default pmk_r1_push 0
 
+                               [ -n "$r0kh" -a -n "$r1kh" ] || {
+                                       key=`echo -n "$mobility_domain/$auth_secret" | md5sum | awk '{print $1}'`
+
+                                       set_default r0kh "ff:ff:ff:ff:ff:ff,*,$key"
+                                       set_default r1kh "00:00:00:00:00:00,00:00:00:00:00:00,$key"
+                               }
+
                                [ -n "$r1_key_holder" ] && append bss_conf "r1_key_holder=$r1_key_holder" "$N"
                                append bss_conf "r0_key_lifetime=$r0_key_lifetime" "$N"
                                append bss_conf "pmk_r1_push=$pmk_r1_push" "$N"
@@ -969,10 +1024,24 @@ hostapd_set_bss_options() {
                json_for_each_item append_operator_icon operator_icon
        fi
 
+       if [ "$eap_server" = "1" ]; then
+               append bss_conf "eap_server=1" "$N"
+               [ -n "$eap_user_file" ] && append bss_conf "eap_user_file=$eap_user_file" "$N"
+               [ -n "$ca_cert" ] && append bss_conf "ca_cert=$ca_cert" "$N"
+               [ -n "$server_cert" ] && append bss_conf "server_cert=$server_cert" "$N"
+               [ -n "$private_key" ] && append bss_conf "private_key=$private_key" "$N"
+               [ -n "$private_key_passwd" ] && append bss_conf "private_key_passwd=$private_key_passwd" "$N"
+               [ -n "$server_id" ] && append bss_conf "server_id=$server_id" "$N"
+       fi
+
        set_default multicast_to_unicast 0
        if [ "$multicast_to_unicast" -gt 0 ]; then
                append bss_conf "multicast_to_unicast=$multicast_to_unicast" "$N"
        fi
+       set_default proxy_arp 0
+       if [ "$proxy_arp" -gt 0 ]; then
+               append bss_conf "proxy_arp=$proxy_arp" "$N"
+       fi
 
        set_default per_sta_vif 0
        if [ "$per_sta_vif" -gt 0 ]; then
@@ -1097,16 +1166,16 @@ wpa_supplicant_set_fixed_freq() {
        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";;
+               HE20|HT20|VHT20) append network_data "disable_ht40=1" "$N$T";;
+               HT40*|VHT40|VHT80|VHT160|HE40|HE80|HE160) 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";;
-               VHT20|VHT40) append network_data "max_oper_chwidth=0" "$N$T";;
+               HE80|VHT80) append network_data "max_oper_chwidth=1" "$N$T";;
+               HE160|VHT160) append network_data "max_oper_chwidth=2" "$N$T";;
+               HE20|HE40|VHT20|VHT40) append network_data "max_oper_chwidth=0" "$N$T";;
                *) append network_data "disable_vht=1" "$N$T";;
        esac
 }
@@ -1124,7 +1193,8 @@ wpa_supplicant_add_network() {
                ssid bssid key \
                basic_rate mcast_rate \
                ieee80211w ieee80211r \
-               multi_ap
+               multi_ap \
+               default_disabled
 
        case "$auth_type" in
                sae|owe|eap192|eap-eap192)
@@ -1137,6 +1207,7 @@ wpa_supplicant_add_network() {
 
        set_default ieee80211r 0
        set_default multi_ap 0
+       set_default default_disabled 0
 
        local key_mgmt='NONE'
        local network_data=
@@ -1168,7 +1239,10 @@ wpa_supplicant_add_network() {
                scan_ssid=""
        }
 
-       [ "$multi_ap" = 1 -a "$_w_mode" = "sta" ] && append network_data "multi_ap_backhaul_sta=1" "$N$T"
+       [ "$_w_mode" = "sta" ] && {
+               [ "$multi_ap" = 1 ] && append network_data "multi_ap_backhaul_sta=1" "$N$T"
+               [ "$default_disabled" = 1 ] && append network_data "disabled=1" "$N$T"
+       }
 
        case "$auth_type" in
                none) ;;