X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.c;h=b25d8b084f9b6271bfd1625c24549c25edfb2a78;hp=be4e6acdd797480225631b45d70e27909bbe0bcb;hb=df088f03c02aebba304a371486f09e95ed34bf5f;hpb=6d24ad71f6fdb5345970fcfa7450cd5a50790d18

diff --git a/libubus.c b/libubus.c
index be4e6ac..b25d8b0 100644
--- a/libubus.c
+++ b/libubus.c
@@ -71,43 +71,43 @@ out:
 }
 
 static void
-ubus_queue_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
+ubus_queue_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf)
 {
 	struct ubus_pending_msg *pending;
+	void *data;
 
-	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;
+	pending = calloc_a(sizeof(*pending), &data, blob_raw_len(buf->data));
 
-	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);
+	pending->hdr.data = data;
+	memcpy(&pending->hdr.hdr, &buf->hdr, sizeof(buf->hdr));
+	memcpy(data, buf->data, blob_raw_len(buf->data));
+	list_add_tail(&pending->list, &ctx->pending);
 	if (ctx->sock.registered)
 		uloop_timeout_set(&ctx->pending_timer, 1);
 }
 
 void __hidden
-ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr, int fd)
+ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf, int fd)
 {
-
-	switch(hdr->type) {
+	switch(buf->hdr.type) {
 	case UBUS_MSG_STATUS:
 	case UBUS_MSG_DATA:
-		ubus_process_req_msg(ctx, hdr, fd);
+		ubus_process_req_msg(ctx, buf, fd);
 		break;
 
 	case UBUS_MSG_INVOKE:
 	case UBUS_MSG_UNSUBSCRIBE:
 	case UBUS_MSG_NOTIFY:
 		if (ctx->stack_depth) {
-			ubus_queue_msg(ctx, hdr);
+			ubus_queue_msg(ctx, buf);
 			break;
 		}
 
-		ubus_process_obj_msg(ctx, hdr);
+		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;
 	}
 }
@@ -120,8 +120,7 @@ static void ubus_process_pending_msg(struct uloop_timeout *timeout)
 	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.hdr, -1);
-		free(pending->hdr.data);
+		ubus_process_msg(ctx, &pending->hdr, -1);
 		free(pending);
 	}
 }
@@ -243,8 +242,11 @@ int ubus_register_event_handler(struct ubus_context *ctx,
 	if (pattern)
 		blobmsg_add_string(&b2, "pattern", pattern);
 
-	return ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
+	ret = ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
 			  NULL, NULL, 0);
+	blob_buf_free(&b2);
+
+	return ret;
 }
 
 int ubus_send_event(struct ubus_context *ctx, const char *id,
@@ -273,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;
@@ -290,6 +294,7 @@ static int _ubus_connect(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;
 	}
 
@@ -318,7 +323,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;
@@ -343,7 +348,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;
 	}
@@ -351,10 +356,17 @@ 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);
+	if (!ctx)
+		return;
 	close(ctx->sock.fd);
 	free(ctx->msgbuf.data);
+}
+
+void ubus_free(struct ubus_context *ctx)
+{
+	ubus_shutdown(ctx);
 	free(ctx);
 }