summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau2025-08-12 15:36:16 +0000
committerFelix Fietkau2025-08-12 16:14:44 +0000
commit813002176fe0483f80deeb8dd23a4bcf42a3d1d3 (patch)
treee29512f5a9d3f0c1f8f794a5e429e34d08a033a5
parentf9a8a3636c0079d01bcd2ea2458929c2f33a6458 (diff)
downloadopenwrt-813002176fe0483f80deeb8dd23a4bcf42a3d1d3.tar.gz
procd: update to Git HEAD (2025-08-12)
dafdf98b03bf service: fix object nesting in the ubus get_data call Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/network/config/wifi-scripts/files/lib/netifd/wireless.uc96
-rw-r--r--package/system/procd/Makefile6
2 files changed, 53 insertions, 49 deletions
diff --git a/package/network/config/wifi-scripts/files/lib/netifd/wireless.uc b/package/network/config/wifi-scripts/files/lib/netifd/wireless.uc
index 956ca54413..f0dc762e19 100644
--- a/package/network/config/wifi-scripts/files/lib/netifd/wireless.uc
+++ b/package/network/config/wifi-scripts/files/lib/netifd/wireless.uc
@@ -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;
-
- let dev = devices[radio];
- if (dev) {
- dev.config = { ...dev.config, ...config };
- 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 handler = wireless.handlers[config.type];
- if (!handler)
- continue;
+ let dev = devices[radio];
+ if (dev) {
+ dev.config = { ...dev.config, ...config };
+ continue;
+ }
- dev = devices[radio] = {
- name,
- config,
+ let handler = wireless.handlers[config.type];
+ if (!handler)
+ continue;
- vif: [],
- };
- handlers[radio] = handler;
+ 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);
+ }
}
}
}
diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 0ede26c37f..1b32c5cea3 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -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