-hostapd_add_rate() {
+wpa_supplicant_add_rate() {
local var="$1"
local val="$(($2 / 1000))"
local sub="$((($2 / 100) % 10))"
[ $sub -gt 0 ] && append $var "."
}
-hostapd_add_basic_rate() {
+hostapd_add_rate() {
local var="$1"
local val="$(($2 / 100))"
append $var "$val" " "
hostapd_common_add_device_config() {
config_add_array basic_rate
+ config_add_array supported_rates
config_add_string country
config_add_boolean country_ie doth
local brlist= br
json_get_values basic_rate_list basic_rate
for br in $basic_rate_list; do
- hostapd_add_basic_rate brlist "$br"
+ hostapd_add_rate brlist "$br"
done
case "$require_mode" in
g) brlist="60 120 240" ;;
n) append base_cfg "require_ht=1" "$N";;
ac) append base_cfg "require_vht=1" "$N";;
esac
+
+ local rlist= r
+ json_get_values rate_list supported_rates
+ for r in $rate_list; do
+ hostapd_add_rate rlist "$r"
+ done
+
+ [ -n "$rlist" ] && append base_cfg "supported_rates=$rlist" "$N"
[ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N"
[ -n "$beacon_int" ] && append base_cfg "beacon_int=$beacon_int" "$N"
hostapd_common_add_bss_config() {
config_add_string 'bssid:macaddr' 'ssid:string'
- config_add_boolean wds wmm hidden
+ config_add_boolean wds wmm uapsd hidden
config_add_int maxassoc max_inactivity
config_add_boolean disassoc_low_ack isolate short_preamble
config_add_string eap_type ca_cert client_cert identity auth priv_key priv_key_pwd
config_add_int dynamic_vlan vlan_naming
- config_add_string vlan_tagged_interface
+ config_add_string vlan_tagged_interface vlan_bridge
config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey'
+ config_add_string wpa_psk_file
+
config_add_boolean wps_pushbutton wps_label ext_registrar wps_pbc_in_m1
config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin
config_add_int mcast_rate
config_add_array basic_rate
+ config_add_array supported_rates
}
hostapd_set_bss_options() {
maxassoc max_inactivity disassoc_low_ack isolate auth_cache \
wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 \
wps_device_type wps_device_name wps_manufacturer wps_pin \
- macfilter ssid wmm hidden short_preamble rsn_preauth \
+ macfilter ssid wmm uapsd hidden short_preamble rsn_preauth \
iapp_interface
set_default isolate 0
set_default disassoc_low_ack 1
set_default hidden 0
set_default wmm 1
+ set_default uapsd 1
append bss_conf "ctrl_interface=/var/run/hostapd"
if [ "$isolate" -gt 0 ]; then
append bss_conf "preamble=$short_preamble" "$N"
append bss_conf "wmm_enabled=$wmm" "$N"
append bss_conf "ignore_broadcast_ssid=$hidden" "$N"
+ append bss_conf "uapsd_advertisement_enabled=$uapsd" "$N"
[ "$wpa" -gt 0 ] && {
[ -n "$wpa_group_rekey" ] && append bss_conf "wpa_group_rekey=$wpa_group_rekey" "$N"
wps_not_configured=1
;;
psk)
- json_get_vars key
+ json_get_vars key wpa_psk_file
if [ ${#key} -lt 8 ]; then
wireless_setup_vif_failed INVALID_WPA_PSK
return 1
else
append bss_conf "wpa_passphrase=$key" "$N"
fi
+ [ -n "$wpa_psk_file" ] && {
+ [ -e "$wpa_psk_file" ] || touch "$wpa_psk_file"
+ append bss_conf "wpa_psk_file=$wpa_psk_file" "$N"
+ }
wps_possible=1
;;
eap)
dae_client dae_secret dae_port \
nasid ownip \
eap_reauth_period dynamic_vlan \
- vlan_tagged_interface
+ vlan_naming vlan_tagged_interface \
+ vlan_bridge
# legacy compatibility
[ -n "$auth_server" ] || json_get_var auth_server server
[ -n "$dynamic_vlan" ] && {
append bss_conf "dynamic_vlan=$dynamic_vlan" "$N"
append bss_conf "vlan_naming=$vlan_naming" "$N"
+ [ -n "$vlan_bridge" ] && \
+ append bss_conf "vlan_bridge=$vlan_bridge" "$N"
[ -n "$vlan_tagged_interface" ] && \
append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
}
[ -n "$basic_rate" ] && {
local br rate_list=
for br in $basic_rate; do
- hostapd_add_rate rate_list "$br"
+ wpa_supplicant_add_rate rate_list "$br"
done
[ -n "$rate_list" ] && append network_data "rates=$rate_list" "$N$T"
}
[ -n "$mcast_rate" ] && {
local mc_rate=
- hostapd_add_rate mc_rate "$mcast_rate"
+ wpa_supplicant_add_rate mc_rate "$mcast_rate"
append network_data "mcast_rate=$mc_rate" "$N$T"
}