X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain-afb-daemon.c;h=beb08d38827645d6d68307a2db8accc27264a266;hb=418ba126a955ee38804152c6c905ff200bbc1a92;hp=4fb4792c7248ceff83eaa3bda3fe1772e733905c;hpb=83c9e99afda0f18e01b9f6dead29d81877568ef4;p=src%2Fapp-framework-binder.git

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index 4fb4792c..beb08d38 100644
--- a/src/main-afb-daemon.c
+++ b/src/main-afb-daemon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2018 "IoT.bzh"
+ * Copyright (C) 2015-2019 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -66,6 +66,11 @@
 #include "wrap-json.h"
 #include "jobs.h"
 #include "sig-monitor.h"
+#include "watchdog.h"
+
+#if !defined(DEFAULT_BINDER_INTERFACE)
+#  define DEFAULT_BINDER_INTERFACE NULL
+#endif
 
 /*
    if SELF_PGROUP == 0 the launched command is the group leader
@@ -371,13 +376,20 @@ static struct afb_hsrv *start_http_server()
 	NOTICE("Waiting port=%d rootdir=%s", http_port, rootdir);
 	NOTICE("Browser URL= http://localhost:%d", http_port);
 
-	rc = afb_hsrv_start(hsrv, (uint16_t) http_port, 15);
+	rc = afb_hsrv_start(hsrv, 15);
 	if (!rc) {
 		ERROR("starting of httpd failed");
 		afb_hsrv_put(hsrv);
 		return NULL;
 	}
 
+	rc = afb_hsrv_add_interface_tcp(hsrv, DEFAULT_BINDER_INTERFACE, (uint16_t) http_port);
+	if (!rc) {
+		ERROR("setting interface failed");
+		afb_hsrv_put(hsrv);
+		return NULL;
+	}
+
 	return hsrv;
 }
 
@@ -850,6 +862,13 @@ static void start(int signum, void *arg)
 
 	/* ready */
 	sd_notify(1, "READY=1");
+
+	/* activate the watchdog */
+#if HAS_WATCHDOG
+	if (watchdog_activate() < 0)
+		ERROR("can't start the watchdog");
+#endif
+
 	return;
 error:
 	exit(1);