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>

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 91a90447bd0f606fe2b5c2845e1d5c62a2c04f86..c959adcdd0cc49aab11bfb2d8cf137ee5f1da73f 100644 (file)
--- 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'
                ]);
        }