X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=c735ecbb3984f86146d1895d48a49d7c4a4e2a9a;hb=3e3a29fa49ec494800a4aa866d84fba4eaa8261b;hp=dee82a76af7bf7ffbb52d23e40963c1ca83fbbb3;hpb=5fdbf43a0af039c7ad64b9de8038d5d7d9cd0c60;p=src%2Fapp-framework-binder.git

diff --git a/src/main.c b/src/main.c
index dee82a76..c735ecbb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,37 +17,43 @@
  */
 
 #define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
+#include <signal.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include <systemd/sd-event.h>
-#include <systemd/sd-daemon.h>
+#if !defined(NO_CALL_PERSONALITY)
+#include <sys/personality.h>
+#endif
 
-#include <afb/afb-binding.h>
+#include <json-c/json.h>
+
+#include <systemd/sd-daemon.h>
 
 #include "afb-config.h"
 #include "afb-hswitch.h"
-#include "afb-apis.h"
+#include "afb-apiset.h"
 #include "afb-api-so.h"
 #include "afb-api-dbus.h"
 #include "afb-api-ws.h"
 #include "afb-hsrv.h"
-#include "afb-context.h"
 #include "afb-hreq.h"
-#include "sig-monitor.h"
+#include "afb-xreq.h"
 #include "jobs.h"
 #include "afb-session.h"
 #include "verbose.h"
 #include "afb-common.h"
+#include "afb-monitor.h"
 #include "afb-hook.h"
-#include "sd-fds.h"
+#include "afb-debug.h"
+#include "process-name.h"
+#include "afb-supervision.h"
 
 /*
    if SELF_PGROUP == 0 the launched command is the group leader
@@ -55,7 +61,9 @@
 */
 #define SELF_PGROUP 1
 
