X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain-afb-daemon.c;h=bb2f0a5638e80f1542fb2f294df8e42f42caadc4;hb=c31411aaba6c8bd04f68bfdb1f042d018e677790;hp=0db84bc1378f86f98a20cafdad004a85e24a3a54;hpb=5dd7df31306b95a3fafe6d3238d4553107a6c70f;p=src%2Fapp-framework-binder.git

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index 0db84bc1..bb2f0a56 100644
--- a/src/main-afb-daemon.c
+++ b/src/main-afb-daemon.c
@@ -50,7 +50,6 @@
 #include "afb-hsrv.h"
 #include "afb-hreq.h"
 #include "afb-xreq.h"
-#include "jobs.h"
 #include "afb-session.h"
 #include "verbose.h"
 #include "afb-common.h"
@@ -59,12 +58,19 @@
 #include "afb-hook.h"
 #include "afb-hook-flags.h"
 #include "afb-debug.h"
-#include "process-name.h"
-#include "wrap-json.h"
 #if defined(WITH_SUPERVISION)
 #   include "afb-supervision.h"
 #endif
 
+#include "process-name.h"
+#include "wrap-json.h"
+#include "jobs.h"
+#include "sig-monitor.h"
+
+#if !defined(DEFAULT_BINDER_INTERFACE)
+#  define DEFAULT_BINDER_INTERFACE NULL
+#endif
+
 /*
    if SELF_PGROUP == 0 the launched command is the group leader
    if SELF_PGROUP != 0 afb-daemon is the group leader
@@ -114,6 +120,21 @@ static int addenv_realpath(const char *name, const char *path)
 	return p ? addenv(name, p) : -1;
 }
 
+/**
+ * Tiny helper around addenv that export an integer
+ *
+ * @param name name of the variable to set
+ * @param value the integer value to export
+ *
+ * @return 0 in case of success or -1 in case of error (with errno set to ENOMEM)
+ */
+static int addenv_int(const char *name, int value)
+{
+	char buffer[64];
+	snprintf(buffer, sizeof buffer, "%d", value);
+	return addenv(name, buffer);
+}
+
 /*----------------------------------------------------------
  |   helpers for handling list of arguments
  +--------------------------------------------------------- */
@@ -213,13 +234,14 @@ static void setup_daemon()
  +--------------------------------------------------------- */
 static void daemonize()
 {
-	int fd = 0, daemon;
+	int fd = 0, daemon, nostdin;
 	const char *output;
 	pid_t pid;
 
 	daemon = 0;
 	output = NULL;
 	wrap_json_unpack(main_config, "{s?b s?s}", "daemon", &daemon, "output", &output);
+	nostdin = 0;
 
 	if (output) {
 		fd = open(output, O_WRONLY | O_APPEND | O_CREAT, 0640);
@@ -239,6 +261,8 @@ static void daemonize()
 		}
 		if (pid != 0)
 			_exit(0);
+
+		nostdin = 1;
 	}
 
 	/* closes the input */
@@ -251,8 +275,8 @@ static void daemonize()
 		close(fd);
 	}
 
