watchdog: add support for starting/stopping watchdog refresh

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

diff --git a/system.c b/system.c
index c35f75abf06127d933d5923047e88075a8c55031..658dd5e79f9ec73f7602c78ce28dda6cbdaebf22 100644 (file)
--- a/system.c
+++ b/system.c
@@ -58,12 +58,14 @@ static int system_info(struct ubus_context *ctx, struct ubus_object *obj,
 enum {
        WDT_FREQUENCY,
        WDT_TIMEOUT,
+       WDT_STOP,
        __WDT_MAX
 };
 
 static const struct blobmsg_policy watchdog_policy[__WDT_MAX] = {
        [WDT_FREQUENCY] = { .name = "frequency", .type = BLOBMSG_TYPE_INT32 },
        [WDT_TIMEOUT] = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 },
+       [WDT_STOP] = { .name = "stop", .type = BLOBMSG_TYPE_BOOL },
 };
 
 static int watchdog_set(struct ubus_context *ctx, struct ubus_object *obj,
@@ -71,6 +73,7 @@ static int watchdog_set(struct ubus_context *ctx, struct ubus_object *obj,
                        struct blob_attr *msg)
 {
        struct blob_attr *tb[__WDT_MAX];
+       const char *status;
 
        if (!msg)
                return UBUS_STATUS_INVALID_ARGUMENT;
@@ -96,8 +99,18 @@ static int watchdog_set(struct ubus_context *ctx, struct ubus_object *obj,
                 watchdog_timeout(timeout);
        }
 
+       if (tb[WDT_STOP])
+               watchdog_set_stopped(blobmsg_get_bool(tb[WDT_STOP]));
+
+       if (watchdog_fd() < 0)
+               status = "offline";
+       else if (watchdog_get_stopped())
+               status = "stopped";
+       else
+               status = "running";
+
        blob_buf_init(&b, 0);
-       blobmsg_add_string(&b, "status", (watchdog_fd() >= 0) ? ("running") : ("offline"));
+       blobmsg_add_string(&b, "status", status);
        blobmsg_add_u32(&b, "timeout", watchdog_timeout(0));
        blobmsg_add_u32(&b, "frequency", watchdog_frequency(0));
        ubus_send_reply(ctx, req, b.head);

diff --git a/watchdog.c b/watchdog.c
index 0ba8f25f0ea1423f6e897aecff384e3735cbf381..2a516b4c5e0271489cd4f0f79763165e71aafb44 100644 (file)
--- a/watchdog.c
+++ b/watchdog.c
@@ -40,6 +40,19 @@ static void watchdog_timeout_cb(struct uloop_timeout *t)
        uloop_timeout_set(t, wdt_frequency * 1000);
 }
 
+void watchdog_set_stopped(bool val)
+{
+       if (val)
+               uloop_timeout_cancel(&wdt_timeout);
+       else
+               watchdog_timeout_cb(&wdt_timeout);
+}
+
+bool watchdog_get_stopped(void)
+{
+       return !wdt_timeout.pending;
+}
+
 int watchdog_timeout(int timeout)
 {
        if (wdt_fd < 0)

diff --git a/watchdog.h b/watchdog.h
index 92702fd13978b0de1609e648f774f1414c933b28..66037b18cd2833aa21aec955068b82653ed5bdb0 100644 (file)
--- a/watchdog.h
+++ b/watchdog.h
@@ -19,5 +19,7 @@ void watchdog_init(void);
 char* watchdog_fd(void);
 int watchdog_timeout(int timeout);
 int watchdog_frequency(int frequency);
+void watchdog_set_stopped(bool val);
+bool watchdog_get_stopped(void);
 
 #endif