ubus: Correct usage of timeout on poll function

[project/ubus.git] / libubus.c

diff --git a/libubus.c b/libubus.c
index 18267bb..bfbaeb6 100644 (file)
--- a/libubus.c
+++ b/libubus.c
@@ -81,7 +81,7 @@ ubus_queue_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf)
        pending->hdr.data = data;
        memcpy(&pending->hdr.hdr, &buf->hdr, sizeof(buf->hdr));
        memcpy(data, buf->data, blob_raw_len(buf->data));
-       list_add(&pending->list, &ctx->pending);
+       list_add_tail(&pending->list, &ctx->pending);
        if (ctx->sock.registered)
                uloop_timeout_set(&ctx->pending_timer, 1);
 }
@@ -105,6 +105,10 @@ ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf, int fd)
 
                ubus_process_obj_msg(ctx, buf);
                break;
+       case UBUS_MSG_MONITOR:
+               if (ctx->monitor_cb)
+                       ctx->monitor_cb(ctx, buf->hdr.seq, buf->data);
+               break;
        }
 }
 
@@ -271,8 +275,10 @@ static void ubus_default_connection_lost(struct ubus_context *ctx)
                uloop_end();
 }
 
-static int _ubus_connect(struct ubus_context *ctx, const char *path)
+int ubus_connect_ctx(struct ubus_context *ctx, const char *path)
 {
+       memset(ctx, 0, sizeof(*ctx));
+
        ctx->sock.fd = -1;
        ctx->sock.cb = ubus_handle_data;
        ctx->connection_lost = ubus_default_connection_lost;
@@ -316,7 +322,7 @@ static void ubus_auto_connect_cb(struct uloop_timeout *timeout)
 {
        struct ubus_auto_conn *conn = container_of(timeout, struct ubus_auto_conn, timer);
 
-       if (_ubus_connect(&conn->ctx, conn->path)) {
+       if (ubus_connect_ctx(&conn->ctx, conn->path)) {
                uloop_timeout_set(timeout, 1000);
                fprintf(stderr, "failed to connect to ubus\n");
                return;
@@ -341,7 +347,7 @@ struct ubus_context *ubus_connect(const char *path)
        if (!ctx)
                return NULL;
 
-       if (_ubus_connect(ctx, path)) {
+       if (ubus_connect_ctx(ctx, path)) {
                free(ctx);
                ctx = NULL;
        }
@@ -349,10 +355,15 @@ struct ubus_context *ubus_connect(const char *path)
        return ctx;
 }
 
-void ubus_free(struct ubus_context *ctx)
+void ubus_shutdown(struct ubus_context *ctx)
 {
        blob_buf_free(&b);
        close(ctx->sock.fd);
        free(ctx->msgbuf.data);
+}
+
+void ubus_free(struct ubus_context *ctx)
+{
+       ubus_shutdown(ctx);
        free(ctx);
 }