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

diff --git a/libubus.c b/libubus.c
index ccaa069..260e40f 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);
 }
@@ -103,7 +103,11 @@ ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf, int fd)
 			break;
 		}
 
-		ubus_process_obj_msg(ctx, buf);
+		ubus_process_obj_msg(ctx, buf, fd);
+		break;
+	case UBUS_MSG_MONITOR:
+		if (ctx->monitor_cb)
+			ctx->monitor_cb(ctx, buf->hdr.seq, buf->data);
 		break;
 	}
 }
@@ -129,7 +133,7 @@ struct ubus_lookup_request {
 static void ubus_lookup_cb(struct ubus_request *ureq, int type, struct blob_attr *msg)
 {
 	struct ubus_lookup_request *req;
-	struct ubus_object_data obj;
+	struct ubus_object_data obj = {};
 	struct blob_attr **attr;
 
 	req = container_of(ureq, struct ubus_lookup_request, req);
@@ -139,7 +143,6 @@ static void ubus_lookup_cb(struct ubus_request *ureq, int type, struct blob_attr
 	    !attr[UBUS_ATTR_OBJTYPE])
 		return;
 
-	memset(&obj, 0, sizeof(obj));
 	obj.id = blob_get_u32(attr[UBUS_ATTR_OBJID]);
 	obj.path = blob_data(attr[UBUS_ATTR_OBJPATH]);
 	obj.type_id = blob_get_u32(attr[UBUS_ATTR_OBJTYPE]);
@@ -216,7 +219,7 @@ int ubus_register_event_handler(struct ubus_context *ctx,
 				const char *pattern)
 {
 	struct ubus_object *obj = &ev->obj;
-	struct blob_buf b2;
+	struct blob_buf b2 = {};
 	int ret;
 
 	if (!obj->id) {
@@ -232,7 +235,6 @@ int ubus_register_event_handler(struct ubus_context *ctx,
 	}
 
 	/* use a second buffer, ubus_invoke() overwrites the primary one */
-	memset(&b2, 0, sizeof(b2));
 	blob_buf_init(&b2, 0);
 	blobmsg_add_u32(&b2, "object", obj->id);
 	if (pattern)
@@ -273,6 +275,7 @@ static void ubus_default_connection_lost(struct ubus_context *ctx)
 
 int ubus_connect_ctx(struct ubus_context *ctx, const char *path)
 {
+	uloop_init();
 	memset(ctx, 0, sizeof(*ctx));
 
 	ctx->sock.fd = -1;
@@ -290,6 +293,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,7 +358,10 @@ 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);
+	uloop_timeout_cancel(&ctx->pending_timer);
 	free(ctx->msgbuf.data);
 }