X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=watchdog.c;h=d927c53f42672734bd63706f46a5a7ddaa8c4aa4;hp=98961d32bb1d9fa5bdd093cdf2c27d134916dc2b;hb=b5e17105b163442a030559b7b2c2454b82b3fd4c;hpb=9bd712e309421f75363f4a356f4c1ab2c93f8f87

diff --git a/watchdog.c b/watchdog.c
index 98961d3..d927c53 100644
--- a/watchdog.c
+++ b/watchdog.c
@@ -36,10 +36,23 @@ static void watchdog_timeout_cb(struct uloop_timeout *t)
 {
 	DEBUG(2, "Ping\n");
 	if (write(wdt_fd, "X", 1) < 0)
-		perror("WDT failed to write\n");
+		ERROR("WDT failed to write: %s\n", strerror(errno));
 	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)
@@ -78,24 +91,29 @@ char* watchdog_fd(void)
 	return fd_buf;
 }
 
-void watchdog_init(void)
+void watchdog_init(int preinit)
 {
 	char *env = getenv("WDTFD");
 
+	if (wdt_fd >= 0)
+		return;
+
 	wdt_timeout.cb = watchdog_timeout_cb;
 	if (env) {
-		LOG("- watchdog -\n");
 		DEBUG(1, "Watchdog handover: fd=%s\n", env);
 		wdt_fd = atoi(env);
-		fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
 		unsetenv("WDTFD");
 	} else {
 		wdt_fd = open("/dev/watchdog", O_WRONLY);
-		if (getpid() != 1)
-			fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
 	}
+
 	if (wdt_fd < 0)
 		return;
+
+	if (!preinit)
+		fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
+
+	LOG("- watchdog -\n");
 	watchdog_timeout(30);
 	watchdog_timeout_cb(&wdt_timeout);