hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-12-16 09:32:09 -05:00
Code Issues Projects Releases Wiki Activity

hostapd: add wpa_supplicant ubus function guard exception handler

Browse Source 
Improves logging when something goes wrong

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2025-09-06 16:47:42 +02:00
parent 7aa6ea9cc1
commit 6834c19e41
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package/network/services/hostapd/files/wpa_supplicant.uc
View File

@ -4,6 +4,15 @@ import { wdev_create, wdev_set_mesh_params, wdev_remove, is_equal, wdev_set_up,
let ubus = libubus.connect(); let ubus = libubus.connect();
function ex_handler(e)
{
e = split(`${e}\n${e.stacktrace[0].context}`, '\n');
for (let line in e)
wpas.printf(line);
return libubus.STATUS_UNKNOWN_ERROR;
}
libubus.guard(ex_handler);
wpas.data.config = {}; wpas.data.config = {};
wpas.data.iface_phy = {}; wpas.data.iface_phy = {};
wpas.data.macaddr_list = {}; wpas.data.macaddr_list = {};
@ -143,17 +152,13 @@ let main_obj = {
if (!phy) if (!phy)
return libubus.STATUS_NOT_FOUND; return libubus.STATUS_NOT_FOUND;
try { if (req.args.stop) {
if (req.args.stop) { for (let ifname in phy.data)
for (let ifname in phy.data) iface_stop(phy.data[ifname]);
iface_stop(phy.data[ifname]); } else {
} else { start_pending(name);
start_pending(name);
}
} catch (e) {
wpas.printf(`Error chaging state: ${e}\n${e.stacktrace[0].context}`);
return libubus.STATUS_INVALID_ARGUMENT;
} }
return 0; return 0;
} }
}, },
@ -224,16 +229,11 @@ let main_obj = {
return libubus.STATUS_INVALID_ARGUMENT; return libubus.STATUS_INVALID_ARGUMENT;
wpas.printf(`Set new config for phy ${phy}`); wpas.printf(`Set new config for phy ${phy}`);
try { if (req.args.config)
if (req.args.config) set_config(phy, req.args.phy, req.args.radio, req.args.num_global_macaddr, req.args.macaddr_base, req.args.config);
set_config(phy, req.args.phy, req.args.radio, req.args.num_global_macaddr, req.args.macaddr_base, req.args.config);
if (!req.args.defer) if (!req.args.defer)
start_pending(phy); start_pending(phy);
} catch (e) {
wpas.printf(`Error loading config: ${e}\n${e.stacktrace[0].context}`);
return libubus.STATUS_INVALID_ARGUMENT;
}
return { return {
pid: wpas.getpid() pid: wpas.getpid()