X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain-afb-daemon.c;h=077c71631f04c4257c222b6b1d77d1e6794e8c28;hb=5ac7bb0d9d16260d2235820e97ab47943ffc307b;hp=3421be819c5fbd3f789c3a7d0a5e0e82be3e3ef8;hpb=6f13ad1989875b5a0ce50b24211fd1fba093735f;p=src%2Fapp-framework-binder.git

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index 3421be81..077c7163 100644
--- a/src/main-afb-daemon.c
+++ b/src/main-afb-daemon.c
@@ -544,7 +544,7 @@ static char **instanciate_command_args(struct json_object *exec, const char *por
 
 static int execute_command()
 {
-	struct json_object *exec, *oport;
+	struct json_object *exec, *oport, *otok;
 	struct sigaction siga;
 	char port[20];
 	const char *token;
@@ -579,7 +579,10 @@ static int execute_command()
 	}
 	else {
 		/* instantiate arguments and environment */
-		token = afb_session_initial_token();
+		if (json_object_object_get_ex(main_config, "token", &otok))
+			token = json_object_get_string(otok);
+		else
+			token = SUBST_STR"p";
 		args = instanciate_command_args(exec, port, token);
 		if (args && instanciate_environ(port, token) >= 0) {
 			/* run */
@@ -659,8 +662,7 @@ static void startup_call_current(struct startup_req *sreq)
 		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;
+			afb_context_init_validated(&sreq->xreq.context, sreq->session);
 			sreq->api = strndup(api, verb - api);
 			sreq->verb = strndup(verb + 1, json - verb - 1);
 			sreq->xreq.request.called_api = sreq->api;
@@ -770,7 +772,7 @@ static void start(int signum, void *arg)
 	}
 
 	/* initialize session handling */
-	if (afb_session_init(max_session_count, session_timeout, token)) {
+	if (afb_session_init(max_session_count, session_timeout)) {
 		ERROR("initialisation of session manager failed");
 		goto error;
 	}
@@ -802,7 +804,7 @@ static void start(int signum, void *arg)
 			goto error;
 		}
 		if (addenv_int("AFB_PORT", http_port)
-		 || addenv("AFB_TOKEN", afb_session_initial_token())) {
+		 || addenv("AFB_TOKEN", token?:"")) {
 			ERROR("can't set HTTP environment");
 			goto error;
 		}
@@ -895,7 +897,7 @@ static void start(int signum, void *arg)
 
 	/* run the command */
 	afb_debug("start-exec");
-	if (execute_command() < 0)
+	if (execute_command(http_port, token) < 0)
 		goto error;
 
 	/* ready */