scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-31 02:17:58 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

mpskd: fix incorrect MPSK value assignment

Browse Source 
If MPSK is enabled on any interface, `ssid.mpsk` should be true.
Prevents overwriting true with a false value when multiple interfaces
share the same SSID.

Also allow handling of the 'reload' event even when MPSK is not enabled,
to ensure config reloads are not skipped, e.g. when configuration is empty.

Fixes: WIFI-14484

Signed-off-by: Marek Kwaczynski <marek@shasta.cloud>
This commit is contained in:
Marek Kwaczynski
2025-06-24 09:44:10 +02:00
committed by John Crispin
parent d5df71619a
commit 1213182012
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
feeds/ipq807x_v5.4/hostapd/files/mpskd
View File

@@ -144,7 +144,7 @@ function netifd_reload() {
push(ssid.interfaces, iface.ifname); push(ssid.interfaces, iface.ifname);
ssid.bands[band] = iface.ifname; ssid.bands[band] = iface.ifname;
ssid.mpsk = config.multi_psk; ssid.mpsk = ssid?.mpsk ? true : config.multi_psk;
for (let sta in iface.stations) { for (let sta in iface.stations) {
let stacfg = sta.config; let stacfg = sta.config;
@@ -308,18 +308,18 @@ function sta_auth_cache(ifname, addr, idx, phrase) {
function auth_cb(msg) { function auth_cb(msg) {
let data = msg.data; let data = msg.data;
if (!is_ssid_mpsk(data.iface))
return;
printf(`Event ${msg.type}: ${msg.data}\n`); printf(`Event ${msg.type}: ${msg.data}\n`);
switch (msg.type) { switch (msg.type) {
case 'sta_auth': case 'sta_auth':
if (!is_ssid_mpsk(data.iface))
return;
return { return {
psk: sta_auth_psk(data.iface, data.sta), psk: sta_auth_psk(data.iface, data.sta),
force_psk: true, force_psk: true,
}; };
case 'sta_connected': case 'sta_connected':
if (data.psk_idx == null) if (data.psk_idx == null || !is_ssid_mpsk(data.iface))
return; return;
return sta_auth_cache(data.iface, data.sta, data.psk_idx, data.psk); return sta_auth_cache(data.iface, data.sta, data.psk_idx, data.psk);
case 'reload': case 'reload':

10
feeds/qca-wifi-7/hostapd/files/mpskd
View File

@@ -144,7 +144,7 @@ function netifd_reload() {
push(ssid.interfaces, iface.ifname); push(ssid.interfaces, iface.ifname);
ssid.bands[band] = iface.ifname; ssid.bands[band] = iface.ifname;
ssid.mpsk = config.multi_psk; ssid.mpsk = ssid?.mpsk ? true : config.multi_psk;
for (let sta in iface.stations) { for (let sta in iface.stations) {
let stacfg = sta.config; let stacfg = sta.config;
@@ -308,18 +308,18 @@ function sta_auth_cache(ifname, addr, idx, phrase) {
function auth_cb(msg) { function auth_cb(msg) {
let data = msg.data; let data = msg.data;
if (!is_ssid_mpsk(data.iface))
return;
printf(`Event ${msg.type}: ${msg.data}\n`); printf(`Event ${msg.type}: ${msg.data}\n`);
switch (msg.type) { switch (msg.type) {
case 'sta_auth': case 'sta_auth':
if (!is_ssid_mpsk(data.iface))
return;
return { return {
psk: sta_auth_psk(data.iface, data.sta), psk: sta_auth_psk(data.iface, data.sta),
force_psk: true, force_psk: true,
}; };
case 'sta_connected': case 'sta_connected':
if (data.psk_idx == null) if (data.psk_idx == null || !is_ssid_mpsk(data.iface))
return; return;
return sta_auth_cache(data.iface, data.sta, data.psk_idx, data.psk); return sta_auth_cache(data.iface, data.sta, data.psk_idx, data.psk);
case 'reload': case 'reload':