}
hostapd_append_wpa_key_mgmt() {
- local auth_type="$(echo $auth_type | tr 'a-z' 'A-Z')"
+ local auth_type_l="$(echo $auth_type | tr 'a-z' 'A-Z')"
- append wpa_key_mgmt "WPA-$auth_type"
- [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-${auth_type}"
- [ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-${auth_type}-SHA256"
+ case "$auth_type" in
+ psk|eap)
+ append wpa_key_mgmt "WPA-$auth_type_l"
+ [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-${auth_type_l}"
+ [ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-${auth_type_l}-SHA256"
+ ;;
+ eap192)
+ append wpa_key_mgmt "WPA-EAP-SUITE-B-192"
+ ;;
+ eap-eap192)
+ append wpa_key_mgmt "WPA-EAP-SUITE-B-192"
+ append wpa_key_mgmt "WPA-EAP"
+ [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP"
+ [ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-EAP-SHA256"
+ ;;
+ sae)
+ append wpa_key_mgmt "SAE"
+ [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-SAE"
+ ;;
+ psk-sae)
+ append wpa_key_mgmt "WPA-PSK"
+ [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-PSK"
+ [ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-PSK-SHA256"
+ append wpa_key_mgmt "SAE"
+ [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-SAE"
+ ;;
+ owe)
+ append wpa_key_mgmt "OWE"
+ ;;
+ esac
}
hostapd_add_log_config() {
config_add_int mcast_rate
config_add_array basic_rate
config_add_array supported_rates
+
+ config_add_boolean sae_require_mfp
+
+ config_add_string 'owe_transition_bssid:macaddr' 'owe_transition_ssid:string'
}
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 sae_require_mfp
set_default isolate 0
set_default maxassoc 0
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"
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"
append bss_conf "radius_acct_interim_interval=$acct_interval" "$N"
}
+ case "$auth_type" in
+ sae|owe|eap192|eap-eap192)
+ set_default ieee80211w 2
+ set_default sae_require_mfp 1
+ ;;
+ psk-sae)
+ set_default ieee80211w 1
+ set_default sae_require_mfp 1
+ ;;
+ esac
+ [ -n "$sae_require_mfp" ] && append bss_conf "sae_require_mfp=$sae_require_mfp" "$N"
+
local vlan_possible=""
case "$auth_type" in
- none)
+ none|owe)
+ json_get_vars owe_transition_bssid owe_transition_ssid
+
+ [ -n "$owe_transition_ssid" ] && append bss_conf "owe_transition_ssid=\"$owe_transition_ssid\"" "$N"
+ [ -n "$owe_transition_bssid" ] && append bss_conf "owe_transition_bssid=$owe_transition_bssid" "$N"
+
wps_possible=1
# Here we make the assumption that if we're in open mode
# with WPS enabled, we got to be in unconfigured state.
wps_not_configured=1
;;
- psk)
+ psk|sae|psk-sae)
json_get_vars key wpa_psk_file
if [ ${#key} -lt 8 ]; then
wireless_setup_vif_failed INVALID_WPA_PSK
wps_possible=1
;;
- eap)
+ eap|eap192|eap-eap192)
json_get_vars \
auth_server auth_secret auth_port \
dae_client dae_secret dae_port \
set_default ieee80211r 0
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 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 reassociation_deadline 1000
- set_default pmk_r1_push 0
- set_default ft_psk_generate_local 0
+ json_get_vars mobility_domain ft_psk_generate_local ft_over_ds reassociation_deadline
+
+ set_default mobility_domain "$(echo "$ssid" | md5sum | head -c 4)"
+ set_default ft_psk_generate_local 1
set_default ft_over_ds 1
+ set_default reassociation_deadline 1000
append bss_conf "mobility_domain=$mobility_domain" "$N"
- append bss_conf "r0_key_lifetime=$r0_key_lifetime" "$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"
- done
- for kh in $r1kh; do
- append bss_conf "r1kh=${kh//,/ }" "$N"
- done
+ append bss_conf "reassociation_deadline=$reassociation_deadline" "$N"
+ [ -n "$nasid" ] || append bss_conf "nas_identifier=${macaddr//\:}" "$N"
+
+ if [ "$ft_psk_generate_local" -eq "0" ]; then
+ json_get_vars r0_key_lifetime r1_key_holder pmk_r1_push
+ json_get_values r0kh r0kh
+ json_get_values r1kh r1kh
+
+ set_default r0_key_lifetime 10000
+ set_default pmk_r1_push 0
+
+ [ -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"
+
+ for kh in $r0kh; do
+ append bss_conf "r0kh=${kh//,/ }" "$N"
+ done
+ for kh in $r1kh; do
+ append bss_conf "r1kh=${kh//,/ }" "$N"
+ done
+ fi
fi
append bss_conf "wpa_disable_eapol_key_retries=$wpa_disable_eapol_key_retries" "$N"
local ifname="$1"
local freq="$2"
local htmode="$3"
+ local noscan="$4"
_wpa_supplicant_common "$1"
wireless_vif_parse_encryption
[[ "$_w_mode" = "adhoc" ]] && {
append network_data "mode=1" "$N$T"
- [ -n "$channel" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
+ [ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
scan_ssid="scan_ssid=0"
}
[[ "$_w_mode" = "mesh" ]] && {
- json_get_vars mesh_id
- ssid="${mesh_id}"
+ json_get_vars mesh_id mesh_fwding mesh_rssi_threshold
+ [ -n "$mesh_id" ] && ssid="${mesh_id}"
append network_data "mode=5" "$N$T"
- [ -n "$channel" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
+ [ -n "$mesh_fwding" ] && append network_data "mesh_fwding=${mesh_fwding}" "$N$T"
+ [ -n "$mesh_rssi_threshold" ] && append network_data "mesh_rssi_threshold=${mesh_rssi_threshold}" "$N$T"
+ [ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
+ [ "$noscan" = "1" ] && append network_data "noscan=1" "$N$T"
append wpa_key_mgmt "SAE"
scan_ssid=""
}
case "$auth_type" in
none) ;;
+ owe)
+ hostapd_append_wpa_key_mgmt
+ ;;
wep)
local wep_keyidx=0
hostapd_append_wep_key network_data
append network_data "wep_tx_keyidx=$wep_keyidx" "$N$T"
;;
- psk)
+ psk|sae|psk-sae)
local passphrase
if [ "$_w_mode" != "mesh" ]; then
fi
append network_data "$passphrase" "$N$T"
;;
- eap)
+ eap|eap192|eap-eap192)
hostapd_append_wpa_key_mgmt
key_mgmt="$wpa_key_mgmt"
projects / openwrt / openwrt.git / blobdiff