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

ucode-mod-ubus: complete pending requests when disconnecting locally
Some checks are pending
Build all core packages / Build all core packages for selected target (push) Waiting to run
Details

Browse source 
libubus only completes pending requests when the socket receives EOF.
When explicitly disconnecting, we need to call ubus_flush_requests().

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2026-01-04 18:21:41 +00:00
parent bdc3c1a820
commit bf46d119a2
1 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
package/utils/ucode/patches/130-ubus-complete-pending-requests-when-disconnecting-lo.patch Normal file
View file

@ -0,0 +1,42 @@
From: Felix Fietkau <nbd@nbd.name>
Date: Sun, 4 Jan 2026 10:42:15 +0100
Subject: [PATCH] ubus: complete pending requests when disconnecting locally
libubus only completes pending requests when the socket receives EOF.
When explicitly disconnecting, we need to call ubus_flush_requests().
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,6 +198,7 @@ if(UBUS_SUPPORT)
try_compile(HAVE_NEW_UBUS_STATUS_CODES
${CMAKE_BINARY_DIR}
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test.c")
+ check_function_exists(ubus_flush_requests HAVE_UBUS_FLUSH_REQUESTS)
check_function_exists(uloop_timeout_remaining64 REMAINING64_FUNCTION_EXISTS)
check_function_exists(ubus_channel_connect HAVE_CHANNEL_SUPPORT)
file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test2.c" "
@@ -216,6 +217,9 @@ if(UBUS_SUPPORT)
if(HAVE_NEW_UBUS_STATUS_CODES)
add_definitions(-DHAVE_NEW_UBUS_STATUS_CODES)
endif()
+ if(HAVE_UBUS_FLUSH_REQUESTS)
+ add_definitions(-DHAVE_UBUS_FLUSH_REQUESTS)
+ endif()
if (HAVE_UBUS_NEW_OBJ_CB)
target_compile_definitions(ubus_lib PUBLIC HAVE_UBUS_NEW_OBJ_CB)
endif()
--- a/lib/ubus.c
+++ b/lib/ubus.c
@@ -2310,6 +2310,9 @@ uc_ubus_disconnect(uc_vm_t *vm, size_t n
conn_get(vm, &c);
+#ifdef HAVE_UBUS_FLUSH_REQUESTS
+ ubus_flush_requests(&c->ctx);
+#endif
ubus_shutdown(&c->ctx);
c->ctx.sock.fd = -1;
uc_ubus_put_res(&c->res);