libubus: mark ubus socket with close-on-exec

[project/ubus.git] / libubus.c

diff --git a/libubus.c b/libubus.c
index 8683fcc..be4e6ac 100644 (file)
--- a/libubus.c
+++ b/libubus.c
@@ -40,7 +40,7 @@ struct blob_buf b __hidden = {};
 
 struct ubus_pending_msg {
        struct list_head list;
-       struct ubus_msghdr hdr;
+       struct ubus_msghdr_buf hdr;
 };
 
 static int ubus_cmp_id(const void *k1, const void *k2, void *ptr)
@@ -75,12 +75,18 @@ ubus_queue_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
 {
        struct ubus_pending_msg *pending;
 
-       pending = calloc(1, sizeof(*pending) + blob_raw_len(ubus_msghdr_data(hdr)));
+       pending = calloc(1, sizeof(*pending));
        if (!pending)
                return;
+       pending->hdr.data = calloc(1, blob_raw_len(ubus_msghdr_data(hdr)));
+       if (!pending->hdr.data)
+               return;
 
-       memcpy(&pending->hdr, hdr, sizeof(*hdr) + blob_raw_len(ubus_msghdr_data(hdr)));
+       memcpy(&pending->hdr.hdr, hdr, sizeof(*hdr));
+       memcpy(pending->hdr.data, ubus_msghdr_data(hdr), blob_raw_len(ubus_msghdr_data(hdr)));
        list_add(&pending->list, &ctx->pending);
+       if (ctx->sock.registered)
+               uloop_timeout_set(&ctx->pending_timer, 1);
 }
 
 void __hidden
@@ -96,7 +102,7 @@ ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr, int fd)
        case UBUS_MSG_INVOKE:
        case UBUS_MSG_UNSUBSCRIBE:
        case UBUS_MSG_NOTIFY:
-               if (ctx->stack_depth > 2) {
+               if (ctx->stack_depth) {
                        ubus_queue_msg(ctx, hdr);
                        break;
                }
@@ -106,17 +112,17 @@ ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr, int fd)
        }
 }
 
-void __hidden ubus_process_pending_msg(struct ubus_context *ctx)
+static void ubus_process_pending_msg(struct uloop_timeout *timeout)
 {
+       struct ubus_context *ctx = container_of(timeout, struct ubus_context, pending_timer);
        struct ubus_pending_msg *pending;
 
-       while (!list_empty(&ctx->pending)) {
+       while (!ctx->stack_depth && !list_empty(&ctx->pending)) {
                pending = list_first_entry(&ctx->pending, struct ubus_pending_msg, list);
                list_del(&pending->list);
-               ubus_process_msg(ctx, &pending->hdr, -1);
+               ubus_process_msg(ctx, &pending->hdr.hdr, -1);
+               free(pending->hdr.data);
                free(pending);
-               if (ctx->stack_depth > 2)
-                       break;
        }
 }
 
@@ -272,12 +278,20 @@ static int _ubus_connect(struct ubus_context *ctx, const char *path)
        ctx->sock.fd = -1;
        ctx->sock.cb = ubus_handle_data;
        ctx->connection_lost = ubus_default_connection_lost;
+       ctx->pending_timer.cb = ubus_process_pending_msg;
+
+       ctx->msgbuf.data = calloc(UBUS_MSG_CHUNK_SIZE, sizeof(char));
+       if (!ctx->msgbuf.data)
+               return -1;
+       ctx->msgbuf_data_len = UBUS_MSG_CHUNK_SIZE;
 
        INIT_LIST_HEAD(&ctx->requests);
        INIT_LIST_HEAD(&ctx->pending);
        avl_init(&ctx->objects, ubus_cmp_id, false, NULL);
-       if (ubus_reconnect(ctx, path))
+       if (ubus_reconnect(ctx, path)) {
+               free(ctx->msgbuf.data);
                return -1;
+       }
 
        return 0;
 }
@@ -341,5 +355,6 @@ void ubus_free(struct ubus_context *ctx)
 {
        blob_buf_free(&b);
        close(ctx->sock.fd);
+       free(ctx->msgbuf.data);
        free(ctx);
 }