service: add data within the service itself

[project/procd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 54ead33..8d521ac 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -21,97 +21,67 @@
 
 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 int timeout;
 
-static void procd_ubus_connection_lost(struct ubus_context *old_ctx);
-
-static void ubus_proc_cb(struct uloop_process *proc, int ret)
+static void reset_timeout(void)
 {
-       /* nothing to do here */
+       timeout = 50;
 }
 
-static void procd_restart_ubus(void)
+static void timeout_retry(void)
 {
-       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);
-       }
+       uloop_timeout_set(&ubus_timer, timeout);
+       timeout *= 2;
+       if (timeout > 1000)
+               timeout = 1000;
+}
 
-       if (ubus_proc.pid <= 0) {
-               ERROR("Failed to start new ubus instance\n");
+static void
+ubus_reconnect_cb(struct uloop_timeout *timeout)
+{
+       if (!ubus_reconnect(ctx, ubus_socket)) {
+               ubus_add_uloop(ctx);
                return;
        }
 
-       DEBUG(1, "Launched new ubus instance, pid=%d\n", (int) ubus_proc.pid);
-       uloop_process_add(&ubus_proc);
+       timeout_retry();
 }
 
-static void procd_ubus_try_connect(void)
+static void
+ubus_disconnect_cb(struct ubus_context *ctx)
 {
-       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");
-               return;
-       }
-
-       ctx->connection_lost = procd_ubus_connection_lost;
-       ubus_connected = true;
-       ubus_init_service(ctx);
-       ubus_init_system(ctx);
-       if (getpid() == 1)
-               ubus_init_log(ctx);
+       ubus_timer.cb = ubus_reconnect_cb;
+       reset_timeout();
+       timeout_retry();
 }
 
 static void
-procd_ubus_reconnect_timer(struct uloop_timeout *timeout)
+ubus_connect_cb(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);
+       ctx = ubus_connect(ubus_socket);
+
+       if (!ctx) {
+               DEBUG(4, "Connection to ubus failed\n");
+               timeout_retry();
                return;
        }
 
-       uloop_timeout_set(&retry, 1000);
-       procd_restart_ubus();
-}
-
-static void procd_ubus_connection_lost(struct ubus_context *old_ctx)
-{
-       retry.cb = procd_ubus_reconnect_timer;
-       procd_restart_ubus();
-       uloop_timeout_set(&retry, 1000);
-}
+       ctx->connection_lost = ubus_disconnect_cb;
+       ubus_init_service(ctx);
+       ubus_init_system(ctx);
+       watch_ubus(ctx);
 
-void procd_connect_ubus(void)
-{
-       ubus_proc.cb = ubus_proc_cb;
-       procd_ubus_connection_lost(NULL);
+       DEBUG(2, "Connected to ubus, id=%08x\n", ctx->local_id);
+       reset_timeout();
+       ubus_add_uloop(ctx);
+       procd_state_ubus_connect();
 }
 
-void procd_reconnect_ubus(int _reconnect)
+void
+procd_connect_ubus(void)
 {
-       reconnect = _reconnect;
+       ubus_timer.cb = ubus_connect_cb;
+       reset_timeout();
+       timeout_retry();
 }
-