-static struct afb_config *config;
+struct afb_apiset *main_apiset;
+struct afb_config *main_config;
+
 static pid_t childpid;
 
 /*----------------------------------------------------------
@@ -80,12 +88,12 @@ static struct afb_config_list *run_for_list(struct afb_config_list *list,
 
 static int run_start(void *closure, char *value)
 {
-	int (*starter) (const char *value) = closure;
-	return starter(value) >= 0;
+	int (*starter) (const char *value, struct afb_apiset *apiset) = closure;
+	return starter(value, main_apiset) >= 0;
 }
 
-static void start_list(struct afb_config_list *list,
-		       int (*starter) (const char *value), const char *message)
+static void apiset_start_list(struct afb_config_list *list,
+		       int (*starter) (const char *value, struct afb_apiset *apiset), const char *message)
 {
 	list = run_for_list(list, run_start, starter);
 	if (list) {
@@ -100,11 +108,49 @@ static void start_list(struct afb_config_list *list,
  +--------------------------------------------------------- */
 static void exit_handler()
 {
-	/* TODO: check whether using SIGHUP isn't better */
+	struct sigaction siga;
+
+	memset(&siga, 0, sizeof siga);
+	siga.sa_handler = SIG_IGN;
+	sigaction(SIGTERM, &siga, NULL);
+
 	if (SELF_PGROUP)
-		killpg(0, SIGKILL);
+		killpg(0, SIGTERM);
 	else if (childpid > 0)
-		killpg(childpid, SIGKILL);
+		killpg(childpid, SIGTERM);
+}
+
+static void on_sigterm(int signum, siginfo_t *info, void *uctx)
+{
+	NOTICE("Received SIGTERM");
+	exit(0);
+}
+
+static void on_sighup(int signum, siginfo_t *info, void *uctx)
+{
+	NOTICE("Received SIGHUP");
+	/* TODO */
+}
+
+static void setup_daemon()
+{
+	struct sigaction siga;
+
+	/* install signal handlers */
+	memset(&siga, 0, sizeof siga);
+	siga.sa_flags = SA_SIGINFO;
+
+	siga.sa_sigaction = on_sigterm;
+	sigaction(SIGTERM, &siga, NULL);
+
+	siga.sa_sigaction = on_sighup;
+	sigaction(SIGHUP, &siga, NULL);
+
+	/* handle groups */
+	atexit(exit_handler);
+
+	/* ignore any SIGPIPE */
+	signal(SIGPIPE, SIG_IGN);
 }
 
 /*----------------------------------------------------------
@@ -117,7 +163,7 @@ static void daemonize()
 	int pid;
 
 	// open /dev/console to redirect output messAFBes
-	consoleFD = open(config->console, O_WRONLY | O_APPEND | O_CREAT, 0640);
+	consoleFD = open(main_config->console, O_WRONLY | O_APPEND | O_CREAT, 0640);
 	if (consoleFD < 0) {
 		ERROR("AFB-daemon cannot open /dev/console (use --foreground)");
 		exit(1);
@@ -136,7 +182,7 @@ static void daemonize()
 
 	// son process get all data in standalone mode
 	NOTICE("background mode [pid:%d console:%s]", getpid(),
-	       config->console);
+	       main_config->console);
 
 	// redirect default I/O on console
 	close(2);
@@ -174,25 +220,25 @@ static int init_alias(void *closure, char *spec)
 static int init_http_server(struct afb_hsrv *hsrv)
 {
 	if (!afb_hsrv_add_handler
-	    (hsrv, config->rootapi, afb_hswitch_websocket_switch, NULL, 20))
+	    (hsrv, main_config->rootapi, afb_hswitch_websocket_switch, main_apiset, 20))
 		return 0;
 
 	if (!afb_hsrv_add_handler
-	    (hsrv, config->rootapi, afb_hswitch_apis, NULL, 10))
+	    (hsrv, main_config->rootapi, afb_hswitch_apis, main_apiset, 10))
 		return 0;
 
-	if (run_for_list(config->aliases, init_alias, hsrv))
+	if (run_for_list(main_config->aliases, init_alias, hsrv))
 		return 0;
 
-	if (config->roothttp != NULL) {
+	if (main_config->roothttp != NULL) {
 		if (!afb_hsrv_add_alias
-		    (hsrv, "", afb_common_rootdir_get_fd(), config->roothttp,
+		    (hsrv, "", afb_common_rootdir_get_fd(), main_config->roothttp,
 		     -10, 1))
 			return 0;
 	}
 
 	if (!afb_hsrv_add_handler
-	    (hsrv, config->rootbase, afb_hswitch_one_page_api_redirect, NULL,
+	    (hsrv, main_config->rootbase, afb_hswitch_one_page_api_redirect, NULL,
 	     -20))
 		return 0;
 
@@ -204,8 +250,8 @@ static struct afb_hsrv *start_http_server()
 	int rc;
 	struct afb_hsrv *hsrv;
 
-	if (afb_hreq_init_download_path(config->uploaddir)) {
-		ERROR("unable to set the upload directory %s", config->uploaddir);
+	if (afb_hreq_init_download_path(main_config->uploaddir)) {
+		ERROR("unable to set the upload directory %s", main_config->uploaddir);
 		return NULL;
 	}
 
@@ -215,17 +261,17 @@ static struct afb_hsrv *start_http_server()
 		return NULL;
 	}
 
-	if (!afb_hsrv_set_cache_timeout(hsrv, config->cacheTimeout)
+	if (!afb_hsrv_set_cache_timeout(hsrv, main_config->cacheTimeout)
 	    || !init_http_server(hsrv)) {
 		ERROR("initialisation of httpd failed");
 		afb_hsrv_put(hsrv);
 		return NULL;
 	}
 
-	NOTICE("Waiting port=%d rootdir=%s", config->httpdPort, config->rootdir);
-	NOTICE("Browser URL= http:/*localhost:%d", config->httpdPort);
+	NOTICE("Waiting port=%d rootdir=%s", main_config->httpdPort, main_config->rootdir);
+	NOTICE("Browser URL= http://localhost:%d", main_config->httpdPort);
 
-	rc = afb_hsrv_start(hsrv, (uint16_t) config->httpdPort, 15);
+	rc = afb_hsrv_start(hsrv, (uint16_t) main_config->httpdPort, 15);
 	if (!rc) {
 		ERROR("starting of httpd failed");
 		afb_hsrv_put(hsrv);
@@ -237,7 +283,6 @@ static struct afb_hsrv *start_http_server()
 
 /*---------------------------------------------------------
  | execute_command
- |   
  +--------------------------------------------------------- */
 
 static void on_sigchld(int signum, siginfo_t *info, void *uctx)
@@ -305,7 +350,7 @@ static char *instanciate_string(char *arg, const char *port, const char *token)
 		switch(*++it) {
 		case 'p': wr = stpcpy(wr, port); break;
 		case 't': wr = stpcpy(wr, token); break;
-		default: *wr++ = SUBST_CHAR;
+		default: *wr++ = SUBST_CHAR; /*@fallthrough@*/
 		case SUBST_CHAR: *wr++ = *it;
 		}
 		arg = ++it;
