X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain-afb-daemon.c;h=cb362a8b7a00b882f846a7eddc6e05155ec8c189;hb=3aa0f4d3c4441e45317b0c825f6a917807288947;hp=3f32e879ca7f937f2e2be64467b195737712a3d9;hpb=f96bbb49cc9bcd81693300191cf7a01b879fd83d;p=src%2Fapp-framework-binder.git

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index 3f32e879..cb362a8b 100644
--- a/src/main-afb-daemon.c
+++ b/src/main-afb-daemon.c
@@ -52,6 +52,7 @@
 #include "afb-session.h"
 #include "verbose.h"
 #include "afb-common.h"
+#include "afb-export.h"
 #include "afb-monitor.h"
 #include "afb-hook.h"
 #include "afb-hook-flags.h"
@@ -172,7 +173,7 @@ static void setup_daemon()
  +--------------------------------------------------------- */
 static void daemonize()
 {
-	int fd, daemon;
+	int fd = 0, daemon;
 	const char *output;
 	pid_t pid;
 
@@ -534,8 +535,7 @@ static void startup_call_unref(struct afb_xreq *xreq)
 	free(sreq->api);
 	free(sreq->verb);
 	json_object_put(sreq->xreq.json);
-	sreq->index++;
-	if (sreq->index < sreq->count)
+	if (++sreq->index < sreq->count)
 		startup_call_current(sreq);
 	else {
 		afb_session_close(sreq->session);
@@ -553,6 +553,7 @@ static struct afb_xreq_query_itf startup_xreq_itf =
 static void startup_call_current(struct startup_req *sreq)
 {
 	const char *api, *verb, *json;
+	enum json_tokener_error jerr;
 
 	sreq->callspec = json_object_get_string(json_object_array_get_idx(sreq->calls, sreq->index)),
 	api = sreq->callspec;
@@ -567,8 +568,8 @@ static void startup_call_current(struct startup_req *sreq)
 			sreq->verb = strndup(verb + 1, json - verb - 1);
 			sreq->xreq.request.called_api = sreq->api;
 			sreq->xreq.request.called_verb = sreq->verb;
-			sreq->xreq.json = json_tokener_parse(json + 1);
-			if (sreq->api && sreq->verb && sreq->xreq.json) {
+			sreq->xreq.json = json_tokener_parse_verbose(json + 1, &jerr);
+			if (sreq->api && sreq->verb && jerr == json_tokener_success) {
 				afb_xreq_process(&sreq->xreq, main_apiset);
 				return;
 			}
@@ -604,6 +605,7 @@ static void start(int signum, void *arg)
 {
 	const char *tracereq, *traceapi, *traceevt, *traceses, *tracesvc, *traceditf, *traceglob;
 	const char *workdir, *rootdir, *token, *rootapi;
+	struct json_object *settings;
 	struct afb_hsrv *hsrv;
 	int max_session_count, session_timeout, api_timeout;
 	int no_httpd, http_port;
@@ -617,6 +619,7 @@ static void start(int signum, void *arg)
 		exit(1);
 	}
 
+	settings = NULL;
 	token = rootapi = tracesvc = traceditf = tracereq =
 		traceapi = traceevt = traceses = traceglob = NULL;
 	no_httpd = http_port = 0;
@@ -624,6 +627,7 @@ static void start(int signum, void *arg)
 			"ss ss s?s"
 			"si si si"
 			"s?b s?i s?s"
+			"s?o"
 #if !defined(REMOVE_LEGACY_TRACE)
 			"s?s s?s"
 #endif
@@ -642,6 +646,7 @@ static void start(int signum, void *arg)
 			"port", &http_port,
 			"rootapi", &rootapi,
 
+			"set", &settings,
 #if !defined(REMOVE_LEGACY_TRACE)
 			"tracesvc", &tracesvc,
 			"traceditf", &traceditf,
@@ -669,6 +674,7 @@ static void start(int signum, void *arg)
 	}
 
 	/* configure the daemon */
+	afb_export_set_config(settings);
 	if (afb_session_init(max_session_count, session_timeout, token)) {
 		ERROR("initialisation of session manager failed");
 		goto error;