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

Bump ubus to version: 2017.01.22

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2017-03-18 22:34:23 +01:00
parent c7e78c250e
commit c84c0d8f9f
19 changed files with 141 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/3P/ubus/libubus-req.c
View File

@@ -49,10 +49,9 @@ static void __ubus_process_req_data(struct ubus_request *req)
}
}
int __hidden ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
int __hidden __ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
struct blob_attr *msg, int cmd, uint32_t peer)
{
memset(req, 0, sizeof(*req));
if (msg && blob_pad_len(msg) > UBUS_MAX_MSGLEN)
return -1;
@@ -62,9 +61,21 @@ int __hidden ubus_start_request(struct ubus_context *ctx, struct ubus_request *r
req->ctx = ctx;
req->peer = peer;
req->seq = ++ctx->request_seq;
return ubus_send_msg(ctx, req->seq, msg, cmd, peer, -1);
return ubus_send_msg(ctx, req->seq, msg, cmd, peer, req->fd);
}
int __hidden ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
struct blob_attr *msg, int cmd, uint32_t peer)
{
memset(req, 0, sizeof(*req));
req->fd = -1;
return __ubus_start_request(ctx, req, msg, cmd, peer);
}
void ubus_abort_request(struct ubus_context *ctx, struct ubus_request *req)
{
if (list_empty(&req->list))
@@ -129,15 +140,9 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
int req_timeout)
{
ubus_complete_handler_t complete_cb = req->complete_cb;
bool registered = ctx->sock.registered;
int status = UBUS_STATUS_NO_DATA;
int64_t timeout = 0, time_end = 0;
if (!registered) {
uloop_init();
ubus_add_uloop(ctx);
}
if (req_timeout)
time_end = get_time_msec() + req_timeout;
@@ -176,12 +181,8 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
if (req->complete_cb)
req->complete_cb(req, status);
if (!registered) {
uloop_fd_delete(&ctx->sock);
if (!ctx->stack_depth)
ctx->pending_timer.cb(&ctx->pending_timer);
}
if (!ctx->stack_depth && !ctx->sock.registered)
ctx->pending_timer.cb(&ctx->pending_timer);
return status;
}
@@ -209,8 +210,9 @@ int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req,
return 0;
}
int ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method,
struct blob_attr *msg, struct ubus_request *req)
int ubus_invoke_async_fd(struct ubus_context *ctx, uint32_t obj,
const char *method, struct blob_attr *msg,
struct ubus_request *req, int fd)
{
blob_buf_init(&b, 0);
blob_put_int32(&b, UBUS_ATTR_OBJID, obj);
@@ -218,20 +220,21 @@ int ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method
if (msg)
blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
if (ubus_start_request(ctx, req, b.head, UBUS_MSG_INVOKE, obj) < 0)
memset(req, 0, sizeof(*req));
req->fd = fd;
if (__ubus_start_request(ctx, req, b.head, UBUS_MSG_INVOKE, obj) < 0)
return UBUS_STATUS_INVALID_ARGUMENT;
return 0;
}
int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method,
struct blob_attr *msg, ubus_data_handler_t cb, void *priv,
int timeout)
int ubus_invoke_fd(struct ubus_context *ctx, uint32_t obj, const char *method,
struct blob_attr *msg, ubus_data_handler_t cb, void *priv,
int timeout, int fd)
{
struct ubus_request req;
int rc;
rc = ubus_invoke_async(ctx, obj, method, msg, &req);
rc = ubus_invoke_async_fd(ctx, obj, method, msg, &req, fd);
if (rc)
return rc;