@@ -337,11 +382,11 @@ static int instanciate_command_args(const char *port, const char *token)
 	int i;
 
 	/* instanciate the arguments */
-	for (i = 0 ; config->exec[i] ; i++) {
-		repl = instanciate_string(config->exec[i], port, token);
+	for (i = 0 ; main_config->exec[i] ; i++) {
+		repl = instanciate_string(main_config->exec[i], port, token);
 		if (!repl)
 			return -1;
-		config->exec[i] = repl;
+		main_config->exec[i] = repl;
 	}
 	return 0;
 }
@@ -350,10 +395,11 @@ static int execute_command()
 {
 	struct sigaction siga;
 	char port[20];
+	const char *token;
 	int rc;
 
 	/* check whether a command is to execute or not */
-	if (!config->exec || !config->exec[0])
+	if (!main_config->exec || !main_config->exec[0])
 		return 0;
 
 	if (SELF_PGROUP)
@@ -371,8 +417,8 @@ static int execute_command()
 		return 0;
 
 	/* compute the string for port */
-	if (config->httpdPort)
-		rc = snprintf(port, sizeof port, "%d", config->httpdPort);
+	if (main_config->httpdPort)
+		rc = snprintf(port, sizeof port, "%d", main_config->httpdPort);
 	else
 		rc = snprintf(port, sizeof port, "%cp", SUBST_CHAR);
 	if (rc < 0 || rc >= (int)(sizeof port)) {
@@ -380,13 +426,14 @@ static int execute_command()
 	}
 	else {
 		/* instanciate arguments and environment */
-		if (instanciate_command_args(port, config->token) >= 0
-		 && instanciate_environ(port, config->token) >= 0) {
+		token = afb_session_initial_token();
+		if (instanciate_command_args(port, token) >= 0
+		 && instanciate_environ(port, token) >= 0) {
 			/* run */
 			if (!SELF_PGROUP)
 				setpgid(0, 0);
-			execv(config->exec[0], config->exec);
-			ERROR("can't launch %s: %m", config->exec[0]);
+			execv(main_config->exec[0], main_config->exec);
+			ERROR("can't launch %s: %m", main_config->exec[0]);
 		}
 	}
 	exit(1);
@@ -394,129 +441,248 @@ static int execute_command()
 }
 
 /*---------------------------------------------------------
- | main event processing
+ | startup calls
  +--------------------------------------------------------- */
 
-static void main_event_wait_and_dispatch(int signum, void *closure)
+struct startup_req
 {
-	struct sd_event *event = closure;
-	if (signum == 0)
-		sd_event_run(event, 30000000);
-}
-
-/*---------------------------------------------------------
- | main
- |   Parse option and launch action
- +--------------------------------------------------------- */
-
-int main(int argc, char *argv[])
+	struct afb_xreq xreq;
+	char *api;
+	char *verb;
+	struct afb_config_list *current;
+	struct afb_session *session;
+};
+
+static void startup_call_reply(struct afb_xreq *xreq, int status, struct json_object *obj)
 {
-	struct afb_hsrv *hsrv;
-
-	// let's run this program with a low priority
-	nice(20);
-
-	LOGAUTH("afb-daemon");
+	struct startup_req *sreq = CONTAINER_OF_XREQ(struct startup_req, xreq);
 
-	sd_fds_init();
+	if (status >= 0)
+		NOTICE("startup call %s returned %s", sreq->current->value, json_object_get_string(obj));
+	else {
+		ERROR("startup call %s ERROR! %s", sreq->current->value, json_object_get_string(obj));
+		exit(1);
+	}
+}
 
-	// ------------- Build session handler & init config -------
-	config = afb_config_parse_arguments(argc, argv);
-	atexit(exit_handler);
+static void startup_call_current(struct startup_req *sreq);
 
