From 2146f5c31fcdd414620e8b4c6db05d8368019d90 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Old=C5=99ich=20Jedli=C4=8Dka?= Date: Tue, 29 Jul 2025 10:10:58 +0200 Subject: [PATCH] wifi-scripts: ucode: set default wildcard mac for wifi-station MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When creating the PSK file, the old script sets `mac` to `00:00:00:00:00:00` when `mac` is not specified (see [here][1]), creating hostapd configuration lines like: vlanid=10 00:00:00:00:00:00 MyStrongPassword That matches any MAC address (a wildcard). The `ucode` script alternative misses the default, so set it. [1]: https://github.com/openwrt/openwrt/blob/9c26d144893c25e484ca97c7a3f58cdec6767465/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh#L428 Signed-off-by: Oldřich Jedlička Signed-off-by: Felix Fietkau --- .../wifi-scripts/files-ucode/lib/netifd/wireless/mac80211.sh | 2 ++ .../files-ucode/usr/share/schema/wireless.wifi-station.json | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/network/config/wifi-scripts/files-ucode/lib/netifd/wireless/mac80211.sh b/package/network/config/wifi-scripts/files-ucode/lib/netifd/wireless/mac80211.sh index e5d756d988..584a1423d3 100755 --- a/package/network/config/wifi-scripts/files-ucode/lib/netifd/wireless/mac80211.sh +++ b/package/network/config/wifi-scripts/files-ucode/lib/netifd/wireless/mac80211.sh @@ -233,6 +233,8 @@ function setup() { case 'link': case 'ap': has_ap = true; + for (let _, sta in v.stas) + validate('station', sta.config); // fallthrough case 'sta': case 'adhoc': diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-station.json b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-station.json index dbad47abf4..527c63c068 100644 --- a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-station.json +++ b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-station.json @@ -6,7 +6,8 @@ "properties": { "mac": { "description": "The stations MAC", - "type": "string" + "type": "string", + "default": "00:00:00:00:00:00" }, "key": { "description": "The passphrase that shall be used", -- 2.30.2