rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge Ubus with the 2016.02.26 version.

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-02-26 23:57:13 +01:00
parent 7eac5c920a
commit 5ed9eb9715
23 changed files with 1282 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
3P/ubus/libubus-req.c
View File

@@ -160,6 +160,10 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
ubus_poll_data(ctx, (unsigned int) timeout);
uloop_cancelled = cancelled;
if (ctx->sock.eof) {
ubus_set_req_status(req, UBUS_STATUS_CONNECTION_FAILED);
break;
}
}
ctx->stack_depth--;
if (ctx->stack_depth)
@@ -175,7 +179,7 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
if (!registered) {
uloop_fd_delete(&ctx->sock);
if (ctx->stack_depth)
if (!ctx->stack_depth)
ctx->pending_timer.cb(&ctx->pending_timer);
}
@@ -466,3 +470,9 @@ void __hidden ubus_process_req_msg(struct ubus_context *ctx, struct ubus_msghdr_
break;
}
}
int __ubus_monitor(struct ubus_context *ctx, const char *type)
{
blob_buf_init(&b, 0);
return ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_MONITOR, type, b.head, NULL, NULL, 1000);
}