hostapd: mesh: make forwarding configurable

[openwrt/openwrt.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 334694abfa4442fb842c199ba99fdc5c0f19f2a1..c3640689da60fb3bcaa4e7ce67b99b5f117b6690 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -676,10 +676,11 @@ wpa_supplicant_add_network() {
        }
 
        [[ "$_w_mode" = "mesh" ]] && {
        }
 
        [[ "$_w_mode" = "mesh" ]] && {

-               json_get_vars mesh_id
+               json_get_vars mesh_id mesh_fwding

                ssid="${mesh_id}"
 
                append network_data "mode=5" "$N$T"
                ssid="${mesh_id}"
 
                append network_data "mode=5" "$N$T"

+               [ -n "$mesh_fwding" ] && append network_data "mesh_fwding=${mesh_fwding}" "$N$T"

                [ -n "$channel" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
                append wpa_key_mgmt "SAE"
                scan_ssid=""
                [ -n "$channel" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode"
                append wpa_key_mgmt "SAE"
                scan_ssid=""


@@ -706,7 +707,11 @@ wpa_supplicant_add_network() {
                        if [ ${#key} -eq 64 ]; then
                                passphrase="psk=${key}"
                        else
                        if [ ${#key} -eq 64 ]; then
                                passphrase="psk=${key}"
                        else

-                               passphrase="psk=\"${key}\""
+                               if [ "$_w_mode" = "mesh" ]; then
+                                       passphrase="sae_password=\"${key}\""
+                               else
+                                       passphrase="psk=\"${key}\""
+                               fi

                        fi
                        append network_data "$passphrase" "$N$T"
                ;;
                        fi
                        append network_data "$passphrase" "$N$T"
                ;;