hostapd: allow reduced neighbor report configuration
[openwrt/staging/neocturne.git] / package / network / services / hostapd / files / hostapd.sh
index b4aa5e4c853bb749b294d9447a80abe7557a3945..88dfe25091f9b6553326003a039f6c7caa163fb6 100644 (file)
@@ -24,12 +24,12 @@ hostapd_append_wep_key() {
                [1234])
                        for idx in 1 2 3 4; do
                                local zidx
-                               zidx=$(($idx - 1))
+                               zidx="$(($idx - 1))"
                                json_get_var ckey "key${idx}"
                                [ -n "$ckey" ] && \
                                        append $var "wep_key${zidx}=$(prepare_key_wep "$ckey")" "$N$T"
                        done
-                       wep_keyidx=$((key - 1))
+                       wep_keyidx="$((key - 1))"
                ;;
                *)
                        append $var "wep_key0=$(prepare_key_wep "$key")" "$N$T"
@@ -48,12 +48,15 @@ hostapd_append_wpa_key_mgmt() {
                ;;
                eap192)
                        append wpa_key_mgmt "WPA-EAP-SUITE-B-192"
-                       [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP"
+                       [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP-SHA384"
                ;;
                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"
+                       [ "${ieee80211r:-0}" -gt 0 ] && {
+                               append wpa_key_mgmt "FT-EAP-SHA384"
+                               append wpa_key_mgmt "FT-EAP"
+                       }
                        [ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-EAP-SHA256"
                ;;
                sae)
@@ -72,6 +75,15 @@ hostapd_append_wpa_key_mgmt() {
                ;;
        esac
 
+       [ "$fils" -gt 0 ] && {
+               case "$auth_type" in
+                       eap*)
+                               append wpa_key_mgmt FILS-SHA256
+                               [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt FT-FILS-SHA256
+                       ;;
+               esac
+       }
+
        [ "$auth_osen" = "1" ] && append wpa_key_mgmt "OSEN"
 }
 
@@ -109,6 +121,7 @@ hostapd_common_add_device_config() {
        config_add_array hostapd_options
 
        config_add_int airtime_mode
+       config_add_int mbssid
 
        hostapd_add_log_config
 }
@@ -119,9 +132,10 @@ hostapd_prepare_device_config() {
 
        local base_cfg=
 
-       json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
+       json_get_vars country country3 country_ie beacon_int:100 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
+               rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc \
+               mbssid:0
 
        hostapd_set_log_options base_cfg
 
@@ -220,9 +234,9 @@ hostapd_prepare_device_config() {
        [ -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"
+       [ "$mbssid" -gt 0 ] && [ "$mbssid" -le 2 ] && append base_cfg "mbssid=$mbssid" "$N"
 
        json_get_values opts hostapd_options
        for val in $opts; do
@@ -237,7 +251,7 @@ EOF
 
 hostapd_common_add_bss_config() {
        config_add_string 'bssid:macaddr' 'ssid:string'
-       config_add_boolean wds wmm uapsd hidden utf8_ssid
+       config_add_boolean wds wmm uapsd hidden utf8_ssid ppsk
 
        config_add_int maxassoc max_inactivity
        config_add_boolean disassoc_low_ack isolate short_preamble skip_inactivity_poll
@@ -254,11 +268,11 @@ hostapd_common_add_bss_config() {
        config_add_int ieee80211w
        config_add_int eapol_version
 
-       config_add_string 'auth_server:host' 'server:host'
+       config_add_array auth_server acct_server
+       config_add_string 'server:host'
        config_add_string auth_secret key
        config_add_int 'auth_port:port' 'port:port'
 
-       config_add_string acct_server
        config_add_string acct_secret
        config_add_int acct_port
        config_add_int acct_interval
@@ -295,7 +309,7 @@ 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 wnm_sleep_mode_no_keys bss_transition
+       config_add_boolean wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition mbo
        config_add_int time_advertisement
        config_add_string time_zone
        config_add_string vendor_elements
@@ -326,6 +340,7 @@ hostapd_common_add_bss_config() {
        config_add_int sae_pwe
 
        config_add_string 'owe_transition_bssid:macaddr' 'owe_transition_ssid:string'
+       config_add_string owe_transition_ifname
 
        config_add_boolean iw_enabled iw_internet iw_asra iw_esr iw_uesa
        config_add_int iw_access_network_type iw_venue_group iw_venue_type
@@ -348,7 +363,7 @@ 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 proxy_arp per_sta_vif
+       config_add_boolean multicast_to_unicast multicast_to_unicast_all proxy_arp per_sta_vif
 
        config_add_array hostapd_bss_options
        config_add_boolean default_disabled
@@ -359,6 +374,11 @@ hostapd_common_add_bss_config() {
 
        config_add_int eap_server
        config_add_string eap_user_file ca_cert server_cert private_key private_key_passwd server_id
+
+       config_add_boolean fils
+       config_add_string fils_dhcp
+
+       config_add_int ocv
 }
 
 hostapd_set_vlan_file() {
@@ -507,6 +527,20 @@ append_airtime_sta_weight() {
        [ -n "$1" ] && append bss_conf "airtime_sta_weight=$1" "$N"
 }
 
+append_auth_server() {
+       [ -n "$1" ] || return
+       append bss_conf "auth_server_addr=$1" "$N"
+       append bss_conf "auth_server_port=$auth_port" "$N"
+       [ -n "$auth_secret" ] && append bss_conf "auth_server_shared_secret=$auth_secret" "$N"
+}
+
+append_acct_server() {
+       [ -n "$1" ] || return
+       append bss_conf "acct_server_addr=$1" "$N"
+       append bss_conf "acct_server_port=$acct_port" "$N"
+       [ -n "$acct_secret" ] && append bss_conf "acct_server_shared_secret=$acct_secret" "$N"
+}
+
 hostapd_set_bss_options() {
        local var="$1"
        local phy="$2"
@@ -514,7 +548,7 @@ hostapd_set_bss_options() {
 
        wireless_vif_parse_encryption
 
-       local bss_conf bss_md5sum
+       local bss_conf bss_md5sum ft_key
        local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wpa_key_mgmt
 
        json_get_vars \
@@ -525,14 +559,15 @@ hostapd_set_bss_options() {
                wps_independent wps_device_type wps_device_name wps_manufacturer wps_pin \
                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 \
+               acct_secret acct_port acct_interval \
                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 proxy_arp per_sta_vif \
+               ppsk airtime_bss_weight airtime_bss_limit airtime_sta_weight \
+               multicast_to_unicast_all proxy_arp per_sta_vif \
                eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id \
-               vendor_elements
+               vendor_elements fils ocv
 
+       set_default fils 0
        set_default isolate 0
        set_default maxassoc 0
        set_default max_inactivity 0
@@ -550,10 +585,13 @@ hostapd_set_bss_options() {
        set_default chan_util_avg_period 600
        set_default utf8_ssid 1
        set_default multi_ap 0
+       set_default ppsk 0
        set_default airtime_bss_weight 0
        set_default airtime_bss_limit 0
        set_default eap_server 0
 
+       /usr/sbin/hostapd -vfils || fils=0
+
        append bss_conf "ctrl_interface=/var/run/hostapd"
        if [ "$isolate" -gt 0 ]; then
                append bss_conf "ap_isolate=$isolate" "$N"
@@ -590,25 +628,26 @@ hostapd_set_bss_options() {
                [ -n "$wpa_strict_rekey" ] && append bss_conf "wpa_strict_rekey=$wpa_strict_rekey" "$N"
        }
 
-       [ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
-       [ -n "$acct_server" ] && {
-               append bss_conf "acct_server_addr=$acct_server" "$N"
-               append bss_conf "acct_server_port=$acct_port" "$N"
-               [ -n "$acct_secret" ] && \
-                       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
-       }
+       set_default nasid "${macaddr//\:}"
+       append bss_conf "nas_identifier=$nasid" "$N"
+
+       [ -n "$acct_interval" ] && \
+               append bss_conf "radius_acct_interim_interval=$acct_interval" "$N"
+       json_for_each_item append_acct_server acct_server
+       json_for_each_item append_radius_acct_req_attr radius_acct_req_attr
+
+       [ -n "$ocv" ] && append bss_conf "ocv=$ocv" "$N"
 
        case "$auth_type" in
                sae|owe|eap192|eap-eap192)
                        set_default ieee80211w 2
                        set_default sae_require_mfp 1
+                       set_default sae_pwe 2
                ;;
                psk-sae)
                        set_default ieee80211w 1
                        set_default sae_require_mfp 1
+                       set_default sae_pwe 2
                ;;
        esac
        [ -n "$sae_require_mfp" ] && append bss_conf "sae_require_mfp=$sae_require_mfp" "$N"
@@ -618,10 +657,11 @@ hostapd_set_bss_options() {
 
        case "$auth_type" in
                none|owe)
-                       json_get_vars owe_transition_bssid owe_transition_ssid
+                       json_get_vars owe_transition_bssid owe_transition_ssid owe_transition_ifname
 
                        [ -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"
+                       [ -n "$owe_transition_ifname" ] && append bss_conf "owe_transition_ifname=$owe_transition_ifname" "$N"
 
                        wps_possible=1
                        # Here we make the assumption that if we're in open mode
@@ -630,7 +670,13 @@ hostapd_set_bss_options() {
                ;;
                psk|sae|psk-sae)
                        json_get_vars key wpa_psk_file
-                       if [ ${#key} -eq 64 ]; then
+                       if [ "$auth_type" = "psk" ] && [ "$ppsk" -ne 0 ] ; then
+                               json_get_vars auth_secret auth_port
+                               set_default auth_port 1812
+                               json_for_each_item append_auth_server auth_server
+                               append bss_conf "macaddr_acl=2" "$N"
+                               append bss_conf "wpa_psk_radius=2" "$N"
+                       elif [ ${#key} -eq 64 ]; then
                                append bss_conf "wpa_psk=$key" "$N"
                        elif [ ${#key} -ge 8 ] && [ ${#key} -le 63 ]; then
                                append bss_conf "wpa_passphrase=$key" "$N"
@@ -653,27 +699,50 @@ hostapd_set_bss_options() {
                        json_get_vars \
                                auth_server auth_secret auth_port \
                                dae_client dae_secret dae_port \
-                               ownip radius_client_addr \
-                               eap_reauth_period request_cui
+                               dynamic_ownip ownip radius_client_addr \
+                               eap_reauth_period request_cui \
+                               erp_domain mobility_domain \
+                               fils_realm fils_dhcp
 
                        # radius can provide VLAN ID for clients
                        vlan_possible=1
 
+                       set_default dynamic_ownip 1
+
                        # legacy compatibility
                        [ -n "$auth_server" ] || json_get_var auth_server server
                        [ -n "$auth_port" ] || json_get_var auth_port port
                        [ -n "$auth_secret" ] || json_get_var auth_secret key
 
+                       [ "$fils" -gt 0 ] && {
+                               set_default erp_domain "$mobility_domain"
+                               set_default erp_domain "$(echo "$ssid" | md5sum | head -c 8)"
+                               set_default fils_realm "$erp_domain"
+
+                               append bss_conf "erp_send_reauth_start=1" "$N"
+                               append bss_conf "erp_domain=$erp_domain" "$N"
+                               append bss_conf "fils_realm=$fils_realm" "$N"
+                               append bss_conf "fils_cache_id=$(echo "$fils_realm" | md5sum | head -c 4)" "$N"
+
+                               [ "$fils_dhcp" = "*" ] && {
+                                       json_get_values network network
+                                       fils_dhcp=
+                                       for net in $network; do
+                                               fils_dhcp="$(ifstatus "$net" | jsonfilter -e '@.data.dhcpserver')"
+                                               [ -n "$fils_dhcp" ] && break
+                                       done
+
+                                       [ -z "$fils_dhcp" -a -n "$network_bridge" -a -n "$network_ifname" ] && \
+                                               fils_dhcp="$(udhcpc -B -n -q -s /lib/netifd/dhcp-get-server.sh -t 1 -i "$network_ifname" 2>/dev/null)"
+                               }
+                               [ -n "$fils_dhcp" ] && append bss_conf "dhcp_server=$fils_dhcp" "$N"
+                       }
+
                        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"
-                       }
-
+                       [ "$eap_server" -eq 0 ] && json_for_each_item append_auth_server auth_server
                        [ "$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"
 
@@ -683,7 +752,12 @@ hostapd_set_bss_options() {
                        }
                        json_for_each_item append_radius_auth_req_attr radius_auth_req_attr
 
-                       [ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N"
+                       if [ -n "$ownip" ]; then
+                               append bss_conf "own_ip_addr=$ownip" "$N"
+                       elif [ "$dynamic_ownip" -gt 0 ]; then
+                               append bss_conf "dynamic_own_ip_addr=$dynamic_ownip" "$N"
+                       fi
+
                        [ -n "$radius_client_addr" ] && append bss_conf "radius_client_addr=$radius_client_addr" "$N"
                        append bss_conf "eapol_key_index_workaround=1" "$N"
                        append bss_conf "ieee8021x=1" "$N"
@@ -699,7 +773,24 @@ hostapd_set_bss_options() {
                ;;
        esac
 
-       local auth_algs=$((($auth_mode_shared << 1) | $auth_mode_open))
+       case "$auth_type" in
+               none|owe|psk|sae|psk-sae|wep)
+                       json_get_vars \
+                       auth_server auth_port auth_secret \
+                       ownip radius_client_addr
+
+                       [ -n "$auth_server" ] &&  {
+                               set_default auth_port 1812
+
+                               json_for_each_item append_auth_server auth_server
+                               [ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N"
+                               [ -n "$radius_client_addr" ] && append bss_conf "radius_client_addr=$radius_client_addr" "$N"
+                               append bss_conf "macaddr_acl=2" "$N"
+                       }
+               ;;
+       esac
+
+       local auth_algs="$((($auth_mode_shared << 1) | $auth_mode_open))"
        append bss_conf "auth_algs=${auth_algs:-1}" "$N"
        append bss_conf "wpa=$wpa" "$N"
        [ -n "$wpa_pairwise" ] && append bss_conf "wpa_pairwise=$wpa_pairwise" "$N"
@@ -761,10 +852,11 @@ hostapd_set_bss_options() {
                append bss_conf "iapp_interface=$ifname" "$N"
        }
 
-       json_get_vars time_advertisement time_zone wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition
+       json_get_vars time_advertisement time_zone wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition mbo
        set_default bss_transition 0
        set_default wnm_sleep_mode 0
        set_default wnm_sleep_mode_no_keys 0
+       set_default mbo 0
 
        [ -n "$time_advertisement" ] && append bss_conf "time_advertisement=$time_advertisement" "$N"
        [ -n "$time_zone" ] && append bss_conf "time_zone=$time_zone" "$N"
@@ -773,9 +865,11 @@ hostapd_set_bss_options() {
                [ "$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"
+       [ "$mbo" -eq 1 ] && append bss_conf "mbo=1" "$N"
 
-       json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report
+       json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report rnr
        set_default ieee80211k 0
+       set_default rnr 0
        if [ "$ieee80211k" -eq "1" ]; then
                set_default rrm_neighbor_report 1
                set_default rrm_beacon_report 1
@@ -786,6 +880,7 @@ hostapd_set_bss_options() {
 
        [ "$rrm_neighbor_report" -eq "1" ] && append bss_conf "rrm_neighbor_report=1" "$N"
        [ "$rrm_beacon_report" -eq "1" ] && append bss_conf "rrm_beacon_report=1" "$N"
+       [ "$rnr" -eq "1" ] && append bss_conf "rnr=1" "$N"
 
        json_get_vars ftm_responder stationary_ap lci civic
        set_default ftm_responder 0
@@ -807,7 +902,7 @@ hostapd_set_bss_options() {
                        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_over_ds 1
+                       set_default ft_over_ds 0
                        set_default reassociation_deadline 1000
 
                        case "$auth_type" in
@@ -824,7 +919,6 @@ hostapd_set_bss_options() {
                        append bss_conf "ft_psk_generate_local=$ft_psk_generate_local" "$N"
                        append bss_conf "ft_over_ds=$ft_over_ds" "$N"
                        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
@@ -835,10 +929,10 @@ hostapd_set_bss_options() {
                                set_default pmk_r1_push 0
 
                                [ -n "$r0kh" -a -n "$r1kh" ] || {
-                                       key=`echo -n "$mobility_domain/$auth_secret" | md5sum | awk '{print $1}'`
+                                       ft_key=`echo -n "$mobility_domain/${auth_secret:-${key}}" | 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"
+                                       set_default r0kh "ff:ff:ff:ff:ff:ff,*,$ft_key"
+                                       set_default r1kh "00:00:00:00:00:00,00:00:00:00:00:00,$ft_key"
                                }
 
                                [ -n "$r1_key_holder" ] && append bss_conf "r1_key_holder=$r1_key_holder" "$N"
@@ -853,6 +947,10 @@ hostapd_set_bss_options() {
                                done
                        fi
                fi
+               if [ "$fils" -gt 0 ]; then
+                       json_get_vars fils_realm
+                       set_default fils_realm "$(echo "$ssid" | md5sum | head -c 8)"
+               fi
 
                append bss_conf "wpa_disable_eapol_key_retries=$wpa_disable_eapol_key_retries" "$N"
 
@@ -877,7 +975,7 @@ hostapd_set_bss_options() {
                fi
 
                append bss_conf "okc=$auth_cache" "$N"
-               [ "$auth_cache" = 0 ] && append bss_conf "disable_pmksa_caching=1" "$N"
+               [ "$auth_cache" = 0 -a "$fils" = 0 ] && append bss_conf "disable_pmksa_caching=1" "$N"
 
                # RSN -> allow management frame protection
                case "$ieee80211w" in
@@ -885,7 +983,11 @@ hostapd_set_bss_options() {
                                json_get_vars ieee80211w_mgmt_cipher ieee80211w_max_timeout ieee80211w_retry_timeout
                                append bss_conf "ieee80211w=$ieee80211w" "$N"
                                [ "$ieee80211w" -gt "0" ] && {
-                                       append bss_conf "group_mgmt_cipher=${ieee80211w_mgmt_cipher:-AES-128-CMAC}" "$N"
+                                       if [ "$auth_type" = "eap192" ]; then
+                                               append bss_conf "group_mgmt_cipher=BIP-GMAC-256" "$N"
+                                       else
+                                               append bss_conf "group_mgmt_cipher=${ieee80211w_mgmt_cipher:-AES-128-CMAC}" "$N"
+                                       fi
                                        [ -n "$ieee80211w_max_timeout" ] && \
                                                append bss_conf "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
                                        [ -n "$ieee80211w_retry_timeout" ] && \
@@ -1031,6 +1133,7 @@ hostapd_set_bss_options() {
 
        if [ "$eap_server" = "1" ]; then
                append bss_conf "eap_server=1" "$N"
+               append bss_conf "eap_server_erp=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"
@@ -1039,9 +1142,9 @@ hostapd_set_bss_options() {
                [ -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"
+       set_default multicast_to_unicast_all 0
+       if [ "$multicast_to_unicast_all" -gt 0 ]; then
+               append bss_conf "multicast_to_unicast=$multicast_to_unicast_all" "$N"
        fi
        set_default proxy_arp 0
        if [ "$proxy_arp" -gt 0 ]; then
@@ -1058,9 +1161,6 @@ hostapd_set_bss_options() {
                append bss_conf "$val" "$N"
        done
 
-       bss_md5sum=$(echo $bss_conf | md5sum | cut -d" " -f1)
-       append bss_conf "config_id=$bss_md5sum" "$N"
-
        append "$var" "$bss_conf" "$N"
        return 0
 }
@@ -1080,7 +1180,7 @@ hostapd_set_log_options() {
        set_default log_iapp   1
        set_default log_mlme   1
 
-       local log_mask=$(( \
+       local log_mask="$(( \
                ($log_80211  << 0) | \
                ($log_8021x  << 1) | \
                ($log_radius << 2) | \
@@ -1088,7 +1188,7 @@ hostapd_set_log_options() {
                ($log_driver << 4) | \
                ($log_iapp   << 5) | \
                ($log_mlme   << 6)   \
-       ))
+       ))"
 
        append "$var" "logger_syslog=$log_mask" "$N"
        append "$var" "logger_syslog_level=$log_level" "$N"
@@ -1197,7 +1297,7 @@ wpa_supplicant_add_network() {
        json_get_vars \
                ssid bssid key \
                basic_rate mcast_rate \
-               ieee80211w ieee80211r \
+               ieee80211w ieee80211r fils ocv \
                multi_ap \
                default_disabled
 
@@ -1232,7 +1332,7 @@ wpa_supplicant_add_network() {
        }
 
        [ "$_w_mode" = "mesh" ] && {
-               json_get_vars mesh_id mesh_fwding mesh_rssi_threshold
+               json_get_vars mesh_id mesh_fwding mesh_rssi_threshold encryption
                [ -n "$mesh_id" ] && ssid="${mesh_id}"
 
                append network_data "mode=5" "$N$T"
@@ -1240,7 +1340,7 @@ wpa_supplicant_add_network() {
                [ -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"
+               [ "$encryption" = "none" -o -z "$encryption" ] || append wpa_key_mgmt "SAE"
                scan_ssid=""
        }
 
@@ -1249,6 +1349,8 @@ wpa_supplicant_add_network() {
                [ "$default_disabled" = 1 ] && append network_data "disabled=1" "$N$T"
        }
 
+       [ -n "$ocv" ] && append network_data "ocv=$ocv" "$N$T"
+
        case "$auth_type" in
                none) ;;
                owe)
@@ -1272,11 +1374,11 @@ wpa_supplicant_add_network() {
 
                        key_mgmt="$wpa_key_mgmt"
 
-                       if [ ${#key} -eq 64 ]; then
-                               passphrase="psk=${key}"
+                       if [ "$_w_mode" = "mesh" ] || [ "$auth_type" = "sae" ]; then
+                               passphrase="sae_password=\"${key}\""
                        else
-                               if [ "$_w_mode" = "mesh" ]; then
-                                       passphrase="sae_password=\"${key}\""
+                               if [ ${#key} -eq 64 ]; then
+                                       passphrase="psk=${key}"
                                else
                                        passphrase="psk=\"${key}\""
                                fi
@@ -1289,6 +1391,7 @@ wpa_supplicant_add_network() {
 
                        json_get_vars eap_type identity anonymous_identity ca_cert ca_cert_usesystem
 
+                       [ "$fils" -gt 0 ] && append network_data "erp=1" "$N$T"
                        if [ "$ca_cert_usesystem" -eq "1" -a -f "/etc/ssl/certs/ca-certificates.crt" ]; then
                                append network_data "ca_cert=\"/etc/ssl/certs/ca-certificates.crt\"" "$N$T"
                        else
@@ -1487,29 +1590,6 @@ EOF
        return 0
 }
 
-wpa_supplicant_run() {
-       local ifname="$1"
-       local hostapd_ctrl="$2"
-
-       _wpa_supplicant_common "$ifname"
-
-       ubus wait_for wpa_supplicant
-       local supplicant_res="$(ubus call wpa_supplicant config_add "{ \
-               \"driver\": \"${_w_driver:-wext}\", \"ctrl\": \"$_rpath\", \
-               \"iface\": \"$ifname\", \"config\": \"$_config\" \
-               ${network_bridge:+, \"bridge\": \"$network_bridge\"} \
-               ${hostapd_ctrl:+, \"hostapd_ctrl\": \"$hostapd_ctrl\"} \
-               }")"
-
-       ret="$?"
-
-       [ "$ret" != 0 -o -z "$supplicant_res" ] && wireless_setup_vif_failed WPA_SUPPLICANT_FAILED
-
-       wireless_add_process "$(jsonfilter -s "$supplicant_res" -l 1 -e @.pid)" "/usr/sbin/wpa_supplicant" 1 1
-
-       return $ret
-}
-
 hostapd_common_cleanup() {
        killall meshd-nl80211
 }