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

diff --git a/src/main.c b/src/main.c
index 01c06095..3541e44c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,7 +20,8 @@
 #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>
@@ -29,11 +30,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,10 +39,8 @@
 #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"
@@ -471,7 +467,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 +492,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;
@@ -557,14 +550,16 @@ 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");
 		goto error;
 	}