summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau2025-09-25 11:02:39 +0000
committerFelix Fietkau2025-09-25 11:03:41 +0000
commit0da0a6c449f965f12a18ca701cefac6b9bf67051 (patch)
treebefa42a80f0847e7b1ea4b4e6db154676879e964
parentadb1ce158ac80b69f86b55a86d42b3b5ead7bc5d (diff)
downloadopenwrt-0da0a6c449f965f12a18ca701cefac6b9bf67051.tar.gz
wifi-scripts: ucode: fix r0kh/r1kh parsing
The option is an array, and for each entry there should be one generated line in hostapd.conf. Commas also need to be replaced with whitespace Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc10
1 files changed, 7 insertions, 3 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 91a90447bd..c959adcdd0 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
@@ -340,12 +340,16 @@ function iface_roaming(config) {
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 ]);
}
+ for (let name in [ 'r0kh', 'r1kh' ])
+ for (let val in config[name])
+ append(name, join(' ', split(val, ',', 3)));
+
append_vars(config, [
- 'r0kh', 'r1kh', 'r1_key_holder', 'r0_key_lifetime', 'pmk_r1_push'
+ 'r1_key_holder', 'r0_key_lifetime', 'pmk_r1_push'
]);
}