X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=6b89aef13e908fb0fa887b0a9602aa35b499768c;hb=305d98f7b6db1a3207cc877bd2cda819e3b90656;hp=01c06095923c35099f3f445d65cf594aaa3e090e;hpb=a8e971702f23ee67e02b4716ad4159f12cefdca6;p=src%2Fapp-framework-binder.git

diff --git a/src/main.c b/src/main.c
index 01c06095..6b89aef1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,10 +17,12 @@
  */
 
 #define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
+#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
+#include <signal.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -29,11 +31,8 @@
 
 #include <json-c/json.h>
 
-#include <systemd/sd-event.h>
 #include <systemd/sd-daemon.h>
 
-#include <afb/afb-binding.h>
-
 #include "afb-config.h"
 #include "afb-hswitch.h"
 #include "afb-apiset.h"
@@ -41,14 +40,13 @@
 #include "afb-api-dbus.h"
 #include "afb-api-ws.h"
 #include "afb-hsrv.h"
-#include "afb-context.h"
 #include "afb-hreq.h"
 #include "afb-xreq.h"
-#include "afb-cred.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"
 
@@ -115,7 +113,6 @@ static void exit_handler()
 		killpg(0, SIGTERM);
 	else if (childpid > 0)
 		killpg(childpid, SIGTERM);
-	exit(0);
 }
 
 static void on_sigterm(int signum, siginfo_t *info, void *uctx)
@@ -471,7 +468,6 @@ static void startup_call_unref(struct afb_xreq *xreq)
 	free(sreq->api);
 	free(sreq->verb);
 	json_object_put(sreq->xreq.json);
-	afb_cred_unref(sreq->xreq.cred);
 	sreq->current = sreq->current->next;
 	if (sreq->current)
 		startup_call_current(sreq);
@@ -497,11 +493,9 @@ static void startup_call_current(struct startup_req *sreq)
 	if (verb) {
 		json = strchr(verb, ':');
 		if (json) {
-			memset(&sreq->xreq, 0, sizeof sreq->xreq);
 			afb_xreq_init(&sreq->xreq, &startup_xreq_itf);
 			afb_context_init(&sreq->xreq.context, sreq->session, NULL);
 			sreq->xreq.context.validated = 1;
-			sreq->xreq.cred = afb_cred_current();
 			sreq->api = strndup(api, verb - api);
 			sreq->verb = strndup(verb + 1, json - verb - 1);
 			sreq->xreq.api = sreq->api;
@@ -535,10 +529,15 @@ static void run_startup_calls()
  | job for starting the daemon
  +--------------------------------------------------------- */
 
-static void start()
+static void start(int signum)
 {
 	struct afb_hsrv *hsrv;
 
+	if (signum) {
+		ERROR("start aborted: received signal %s", strsignal(signum));
+		exit(1);
+	}
+
 	// ------------------ sanity check ----------------------------------------
 	if (config->httpdPort <= 0) {
 		ERROR("no port is defined");
@@ -557,14 +556,18 @@ static void start()
 	}
 
 	/* configure the daemon */
-	main_apiset = afb_apiset_create("main", config->apiTimeout, NULL);
+	afb_session_init(config->nbSessionMax, config->cntxTimeout, config->token);
+	if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) {
+		ERROR("initialisation of cookies failed");
+		goto error;
+	}
+	main_apiset = afb_apiset_create("main", config->apiTimeout);
 	if (!main_apiset) {
 		ERROR("can't create main api set");
 		goto error;
 	}
-	afb_session_init(config->nbSessionMax, config->cntxTimeout, config->token);
-	if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) {
-		ERROR("initialisation of cookies failed");
+	if (afb_monitor_init() < 0) {
+		ERROR("failed to setup monitor");
 		goto error;
 	}
 
@@ -573,6 +576,10 @@ static void start()
 		afb_hook_create_xreq(NULL, NULL, NULL, config->tracereq, NULL, NULL);
 	if (config->traceditf)
 		afb_hook_create_ditf(NULL, config->traceditf, NULL, NULL);
+	if (config->tracesvc)
+		afb_hook_create_svc(NULL, config->tracesvc, NULL, NULL);
+	if (config->traceevt)
+		afb_hook_create_evt(NULL, config->traceevt, NULL, NULL);
 
 	/* load bindings */
 	apiset_start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");