CC: hostapd: add default value to eapol_version (#20641)

[15.05/openwrt.git] / package / network / services / hostapd / files / netifd.sh

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index 3a64689..21762e9 100644 (file)
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -120,6 +120,7 @@ hostapd_common_add_bss_config() {
 
        config_add_boolean rsn_preauth auth_cache
        config_add_int ieee80211w
+       config_add_int eapol_version
 
        config_add_string 'auth_server:host' 'server:host'
        config_add_string auth_secret
@@ -148,6 +149,11 @@ hostapd_common_add_bss_config() {
        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_boolean ieee80211r pmk_r1_push
+       config_add_int r0_key_lifetime reassociation_deadline
+       config_add_string mobility_domain r1_key_holder
+       config_add_array r0kh r1kh
+
        config_add_int ieee80211w_max_timeout ieee80211w_retry_timeout
 
        config_add_string macfilter 'macfile:file'
@@ -169,7 +175,7 @@ hostapd_set_bss_options() {
        wireless_vif_parse_encryption
 
        local bss_conf
-       local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey
+       local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wpa_key_mgmt
 
        json_get_vars \
                wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey \
@@ -177,7 +183,7 @@ hostapd_set_bss_options() {
                wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 \
                wps_device_type wps_device_name wps_manufacturer wps_pin \
                macfilter ssid wmm uapsd hidden short_preamble rsn_preauth \
-               iapp_interface
+               iapp_interface eapol_version
 
        set_default isolate 0
        set_default maxassoc 0
@@ -187,6 +193,7 @@ hostapd_set_bss_options() {
        set_default hidden 0
        set_default wmm 1
        set_default uapsd 1
+       set_default eapol_version 0
 
        append bss_conf "ctrl_interface=/var/run/hostapd"
        if [ "$isolate" -gt 0 ]; then
@@ -232,14 +239,17 @@ hostapd_set_bss_options() {
                                [ -e "$wpa_psk_file" ] || touch "$wpa_psk_file"
                                append bss_conf "wpa_psk_file=$wpa_psk_file" "$N"
                        }
+                       [ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
+
                        wps_possible=1
+                       append wpa_key_mgmt "WPA-PSK"
                ;;
                eap)
                        json_get_vars \
                                auth_server auth_secret auth_port \
                                acct_server acct_secret acct_port \
                                dae_client dae_secret dae_port \
-                               nasid ownip \
+                               ownip \
                                eap_reauth_period dynamic_vlan \
                                vlan_naming vlan_tagged_interface \
                                vlan_bridge
@@ -273,11 +283,10 @@ hostapd_set_bss_options() {
                                append bss_conf "radius_das_client=$dae_client $dae_secret" "$N"
                        }
 
-                       append bss_conf "nas_identifier=$nasid" "$N"
                        [ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N"
                        append bss_conf "eapol_key_index_workaround=1" "$N"
                        append bss_conf "ieee8021x=1" "$N"
-                       append bss_conf "wpa_key_mgmt=WPA-EAP" "$N"
+                       append wpa_key_mgmt "WPA-EAP"
 
                        [ -n "$dynamic_vlan" ] && {
                                append bss_conf "dynamic_vlan=$dynamic_vlan" "$N"
@@ -287,6 +296,8 @@ hostapd_set_bss_options() {
                                [ -n "$vlan_tagged_interface" ] && \
                                        append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
                        }
+
+                       [ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
                ;;
                wep)
                        local wep_keyidx=0
@@ -339,6 +350,43 @@ hostapd_set_bss_options() {
                [ -n "$iapp_interface" ] && append bss_conf "iapp_interface=$iapp_interface" "$N"
        }
 
+       if [ "$wpa" -ge "1" ]; then
+               json_get_vars nasid ieee80211r
+               set_default ieee80211r 0
+               [ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
+
+               if [ "$ieee80211r" -gt "0" ]; then
+                       json_get_vars mobility_domain r0_key_lifetime r1_key_holder \
+                       reassociation_deadline pmk_r1_push
+                       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
+
+                       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"
+                       append bss_conf "reassociation_deadline=$reassociation_deadline" "$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
+
+                       [ "$wpa_key_mgmt" != "${wpa_key_mgmt/EAP/}" ] && append wpa_key_mgmt "FT-EAP"
+                       [ "$wpa_key_mgmt" != "${wpa_key_mgmt/PSK/}" ] && append wpa_key_mgmt "FT-PSK"
+               fi
+
+               [ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N"
+       fi
+
        if [ "$wpa" -ge "2" ]; then
                if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then
                        set_default auth_cache 1
@@ -504,7 +552,7 @@ wpa_supplicant_add_network() {
        local T="       "
 
        local wpa_key_mgmt="WPA-PSK"
-       local scan_ssid="1"
+       local scan_ssid="scan_ssid=1"
        local freq
 
        [[ "$_w_mode" = "adhoc" ]] && {
@@ -515,12 +563,22 @@ wpa_supplicant_add_network() {
                        append network_data "frequency=$freq" "$N$T"
                }
 
-               scan_ssid=0
+               scan_ssid="scan_ssid=0"
 
                [ "$_w_driver" = "nl80211" ] || wpa_key_mgmt="WPA-NONE"
        }
 
-       [[ "$_w_mode" = adhoc ]] && append network_data "$_w_modestr" "$N$T"
+       [[ "$_w_mode" = "mesh" ]] && {
+               append network_data "mode=5" "$N$T"
+               [ -n "$channel" ] && {
+                       freq="$(get_freq "$phy" "$channel")"
+                       append network_data "frequency=$freq" "$N$T"
+               }
+               wpa_key_mgmt="SAE"
+               scan_ssid=""
+       }
+
+       [[ "$_w_mode" = "adhoc" -o "$_w_mode" = "mesh" ]] && append network_data "$_w_modestr" "$N$T"
 
        case "$auth_type" in
                none) ;;
@@ -564,21 +622,22 @@ wpa_supplicant_add_network() {
                ;;
        esac
 
-       case "$wpa" in
-               1)
-                       append network_data "proto=WPA" "$N$T"
-               ;;
-               2)
-                       append network_data "proto=RSN" "$N$T"
-               ;;
-       esac
-
-       case "$ieee80211w" in
-               [012])
-                       [ "$wpa" -ge 2 ] && append network_data "ieee80211w=$ieee80211w" "$N$T"
-               ;;
-       esac
+       [ "$mode" = mesh ] || {
+               case "$wpa" in
+                       1)
+                               append network_data "proto=WPA" "$N$T"
+                       ;;
+                       2)
+                               append network_data "proto=RSN" "$N$T"
+                       ;;
+               esac
 
+               case "$ieee80211w" in
+                       [012])
+                               [ "$wpa" -ge 2 ] && append network_data "ieee80211w=$ieee80211w" "$N$T"
+                       ;;
+               esac
+       }
        local beacon_int brates mrate
        [ -n "$bssid" ] && append network_data "bssid=$bssid" "$N$T"
        [ -n "$beacon_int" ] && append network_data "beacon_int=$beacon_int" "$N$T"
@@ -610,7 +669,7 @@ wpa_supplicant_add_network() {
 
        cat >> "$_config" <<EOF
 network={
-       scan_ssid=$scan_ssid
+       $scan_ssid
        ssid="$ssid"
        key_mgmt=$key_mgmt
        $network_data