mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2026-03-14 07:59:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

procd: update to Git HEAD (2025-08-12)
Some checks are pending
Build all core packages / Build all core packages for selected target (push) Waiting to run
Details

Browse source 
dafdf98b03bf service: fix object nesting in the ubus get_data call

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2025-08-12 17:36:16 +02:00
parent f9a8a3636c
commit 813002176f
2 changed files with 54 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
package/network/config/wifi-scripts/files/lib/netifd/wireless.uc
View file

@ -190,28 +190,30 @@ function config_init(uci)
},
});
for (let svcname, svc in udata) {
for (let typename, data in svc) {
for (let radio, config in data) {
if (type(config) != "object")
continue;
for (let insname, ins in svc) {
for (let typename, data in ins) {
for (let radio, config in data) {
if (type(config) != "object")
continue;
let dev = devices[radio];
if (dev) {
dev.config = { ...dev.config, ...config };
continue;
let dev = devices[radio];
if (dev) {
dev.config = { ...dev.config, ...config };
continue;
}
let handler = wireless.handlers[config.type];
if (!handler)
continue;
dev = devices[radio] = {
name,
config,
vif: [],
};
handlers[radio] = handler;
}
let handler = wireless.handlers[config.type];
if (!handler)
continue;
dev = devices[radio] = {
name,
config,
vif: [],
};
handlers[radio] = handler;
}
}
}
@ -226,35 +228,37 @@ function config_init(uci)
});
for (let svcname, svc in udata) {
for (let typename, data in svc) {
for (let radio, vifs in data) {
if (type(vifs) != "object")
continue;
for (let name, vif in vifs) {
let devs = vif.device;
if (type(devs) != "array")
devs = [ devs ];
let config = vif.config;
if (!config)
for (let insname, ins in svc) {
for (let typename, data in ins) {
for (let radio, vifs in data) {
if (type(vifs) != "object")
continue;
for (let device in devs) {
let dev = devices[device];
if (!dev)
continue;
let vif_data = {
name, device, config,
vlan: [],
sta: []
};
if (vif.vlans)
vif_data.vlans = vif.vlans;
if (vif.stations)
vif_data.sta = vif.stations;
vifs[name] ??= [];
push(vifs[name], vif_data);
push(dev.vif, vif_data);
for (let name, vif in vifs) {
let devs = vif.device;
if (type(devs) != "array")
devs = [ devs ];
let config = vif.config;
if (!config)
continue;
for (let device in devs) {
let dev = devices[device];
if (!dev)
continue;
let vif_data = {
name, device, config,
vlan: [],
sta: []
};
if (vif.vlans)
vif_data.vlans = vif.vlans;
if (vif.stations)
vif_data.sta = vif.stations;
vifs[name] ??= [];
push(vifs[name], vif_data);
push(dev.vif, vif_data);
}
}
}
}

6
package/system/procd/Makefile
View file

@ -12,9 +12,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
PKG_MIRROR_HASH:=6e40f4b526773166315cfccdab22d0d7d5cc18f2a968f3987268de46207b976b
PKG_SOURCE_DATE:=2025-08-07
PKG_SOURCE_VERSION:=46780098002167070c665f03f1a8ed76d1e1c55f
PKG_MIRROR_HASH:=cba150137cdab99ccb711d9f54eac475f94c02f9f68a1084e4a59cda1a4dd714
PKG_SOURCE_DATE:=2025-08-12
PKG_SOURCE_VERSION:=dafdf98b03bfa6014cd94ffc86de130b9deb17e4
CMAKE_INSTALL:=1
PKG_LICENSE:=GPL-2.0