libubus: fix recursive synchrnonous invoke commands

[project/ubus.git] / libubus.c

diff --git a/libubus.c b/libubus.c
index af8cc46..94b0044 100644 (file)
--- a/libubus.c
+++ b/libubus.c
@@ -282,7 +282,7 @@ static int ubus_process_req_status(struct ubus_request *req, struct ubus_msghdr
        int ret = UBUS_STATUS_INVALID_ARGUMENT;
 
        if (!list_empty(&req->list))
-               list_del(&req->list);
+               list_del_init(&req->list);
 
        ubus_get_status(hdr, &ret);
        req->peer = hdr->peer;
@@ -342,6 +342,8 @@ static void ubus_process_invoke(struct ubus_context *ctx, struct ubus_msghdr *hd
        int method;
        int ret = 0;
 
+       req.peer = hdr->peer;
+       req.seq = hdr->seq;
        ubus_parse_msg(hdr->data);
 
        if (!attrbuf[UBUS_ATTR_OBJID])
@@ -372,8 +374,6 @@ static void ubus_process_invoke(struct ubus_context *ctx, struct ubus_msghdr *hd
 
 found:
        req.object = objid;
-       req.peer = hdr->peer;
-       req.seq = hdr->seq;
        ret = obj->methods[method].handler(ctx, obj, &req,
                                           blob_data(attrbuf[UBUS_ATTR_METHOD]),
                                           attrbuf[UBUS_ATTR_DATA]);
@@ -382,7 +382,7 @@ send:
        blob_buf_init(&b, 0);
        blob_put_int32(&b, UBUS_ATTR_STATUS, ret);
        blob_put_int32(&b, UBUS_ATTR_OBJID, objid);
-       ubus_send_msg(ctx, hdr->seq, b.head, UBUS_MSG_STATUS, hdr->peer);
+       ubus_send_msg(ctx, req.seq, b.head, UBUS_MSG_STATUS, req.peer);
 }
 
 static void ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
@@ -417,7 +417,7 @@ void ubus_abort_request(struct ubus_context *ctx, struct ubus_request *req)
 
        req->cancelled = true;
        ubus_process_req_data(req);
-       list_del(&req->list);
+       list_del_init(&req->list);
 }
 
 void ubus_complete_request_async(struct ubus_context *ctx, struct ubus_request *req)
@@ -469,7 +469,6 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
        struct ubus_sync_req_cb cb;
        ubus_complete_handler_t complete_cb = req->complete_cb;
        bool registered = ctx->sock.registered;
-       bool cancelled = uloop_cancelled;
        int status = UBUS_STATUS_NO_DATA;
 
        if (!registered) {
@@ -487,7 +486,12 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
        ubus_complete_request_async(ctx, req);
        req->complete_cb = ubus_sync_req_cb;
 
-       uloop_run();
+       while (!req->status_msg) {
+               bool cancelled = uloop_cancelled;
+               uloop_cancelled = false;
+               uloop_run();
+               uloop_cancelled = cancelled;
+       }
 
        if (timeout)
                uloop_timeout_cancel(&cb.timeout);
@@ -499,7 +503,6 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
        if (req->complete_cb)
                req->complete_cb(req, status);
 
-       uloop_cancelled = cancelled;
        if (!registered)
                uloop_fd_delete(&ctx->sock);