DGNum/ubus
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libubus: fix deferring invoke processing for non-uloop usage

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2014-06-24 22:42:14 +02:00
parent bbd3fbc9cc
commit 3869e0ca07
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libubus-req.c
View file

@ -171,9 +171,13 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
if (req->complete_cb) if (req->complete_cb)
req->complete_cb(req, status); req->complete_cb(req, status);
if (!registered) if (!registered) {
uloop_fd_delete(&ctx->sock); uloop_fd_delete(&ctx->sock);
if (ctx->stack_depth)
ctx->pending_timer.cb(&ctx->pending_timer);
}
return status; return status;
} }

1
libubus.c
View file

@ -81,6 +81,7 @@ ubus_queue_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
memcpy(&pending->hdr, hdr, sizeof(*hdr) + blob_raw_len(ubus_msghdr_data(hdr))); memcpy(&pending->hdr, hdr, sizeof(*hdr) + blob_raw_len(ubus_msghdr_data(hdr)));
list_add(&pending->list, &ctx->pending); list_add(&pending->list, &ctx->pending);
if (ctx->sock.registered)
uloop_timeout_set(&ctx->pending_timer, 1); uloop_timeout_set(&ctx->pending_timer, 1);
} }