summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau2024-12-05 13:17:32 +0000
committerFelix Fietkau2024-12-05 14:08:23 +0000
commit1aa2695620891afe718ed38930a7a8305871b86c (patch)
tree8e60d17a6f008075183807adf029ec69419b1969
parentb4cc5743d90103a0536b07c618f21bfd5685fbe2 (diff)
downloadopenwrt-1aa2695620891afe718ed38930a7a8305871b86c.tar.gz
wifi-scripts: fix roaming setup with ucode scripts
- fix variable references for ft key - add r0kh and r1kh if ft_generate_local is not set (logic inversion bug) Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
index 37864487c3..8db3fc34b3 100644
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
@@ -334,15 +334,15 @@ function iface_roaming(config) {
set_default(config, 'ft_psk_generate_local', config.auth_type == 'psk');
set_default(config, 'ft_iface', config.network_ifname);
- if (config.ft_psk_generate_local) {
+ if (!config.ft_psk_generate_local) {
if (!config.r0kh || !config.r1kh) {
if (!config.auth_secret && !config.key)
netifd.setup_failed('FT_KEY_CANT_BE_DERIVED');
- let ft_key = md5(`${mobility_domain}/${auth_secret ?? key}`);
+ let ft_key = md5(`${config.mobility_domain}/${config.auth_secret ?? config.key}`);
- set_default(config, 'r0kh', 'ff:ff:ff:ff:ff:ff,*,' + ft_key);
- set_default(config, 'r1kh', '00:00:00:00:00:00,00:00:00:00:00:00,' + ft_key);
+ set_default(config, 'r0kh', 'ff:ff:ff:ff:ff:ff * ' + ft_key);
+ set_default(config, 'r1kh', '00:00:00:00:00:00 00:00:00:00:00:00 ' + ft_key);
}
append_vars(config, [