openwrt-mirror/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2025-12-21 19:14:34 +04:00
Code Issues Packages Projects Releases Wiki Activity

rpcd-mod-luci: properly deal with failing ubus requests

Browse Source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich
2019-11-03 19:53:05 +01:00
parent eb808d0e9f
commit af88f9a006
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/rpcd-mod-luci/Makefile
View File

@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=rpcd-mod-luci PKG_NAME:=rpcd-mod-luci
PKG_VERSION:=20191102 PKG_VERSION:=20191103
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0

5
libs/rpcd-mod-luci/src/luci.c
View File

@@ -83,6 +83,8 @@ invoke_data_cb(struct ubus_request *req, int type, struct blob_attr *msg)
if (ictx->cb != NULL) if (ictx->cb != NULL)
ictx->cb(req, type, msg); ictx->cb(req, type, msg);
ictx->cb = NULL;
} }
static void static void
@@ -91,6 +93,9 @@ invoke_done_cb(struct ubus_request *req, int ret)
struct invoke_context *ictx = struct invoke_context *ictx =
container_of(req, struct invoke_context, request); container_of(req, struct invoke_context, request);
if (ictx->cb != NULL)
ictx->cb(req, -1, NULL);
uloop_timeout_cancel(&ictx->timeout); uloop_timeout_cancel(&ictx->timeout);
free(ictx); free(ictx);
} }