him411/wlan-ap-Telecominfraproject
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-12-17 09:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubus: fix uc_ubus_have_uloop for eloop+uloop combination

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2024-05-02 13:50:12 +02:00
parent ae9d1b64c3
commit 37b234800c
1 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
patches/0070-ubus-fix-uc_ubus_have_uloop-for-eloop-uloop-combinat.patch Normal file
View File

@ -0,0 +1,46 @@
From 2ce2214fff9bfe8ecf2a15ec6d513f1cc143110a Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Thu, 2 May 2024 12:36:49 +0200
Subject: [PATCH] ubus: fix uc_ubus_have_uloop for eloop+uloop combination
Signed-off-by: John Crispin <john@phrozen.org>
---
..._have_uloop-for-eloop-uloop-combinat.patch | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 package/utils/ucode/patches/100-ubus-fix-uc_ubus_have_uloop-for-eloop-uloop-combinat.patch
diff --git a/package/utils/ucode/patches/100-ubus-fix-uc_ubus_have_uloop-for-eloop-uloop-combinat.patch b/package/utils/ucode/patches/100-ubus-fix-uc_ubus_have_uloop-for-eloop-uloop-combinat.patch
new file mode 100644
index 0000000000..a1659be3c8
--- /dev/null
+++ b/package/utils/ucode/patches/100-ubus-fix-uc_ubus_have_uloop-for-eloop-uloop-combinat.patch
@@ -0,0 +1,26 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Wed, 1 May 2024 18:40:19 +0200
+Subject: [PATCH] ubus: fix uc_ubus_have_uloop for eloop+uloop combination
+
+When uloop has been integrated with eloop (in hostapd/wpa_supplicant),
+uloop_cancelling will return false, since uloop_run is not being called.
+This leads to ubus.defer() calling uloop_run in a context where it can
+prevent the other event loop from running.
+
+Fix this by detecting event loop integration via uloop_fd_set_cb being set
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/lib/ubus.c
++++ b/lib/ubus.c
+@@ -665,6 +665,9 @@ uc_ubus_have_uloop(void)
+ bool prev = uloop_cancelled;
+ bool active;
+
++ if (uloop_fd_set_cb)
++ return true;
++
+ uloop_cancelled = true;
+ active = uloop_cancelling();
+ uloop_cancelled = prev;
--
2.34.1