X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.c;h=8163ff7004fb6e23487a7661f9c55b8cc9a55783;hp=ccaa0690d840b26d106d3fcbb8d847b76bbf1ffa;hb=5ca6bae3a27ca02e304339ed0d94a8baa461b609;hpb=7b79b6226e737e28aafb4e9b668b86b5f180314b

diff --git a/libubus.c b/libubus.c
index ccaa069..8163ff7 100644
--- 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;
 	}
 }
 
@@ -290,6 +294,7 @@ int ubus_connect_ctx(struct ubus_context *ctx, const char *path)
 	avl_init(&ctx->objects, ubus_cmp_id, false, NULL);
 	if (ubus_reconnect(ctx, path)) {
 		free(ctx->msgbuf.data);
+		ctx->msgbuf.data = NULL;
 		return -1;
 	}
 
@@ -354,6 +359,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);
 }