X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=libubus.c;h=e435200150ef02c48be73c25fd693b366cd7a515;hb=37cc5d2f25c162c1e125922e91bbc741e2e4a6d1;hp=fee3ee8f6c9a7df1616ddb89f1338ce84e91ae9e;hpb=22246585804a2f6546a329a9e626598a82feb554;p=project%2Fubus.git

diff --git a/libubus.c b/libubus.c
index fee3ee8..e435200 100644
--- a/libubus.c
+++ b/libubus.c
@@ -75,11 +75,11 @@ ubus_queue_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
 {
 	struct ubus_pending_msg *pending;
 
-	pending = calloc(1, sizeof(*pending) + blob_raw_len(hdr->data));
+	pending = calloc(1, sizeof(*pending) + blob_raw_len(ubus_msghdr_data(hdr)));
 	if (!pending)
 		return;
 
-	memcpy(&pending->hdr, hdr, sizeof(*hdr) + blob_raw_len(hdr->data));
+	memcpy(&pending->hdr, hdr, sizeof(*hdr) + blob_raw_len(ubus_msghdr_data(hdr)));
 	list_add(&pending->list, &ctx->pending);
 }
 
@@ -108,9 +108,10 @@ ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
 
 void __hidden ubus_process_pending_msg(struct ubus_context *ctx)
 {
-	struct ubus_pending_msg *pending, *tmp;
+	struct ubus_pending_msg *pending;
 
-	list_for_each_entry_safe(pending, tmp, &ctx->pending, list) {
+	while (!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);
 		free(pending);
@@ -266,14 +267,8 @@ static void ubus_default_connection_lost(struct ubus_context *ctx)
 		uloop_end();
 }
 
-struct ubus_context *ubus_connect(const char *path)
+static int _ubus_connect(struct ubus_context *ctx, const char *path)
 {
-	struct ubus_context *ctx;
-
-	ctx = calloc(1, sizeof(*ctx));
-	if (!ctx)
-		return NULL;
-
 	ctx->sock.fd = -1;
 	ctx->sock.cb = ubus_handle_data;
 	ctx->connection_lost = ubus_default_connection_lost;
@@ -281,7 +276,60 @@ struct ubus_context *ubus_connect(const char *path)
 	INIT_LIST_HEAD(&ctx->requests);
 	INIT_LIST_HEAD(&ctx->pending);
 	avl_init(&ctx->objects, ubus_cmp_id, false, NULL);
-	if (ubus_reconnect(ctx, path)) {
+	if (ubus_reconnect(ctx, path))
+		return -1;
+
+	return 0;
+}
+
+static void ubus_auto_reconnect_cb(struct uloop_timeout *timeout)
+{
+	struct ubus_auto_conn *conn = container_of(timeout, struct ubus_auto_conn, timer);
+
+	if (!ubus_reconnect(&conn->ctx, conn->path))
+		ubus_add_uloop(&conn->ctx);
+	else
+		uloop_timeout_set(timeout, 1000);
+}
+
+static void ubus_auto_disconnect_cb(struct ubus_context *ctx)
+{
+	struct ubus_auto_conn *conn = container_of(ctx, struct ubus_auto_conn, ctx);
+
+	conn->timer.cb = ubus_auto_reconnect_cb;
+	uloop_timeout_set(&conn->timer, 1000);
+}
+
+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)) {
+		uloop_timeout_set(timeout, 1000);
+		fprintf(stderr, "failed to connect to ubus\n");
+		return;
+	}
+	conn->ctx.connection_lost = ubus_auto_disconnect_cb;
+	if (conn->cb)
+		conn->cb(&conn->ctx);
+	ubus_add_uloop(&conn->ctx);
+}
+
+void ubus_auto_connect(struct ubus_auto_conn *conn)
+{
+	conn->timer.cb = ubus_auto_connect_cb;
+	ubus_auto_connect_cb(&conn->timer);
+}
+
+struct ubus_context *ubus_connect(const char *path)
+{
+	struct ubus_context *ctx;
+
+	ctx = calloc(1, sizeof(*ctx));
+	if (!ctx)
+		return NULL;
+
+	if (_ubus_connect(ctx, path)) {
 		free(ctx);
 		ctx = NULL;
 	}
@@ -291,6 +339,7 @@ struct ubus_context *ubus_connect(const char *path)
 
 void ubus_free(struct ubus_context *ctx)
 {
+	blob_buf_free(&b);
 	close(ctx->sock.fd);
 	free(ctx);
 }