cli: add timeout support for listen command

[project/ubus.git] / libubus.c

diff --git a/libubus.c b/libubus.c
index ccaa069..d52faff 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;
        }
 }
 
@@ -354,6 +358,8 @@ struct ubus_context *ubus_connect(const char *path)
 void ubus_shutdown(struct ubus_context *ctx)
 {
        blob_buf_free(&b);
+       if (!ctx)
+               return;
        close(ctx->sock.fd);
        free(ctx->msgbuf.data);
 }