-	if (sig_monitor_init() < 0) {
-		ERROR("failed to initialise signal handlers");
-		return 1;
+static void startup_call_unref(struct afb_xreq *xreq)
+{
+	struct startup_req *sreq = CONTAINER_OF_XREQ(struct startup_req, xreq);
+
+	free(sreq->api);
+	free(sreq->verb);
+	json_object_put(sreq->xreq.json);
+	sreq->current = sreq->current->next;
+	if (sreq->current)
+		startup_call_current(sreq);
+	else {
+		afb_session_close(sreq->session);
+		afb_session_unref(sreq->session);
+		free(sreq);
 	}
+}
 
-	if (jobs_init(3, 1, 20) < 0) {
-		ERROR("failed to initialise threading");
-		return 1;
-	}
+static struct afb_xreq_query_itf startup_xreq_itf =
+{
+	.reply = startup_call_reply,
+	.unref = startup_call_unref
+};
 
-	// ------------------ sanity check ----------------------------------------
-	if (config->httpdPort <= 0) {
-		ERROR("no port is defined");
-		exit(1);
+static void startup_call_current(struct startup_req *sreq)
+{
+	char *api, *verb, *json;
+
+	api = sreq->current->value;
+	verb = strchr(api, '/');
+	if (verb) {
+		json = strchr(verb, ':');
+		if (json) {
+			afb_xreq_init(&sreq->xreq, &startup_xreq_itf);
+			afb_context_init(&sreq->xreq.context, sreq->session, NULL);
+			sreq->xreq.context.validated = 1;
+			sreq->api = strndup(api, verb - api);
+			sreq->verb = strndup(verb + 1, json - verb - 1);
+			sreq->xreq.request.api = sreq->api;
+			sreq->xreq.request.verb = sreq->verb;
+			sreq->xreq.json = json_tokener_parse(json + 1);
+			if (sreq->api && sreq->verb && sreq->xreq.json) {
+				afb_xreq_process(&sreq->xreq, main_apiset);
+				return;
+			}
+		}
 	}
+	ERROR("Bad call specification %s", sreq->current->value);
+	exit(1);
+}
 
-	mkdir(config->workdir, S_IRWXU | S_IRGRP | S_IXGRP);
-	if (chdir(config->workdir) < 0) {
-		ERROR("Can't enter working dir %s", config->workdir);
-		exit(1);
+static void run_startup_calls()
+{
+	struct afb_config_list *list;
+	struct startup_req *sreq;
+
+	list = main_config->calls;
+	if (list) {
+		sreq = calloc(1, sizeof *sreq);
+		sreq->session = afb_session_create(3600);
+		sreq->current = list;
+		startup_call_current(sreq);
 	}
+}
 
-	afb_api_so_set_timeout(config->apiTimeout);
-	start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
-	start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client");
-	start_list(config->ldpaths, afb_api_so_add_pathset, "the binding path set");
-	start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
+/*---------------------------------------------------------
+ | job for starting the daemon
+ +--------------------------------------------------------- */
 
-	afb_session_init(config->nbSessionMax, config->cntxTimeout, config->token);
+static void start(int signum, void *arg)
+{
+	struct afb_hsrv *hsrv;
 
-	start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
-	start_list(config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
+	afb_debug("start-entry");
 
-	if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) {
-		ERROR("initialisation of cookies failed");
+	if (signum) {
+		ERROR("start aborted: received signal %s", strsignal(signum));
 		exit(1);
 	}
 
-	// set the root dir
-	if (afb_common_rootdir_set(config->rootdir) < 0) {
+	/* set the directories */
+	mkdir(main_config->workdir, S_IRWXU | S_IRGRP | S_IXGRP);
+	if (chdir(main_config->workdir) < 0) {
+		ERROR("Can't enter working dir %s", main_config->workdir);
+		goto error;
+	}
+	if (afb_common_rootdir_set(main_config->rootdir) < 0) {
 		ERROR("failed to set common root directory");
-		return 1;
+		goto error;
 	}
 
-	// ------------------ Finaly Process Commands -----------------------------
-	// let's not take the risk to run as ROOT
-	//if (getuid() == 0)  goto errorNoRoot;
-
-	DEBUG("Init config done");
-
-	// --------- run -----------
-	if (config->background) {
-		// --------- in background mode -----------
-		INFO("entering background mode");
-		daemonize();
-	} else {
-		// ---- in foreground mode --------------------
-		INFO("entering foreground mode");
+	/* configure the daemon */
+	if (afb_session_init(main_config->nbSessionMax, main_config->cntxTimeout, main_config->token)) {
+		ERROR("initialisation of session manager failed");
+		goto error;
+	}
+	main_apiset = afb_apiset_create("main", main_config->apiTimeout);
+	if (!main_apiset) {
+		ERROR("can't create main api set");
+		goto error;
+	}
+	if (afb_monitor_init() < 0) {
+		ERROR("failed to setup monitor");
+		goto error;
+	}
+	if (afb_supervision_init() < 0) {
+		ERROR("failed to setup supervision");
+		goto error;
 	}
 
-	/* ignore any SIGPIPE */
-	signal(SIGPIPE, SIG_IGN);
+	/* install hooks */
+	if (main_config->tracereq)
+		afb_hook_create_xreq(NULL, NULL, NULL, main_config->tracereq, NULL, NULL);
+	if (main_config->traceditf)
+		afb_hook_create_ditf(NULL, main_config->traceditf, NULL, NULL);
+	if (main_config->tracesvc)
+		afb_hook_create_svc(NULL, main_config->tracesvc, NULL, NULL);
+	if (main_config->traceevt)
+		afb_hook_create_evt(NULL, main_config->traceevt, NULL, NULL);
+	if (main_config->traceses)
+		afb_hook_create_session(NULL, main_config->traceses, NULL, NULL);
+
+	/* load bindings */
+	afb_debug("start-load");
+	apiset_start_list(main_config->so_bindings, afb_api_so_add_binding, "the binding");
+	apiset_start_list(main_config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
+	apiset_start_list(main_config->ws_clients, afb_api_ws_add_client_weak, "the afb-websocket client");
+	apiset_start_list(main_config->ldpaths, afb_api_so_add_pathset_fails, "the binding path set");
+	apiset_start_list(main_config->weak_ldpaths, afb_api_so_add_pathset_nofails, "the weak binding path set");
+
+	apiset_start_list(main_config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
+	apiset_start_list(main_config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
 
-	/* install trace of requests */
-	if (config->tracereq)
-		afb_hook_req_create(NULL, NULL, NULL, config->tracereq, NULL, NULL);
+	DEBUG("Init config done");
 
 	/* start the services */
-	if (afb_apis_start_all_services(1) < 0)
-		exit(1);
+	afb_debug("start-start");
+#if !defined(NO_CALL_PERSONALITY)
+	personality((unsigned long)-1L);
+#endif
+	if (afb_apiset_start_all_services(main_apiset, 1) < 0)
+		goto error;
 
 	/* start the HTTP server */
-	if (!config->noHttpd) {
+	afb_debug("start-http");
+	if (!main_config->noHttpd) {
+		if (main_config->httpdPort <= 0) {
+			ERROR("no port is defined");
+			goto error;
+		}
+
+		if (!afb_hreq_init_cookie(main_config->httpdPort, main_config->rootapi, main_config->cntxTimeout)) {
+			ERROR("initialisation of HTTP cookies failed");
+			goto error;
+		}
+
 		hsrv = start_http_server();
 		if (hsrv == NULL)
-			exit(1);
+			goto error;
 	}
 
+	/* run the startup calls */
+	afb_debug("start-call");
+	run_startup_calls();
+
 	/* run the command */
+	afb_debug("start-exec");
 	if (execute_command() < 0)
-		exit(1);
-
-	/* records the loop */
-	if (jobs_add_events(NULL, 0, main_event_wait_and_dispatch, afb_common_get_event_loop()) < 0) {
-		ERROR("failed to set main_event_wait_and_dispatch");
-		return 1;
-	}
+		goto error;
 
 	/* ready */
 	sd_notify(1, "READY=1");
+	return;
+error:
+	exit(1);
+}
 
-	/* turn as processing thread */
-	jobs_add_me();
-	WARNING("hoops returned from jobs_add_me! [report bug]");
-	return 0;
+/*---------------------------------------------------------
+ | main
+ |   Parse option and launch action
+ +--------------------------------------------------------- */
+
+int main(int argc, char *argv[])
+{
+	afb_debug("main-entry");
+
+	// let's run this program with a low priority
+	nice(20);
+
+	// ------------- Build session handler & init config -------
+	main_config = afb_config_parse_arguments(argc, argv);
+	if (main_config->name) {
+		verbose_set_name(main_config->name, 0);
+		process_name_set_name(main_config->name);
+		process_name_replace_cmdline(argv, main_config->name);
+	}
+	afb_debug("main-args");
+
+	// --------- run -----------
+	if (main_config->background) {
+		// --------- in background mode -----------
+		INFO("entering background mode");
+		daemonize();
+	} else {
+		// ---- in foreground mode --------------------
+		INFO("entering foreground mode");
+	}
+	INFO("running with pid %d", getpid());
+
+	/* set the daemon environment */
+	setup_daemon();
+
+	afb_debug("main-start");
+
+	/* enter job processing */
+	jobs_start(3, 0, 50, start, NULL);
+	WARNING("hoops returned from jobs_enter! [report bug]");
+	return 1;
 }
+