ubusd: fix incomplete copy of shared buf during queue-ing

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

diff --git a/libubus-req.c b/libubus-req.c
index 3eeae40..0c7d589 100644 (file)
--- a/libubus-req.c
+++ b/libubus-req.c
@@ -122,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)
@@ -140,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;
 
@@ -157,28 +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;
@@ -187,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;
 }