ubus/lua: pass notification name to callback

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

diff --git a/libubus-req.c b/libubus-req.c
index 2197f2a..92f80fa 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))
@@ -111,7 +122,7 @@ static void ubus_sync_req_cb(struct ubus_request *req, int ret)
 {
        req->status_msg = true;
        req->status_code = ret;
-       uloop_end();
+       req->ctx->cancel_poll = true;
 }
 
 static int64_t get_time_msec(void)
@@ -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;
 
@@ -146,24 +151,26 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
 
        ctx->stack_depth++;
        while (!req->status_msg) {
-               bool cancelled = uloop_cancelled;
-
-               uloop_cancelled = false;
                if (req_timeout) {
                        timeout = time_end - get_time_msec();
                        if (timeout <= 0) {
                                ubus_set_req_status(req, UBUS_STATUS_TIMEOUT);
-                               uloop_cancelled = cancelled;
                                break;
                        }
                }
+
                ubus_poll_data(ctx, (unsigned int) timeout);
 
-               uloop_cancelled = cancelled;
+               if (ctx->sock.eof) {
+                       ubus_set_req_status(req, UBUS_STATUS_CONNECTION_FAILED);
+                       ctx->cancel_poll = true;
+                       break;
+               }
        }
+
        ctx->stack_depth--;
        if (ctx->stack_depth)
-               uloop_cancelled = true;
+               ctx->cancel_poll = true;
 
        if (req->status_msg)
                status = req->status_code;
@@ -172,12 +179,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;
 }
@@ -205,8 +208,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 +218,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;
 
@@ -248,6 +253,18 @@ ubus_notify_complete_cb(struct ubus_request *req, int ret)
        nreq->complete_cb(nreq, 0, 0);
 }
 
+static void
+ubus_notify_data_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+{
+       struct ubus_notify_request *nreq;
+
+       nreq = container_of(req, struct ubus_notify_request, req);
+       if (!nreq->data_cb)
+               return;
+
+       nreq->data_cb(nreq, type, msg);
+}
+
 static int
 __ubus_notify_async(struct ubus_context *ctx, struct ubus_object *obj,
                    const char *type, struct blob_attr *msg,
@@ -273,6 +290,7 @@ __ubus_notify_async(struct ubus_context *ctx, struct ubus_object *obj,
        req->pending = 1;
        req->id[0] = obj->id;
        req->req.complete_cb = ubus_notify_complete_cb;
+       req->req.data_cb = ubus_notify_data_cb;
 
        return 0;
 }
@@ -466,3 +484,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);
+}