-	/* after that ctrl+C still works */
-	close(0);
+	if (nostdin)
+		close(0); /* except if 'daemon', ctrl+C still works after that */
 }
 
 /*---------------------------------------------------------
@@ -351,13 +375,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;
 }
 
@@ -521,7 +552,7 @@ static int execute_command()
 		ERROR("port->txt failed");
 	}
 	else {
-		/* instanciate arguments and environment */
+		/* instantiate arguments and environment */
 		token = afb_session_initial_token();
 		args = instanciate_command_args(exec, port, token);
 		if (args && instanciate_environ(port, token) >= 0) {
@@ -662,7 +693,8 @@ static void start(int signum, void *arg)
 	settings = NULL;
 	token = rootapi = tracesvc = traceditf = tracereq =
 		traceapi = traceevt = traceses = traceglob = NULL;
-	no_httpd = http_port = 0;
+	no_httpd = 0;
+	http_port = -1;
 	rc = wrap_json_unpack(main_config, "{"
 			"ss ss s?s"
 			"si si si"
@@ -702,6 +734,12 @@ static void start(int signum, void *arg)
 		exit(1);
 	}
 
+	/* initialize session handling */
+	if (afb_session_init(max_session_count, session_timeout, token)) {
+		ERROR("initialisation of session manager failed");
+		goto error;
+	}
+
 	/* set the directories */
 	mkdir(workdir, S_IRWXU | S_IRGRP | S_IXGRP);
 	if (chdir(workdir) < 0) {
@@ -714,16 +752,29 @@ static void start(int signum, void *arg)
 	}
 	if (addenv_realpath("AFB_WORKDIR", "."     /* resolved by realpath */)
 	 || addenv_realpath("AFB_ROOTDIR", rootdir /* relative to current directory */)) {
-		ERROR("can't set environment");
+		ERROR("can't set DIR environment");
 		goto error;
 	}
 
+	/* setup HTTP */
+	if (!no_httpd) {
+		if (http_port < 0) {
+			ERROR("no port is defined");
+			goto error;
+		}
+		if (http_port == 0) {
+			ERROR("random port is not implemented");
+			goto error;
+		}
+		if (addenv_int("AFB_PORT", http_port)
+		 || addenv("AFB_TOKEN", afb_session_initial_token())) {
+			ERROR("can't set HTTP environment");
+			goto error;
+		}
+	}
+
 	/* configure the daemon */
 	afb_export_set_config(settings);
-	if (afb_session_init(max_session_count, session_timeout, token)) {
-		ERROR("initialisation of session manager failed");
-		goto error;
-	}
 	main_apiset = afb_apiset_create("main", api_timeout);
 	if (!main_apiset) {
 		ERROR("can't create main api set");
@@ -759,15 +810,13 @@ static void start(int signum, void *arg)
 	if (traceglob)
 		afb_hook_create_global(afb_hook_flags_global_from_text(traceglob), NULL, NULL);
 
-	/* load bindings */
+	/* load bindings and apis */
 	afb_debug("start-load");
 	apiset_start_list("binding", afb_api_so_add_binding, "the binding");
 	apiset_start_list("ldpaths", afb_api_so_add_pathset_fails, "the binding path set");
 	apiset_start_list("weak-ldpaths", afb_api_so_add_pathset_nofails, "the weak binding path set");
 	apiset_start_list("auto-api", afb_autoset_add_any, "the automatic api path set");
-	apiset_start_list("ws-server", afb_api_ws_add_server, "the afb-websocket service");
 #if defined(WITH_DBUS_TRANSPARENCY)
-	apiset_start_list("dbus-server", afb_api_dbus_add_server, "the afb-dbus service");
 	apiset_start_list("dbus-client", afb_api_dbus_add_client, "the afb-dbus client");
 #endif
 	apiset_start_list("ws-client", afb_api_ws_add_client_weak, "the afb-websocket client");
@@ -782,14 +831,15 @@ static void start(int signum, void *arg)
 	if (afb_apiset_start_all_services(main_apiset) < 0)
 		goto error;
 
+	/* export started apis */
+	apiset_start_list("ws-server", afb_api_ws_add_server, "the afb-websocket service");
+#if defined(WITH_DBUS_TRANSPARENCY)
+	apiset_start_list("dbus-server", afb_api_dbus_add_server, "the afb-dbus service");
+#endif
+
 	/* start the HTTP server */
 	afb_debug("start-http");
 	if (!no_httpd) {
-		if (http_port <= 0) {
-			ERROR("no port is defined");
-			goto error;
-		}
-
 		if (!afb_hreq_init_cookie(http_port, rootapi, session_timeout)) {
 			ERROR("initialisation of HTTP cookies failed");
 			goto error;
@@ -823,15 +873,23 @@ error:
 
 int main(int argc, char *argv[])
 {
-	struct json_object *name;
+	struct json_object *obj;
 	afb_debug("main-entry");
 
 	// ------------- Build session handler & init config -------
 	main_config = afb_config_parse_arguments(argc, argv);
-	if (json_object_object_get_ex(main_config, "name", &name)) {
-		verbose_set_name(json_object_get_string(name), 0);
-		process_name_set_name(json_object_get_string(name));
-		process_name_replace_cmdline(argv, json_object_get_string(name));
+	if (sig_monitor_init(
+		!json_object_object_get_ex(main_config, "trap-faults", &obj)
+			|| json_object_get_boolean(obj)) < 0) {
+		ERROR("failed to initialise signal handlers");
+		return 1;
+	}
+
+
+	if (json_object_object_get_ex(main_config, "name", &obj)) {
+		verbose_set_name(json_object_get_string(obj), 0);
+		process_name_set_name(json_object_get_string(obj));
+		process_name_replace_cmdline(argv, json_object_get_string(obj));
 	}
 	afb_debug("main-args");