maple/prplos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpcd: backport ucode fix

Browse Source 
ucode: adjust for new ext resource type
ucv_resource_dataptr always returns null for resources with embedded data.

Fixes: https://github.com/openwrt/rpcd/issues/17
Fixes: https://github.com/openwrt/luci/issues/7878
Fixes: https://github.com/openwrt/openwrt/issues/19726
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit b2116dbce4976ee9596d90964a4f145440b1c51e)
This commit is contained in:
Felix Fietkau 2025-08-09 16:01:33 +02:00 committed by Hela Saadani
parent 890e31b6e7
commit cc07ae4e06
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/system/rpcd/patches/100-ucode-adjust-for-new-ext-resource-type.patch Normal file
View File

@ -0,0 +1,20 @@
From: Felix Fietkau <nbd@nbd.name>
Date: Sat, 9 Aug 2025 15:55:11 +0200
Subject: [PATCH] ucode: adjust for new ext resource type
ucv_resource_dataptr always returns null for resources with embedded data.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
--- a/ucode.c
+++ b/ucode.c
@@ -449,7 +449,7 @@ rpc_ucode_script_call(struct ubus_contex
res = uc_vm_stack_pop(&script->vm);
/* The handler function invoked a nested aync ubus request and returned it */
- if (ucv_resource_dataptr(res, "ubus.deferred")) {
+ if (ucv_resource_data(res, "ubus.deferred")) {
/* Install guard timer in case the reply callback is never called */
callctx->timeout.cb = rpc_ucode_request_timeout;
uloop_timeout_set(&callctx->timeout, request_timeout);