X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=ubus.c;h=211a1ecf7fbded0d9e10fd6f770b5d69ec5a9ad1;hp=54ead3363c124c270553fbc1cd66ba8763877e27;hb=303eaecc18ca1d26af9d9105631000c8bdef11a0;hpb=7f31a19db4c88ca17837a2aaa9144622522d0726;ds=sidebyside

diff --git a/ubus.c b/ubus.c
index 54ead33..211a1ec 100644
--- a/ubus.c
+++ b/ubus.c
@@ -21,97 +21,48 @@
 
 char *ubus_socket = NULL;
 static struct ubus_context *ctx;
-static struct uloop_process ubus_proc;
-static bool ubus_connected = false;
-static struct uloop_timeout retry;
-static int reconnect = 1;
+static struct uloop_timeout ubus_timer;
 
-static void procd_ubus_connection_lost(struct ubus_context *old_ctx);
-
-static void ubus_proc_cb(struct uloop_process *proc, int ret)
+static void
+ubus_reconnect_cb(struct uloop_timeout *timeout)
 {
-	/* nothing to do here */
+	if (!ubus_reconnect(ctx, ubus_socket))
+		ubus_add_uloop(ctx);
+	else
+		uloop_timeout_set(timeout, 2000);
 }
 
-static void procd_restart_ubus(void)
+static void
+ubus_disconnect_cb(struct ubus_context *ctx)
 {
-	char *argv[] = { "ubusd", NULL, ubus_socket, NULL };
-
-	if (ubus_proc.pending) {
-		ERROR("Killing existing ubus instance, pid=%d\n", (int) ubus_proc.pid);
-		kill(ubus_proc.pid, SIGKILL);
-		uloop_process_delete(&ubus_proc);
-	}
-
-	if (ubus_socket)
-		argv[1] = "-s";
-
-	ubus_proc.pid = fork();
-	if (!ubus_proc.pid) {
-		setpriority(PRIO_PROCESS, 0, -20);
-		execvp(argv[0], argv);
-		exit(-1);
-	}
-
-	if (ubus_proc.pid <= 0) {
-		ERROR("Failed to start new ubus instance\n");
-		return;
-	}
-
-	DEBUG(1, "Launched new ubus instance, pid=%d\n", (int) ubus_proc.pid);
-	uloop_process_add(&ubus_proc);
+	ubus_timer.cb = ubus_reconnect_cb;
+	uloop_timeout_set(&ubus_timer, 2000);
 }
 
-static void procd_ubus_try_connect(void)
+static void
+ubus_connect_cb(struct uloop_timeout *timeout)
 {
-	if (ctx) {
-		ubus_connected = !ubus_reconnect(ctx, ubus_socket);
-		return;
-	}
 	ctx = ubus_connect(ubus_socket);
+
 	if (!ctx) {
-		ubus_connected = false;
-		DEBUG(2, "Connection to ubus failed\n");
+		DEBUG(4, "Connection to ubus failed\n");
+		uloop_timeout_set(&ubus_timer, 1000);
 		return;
 	}
 
-	ctx->connection_lost = procd_ubus_connection_lost;
-	ubus_connected = true;
+	ctx->connection_lost = ubus_disconnect_cb;
 	ubus_init_service(ctx);
 	ubus_init_system(ctx);
-	if (getpid() == 1)
-		ubus_init_log(ctx);
-}
-
-static void
-procd_ubus_reconnect_timer(struct uloop_timeout *timeout)
-{
-	procd_ubus_try_connect();
-	if (ubus_connected) {
-		DEBUG(1, "Connected to ubus, id=%08x\n", ctx->local_id);
-		ubus_add_uloop(ctx);
-		return;
-	}
+	watch_ubus(ctx);
 
-	uloop_timeout_set(&retry, 1000);
-	procd_restart_ubus();
+	DEBUG(2, "Connected to ubus, id=%08x\n", ctx->local_id);
+	ubus_add_uloop(ctx);
+	procd_state_ubus_connect();
 }
 
-static void procd_ubus_connection_lost(struct ubus_context *old_ctx)
+void
+procd_connect_ubus(void)
 {
-	retry.cb = procd_ubus_reconnect_timer;
-	procd_restart_ubus();
-	uloop_timeout_set(&retry, 1000);
+	ubus_timer.cb = ubus_connect_cb;
+	uloop_timeout_set(&ubus_timer, 1000);
 }
-
-void procd_connect_ubus(void)
-{
-	ubus_proc.cb = ubus_proc_cb;
-	procd_ubus_connection_lost(NULL);
-}
-
-void procd_reconnect_ubus(int _reconnect)
-{
-	reconnect = _reconnect;
-}
-