libubus: move uloop_init() call to ubus_connect_ctx

[project/ubus.git] / libubus-req.c

diff --git a/libubus-req.c b/libubus-req.c
index 2197f2a..5dcd470 100644 (file)
--- a/libubus-req.c
+++ b/libubus-req.c
@@ -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))
@@ -134,7 +145,6 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
        int64_t timeout = 0, time_end = 0;
 
        if (!registered) {
-               uloop_init();
                ubus_add_uloop(ctx);
        }
 
@@ -160,6 +170,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)
@@ -205,8 +219,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);
@@ -214,20 +229,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;
 
@@ -466,3 +482,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);
+}