X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=b8bad9458faceaa54010ac874d946c164a737249;hb=5fccb2dcb97fac7fbc16d66e947477e41d30a2b4;hp=91c7aae74a592a3896e1a98e6f40aee37f9e5acf;hpb=ec24e3d8779623dbddef97d8b8371609fdf81fa5;p=src%2Fapp-framework-binder.git

diff --git a/src/main.c b/src/main.c
index 91c7aae7..b8bad945 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,7 +17,6 @@
  */
 
 #define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -284,7 +283,6 @@ static struct afb_hsrv *start_http_server()
 
 /*---------------------------------------------------------
  | execute_command
- |   
  +--------------------------------------------------------- */
 
 static void on_sigchld(int signum, siginfo_t *info, void *uctx)
@@ -397,6 +395,7 @@ static int execute_command()
 {
 	struct sigaction siga;
 	char port[20];
+	const char *token;
 	int rc;
 
 	/* check whether a command is to execute or not */
@@ -427,8 +426,9 @@ 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);
@@ -504,8 +504,8 @@ static void startup_call_current(struct startup_req *sreq)
 			sreq->xreq.context.validated = 1;
 			sreq->api = strndup(api, verb - api);
 			sreq->verb = strndup(verb + 1, json - verb - 1);
-			sreq->xreq.api = sreq->api;
-			sreq->xreq.verb = sreq->verb;
+			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);
@@ -525,7 +525,7 @@ static void run_startup_calls()
 	list = config->calls;
 	if (list) {
 		sreq = calloc(1, sizeof *sreq);
-		sreq->session = afb_session_create("startup", 3600);
+		sreq->session = afb_session_create(3600);
 		sreq->current = list;
 		startup_call_current(sreq);
 	}
@@ -535,7 +535,7 @@ static void run_startup_calls()
  | job for starting the daemon
  +--------------------------------------------------------- */
 
-static void start(int signum)
+static void start(int signum, void *arg)
 {
 	struct afb_hsrv *hsrv;
 
@@ -546,12 +546,6 @@ static void start(int signum)
 		exit(1);
 	}
 
-	// ------------------ sanity check ----------------------------------------
-	if (config->httpdPort <= 0) {
-		ERROR("no port is defined");
-		goto error;
-	}
-
 	/* set the directories */
 	mkdir(config->workdir, S_IRWXU | S_IRGRP | S_IXGRP);
 	if (chdir(config->workdir) < 0) {
@@ -564,9 +558,8 @@ static void start(int signum)
 	}
 
 	/* configure the daemon */
-	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_session_init(config->nbSessionMax, config->cntxTimeout, config->token)) {
+		ERROR("initialisation of session manager failed");
 		goto error;
 	}
 	main_apiset = afb_apiset_create("main", config->apiTimeout);
@@ -593,7 +586,7 @@ static void start(int signum)
 	afb_debug("start-load");
 	apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
 	apiset_start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
-	apiset_start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client");
+	apiset_start_list(config->ws_clients, afb_api_ws_add_client_weak, "the afb-websocket client");
 	apiset_start_list(config->ldpaths, afb_api_so_add_pathset_fails, "the binding path set");
 	apiset_start_list(config->weak_ldpaths, afb_api_so_add_pathset_nofails, "the weak binding path set");
 
@@ -613,6 +606,16 @@ static void start(int signum)
 	/* start the HTTP server */
 	afb_debug("start-http");
 	if (!config->noHttpd) {
+		if (config->httpdPort <= 0) {
+			ERROR("no port is defined");
+			goto error;
+		}
+
+		if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) {
+			ERROR("initialisation of HTTP cookies failed");
+			goto error;
+		}
+
 		hsrv = start_http_server();
 		if (hsrv == NULL)
 			goto error;
@@ -674,7 +677,7 @@ int main(int argc, char *argv[])
 	afb_debug("main-start");
 
 	/* enter job processing */
-	jobs_start(3, 0, 50, start);
+	jobs_start(3, 0, 50, start, NULL);
 	WARNING("hoops returned from jobs_enter! [report bug]");
 	return 1;
 }