X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=watchdog.c;h=780b321196def0adcca35ba7de2cdf938d265d98;hp=399f6af7f1a9cff0be7d91dcdcb9e1d63e1b4ea7;hb=79bbe6daf70feb27ec0e2060b86852015cd04465;hpb=13259259bc53657617844660f2664f4b4fb4ac02

diff --git a/watchdog.c b/watchdog.c
index 399f6af..780b321 100644
--- a/watchdog.c
+++ b/watchdog.c
@@ -32,11 +32,16 @@ static struct uloop_timeout wdt_timeout;
 static int wdt_fd = -1;
 static int wdt_frequency = 5;
 
-static void watchdog_timeout_cb(struct uloop_timeout *t)
+void watchdog_ping(void)
 {
 	DEBUG(4, "Ping\n");
-	if (write(wdt_fd, "X", 1) < 0)
+	if (wdt_fd >= 0 && write(wdt_fd, "X", 1) < 0)
 		ERROR("WDT failed to write: %s\n", strerror(errno));
+}
+
+static void watchdog_timeout_cb(struct uloop_timeout *t)
+{
+	watchdog_ping();
 	uloop_timeout_set(t, wdt_frequency * 1000);
 }
 
@@ -121,10 +126,15 @@ void watchdog_init(int preinit)
 }
 
 
-void watchdog_no_cloexec(void)
+void watchdog_set_cloexec(bool val)
 {
 	if (wdt_fd < 0)
 		return;
 
-	fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) & ~FD_CLOEXEC);
+	int flags = fcntl(wdt_fd, F_GETFD);
+	if (val)
+		flags |= FD_CLOEXEC;
+	else
+		flags &= ~FD_CLOEXEC;
+	fcntl(wdt_fd, F_SETFD,  flags);
 }