X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=b8bad9458faceaa54010ac874d946c164a737249;hb=350f165da982685f2ea7c6d0899e9711b2c35982;hp=150b78102b9bd1a57d34a9197f613219c7b7bd35;hpb=79ccbbb1843431c8b4acb3230e82d5cff415c7a4;p=src%2Fapp-framework-binder.git

diff --git a/src/main.c b/src/main.c
index 150b7810..b8bad945 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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;
 }