syslog: fix incorrect use of sizeof() in vsnprintf()

[project/procd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index e87543a..54ead33 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -23,6 +23,8 @@ 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 void procd_ubus_connection_lost(struct ubus_context *old_ctx);
 
@@ -66,9 +68,9 @@ static void procd_ubus_try_connect(void)
                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;
        }
@@ -76,23 +78,30 @@ static void procd_ubus_try_connect(void)
        ctx->connection_lost = procd_ubus_connection_lost;
        ubus_connected = true;
        ubus_init_service(ctx);
-       if (getpid() == 1) {
+       ubus_init_system(ctx);
+       if (getpid() == 1)
                ubus_init_log(ctx);
-               ubus_init_system(ctx);
-       }
 }
 
-static void procd_ubus_connection_lost(struct ubus_context *old_ctx)
+static void
+procd_ubus_reconnect_timer(struct uloop_timeout *timeout)
 {
        procd_ubus_try_connect();
-       while (!ubus_connected) {
-               procd_restart_ubus();
-               sleep(1);
-               procd_ubus_try_connect();
+       if (ubus_connected) {
+               DEBUG(1, "Connected to ubus, id=%08x\n", ctx->local_id);
+               ubus_add_uloop(ctx);
+               return;
        }
 
-       DEBUG(1, "Connected to ubus, id=%08x\n", ctx->local_id);
-       ubus_add_uloop(ctx);
+       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);
 }
 
 void procd_connect_ubus(void)
@@ -101,3 +110,8 @@ void procd_connect_ubus(void)
        procd_ubus_connection_lost(NULL);
 }
 
+void procd_reconnect_ubus(int _reconnect)
+{
+       reconnect = _reconnect;
+}
+