X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=150b78102b9bd1a57d34a9197f613219c7b7bd35;hb=0891ef4826e347d5554c630b5c0ce73c68f76c9c;hp=a989a702ff30d7a64786a31c94558225e58d3e2c;hpb=846e952260278225b79de4062fff1f8f2145a544;p=src%2Fapp-framework-binder.git

diff --git a/src/main.c b/src/main.c
index a989a702..150b7810 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>
@@ -29,6 +28,10 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
+#if !defined(NO_CALL_PERSONALITY)
+#include <sys/personality.h>
+#endif
+
 #include <json-c/json.h>
 
 #include <systemd/sd-daemon.h>
@@ -50,6 +53,7 @@
 #include "afb-hook.h"
 #include "sd-fds.h"
 #include "afb-debug.h"
+#include "process-name.h"
 
 /*
    if SELF_PGROUP == 0 the launched command is the group leader
@@ -279,7 +283,6 @@ static struct afb_hsrv *start_http_server()
 
 /*---------------------------------------------------------
  | execute_command
- |   
  +--------------------------------------------------------- */
 
 static void on_sigchld(int signum, siginfo_t *info, void *uctx)
@@ -347,7 +350,7 @@ static char *instanciate_string(char *arg, const char *port, const char *token)
 		switch(*++it) {
 		case 'p': wr = stpcpy(wr, port); break;
 		case 't': wr = stpcpy(wr, token); break;
-		default: *wr++ = SUBST_CHAR;
+		default: *wr++ = SUBST_CHAR; /*@fallthrough@*/
 		case SUBST_CHAR: *wr++ = *it;
 		}
 		arg = ++it;
@@ -392,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 */
@@ -422,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);
@@ -499,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);
@@ -520,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);
 	}
@@ -586,10 +591,11 @@ static void start(int signum)
 
 	/* load bindings */
 	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->ldpaths, afb_api_so_add_pathset, "the binding path set");
-	apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
+	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");
 
 	apiset_start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
 	apiset_start_list(config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
@@ -598,6 +604,9 @@ static void start(int signum)
 
 	/* start the services */
 	afb_debug("start-start");
+#if !defined(NO_CALL_PERSONALITY)
+	personality((unsigned long)-1L);
+#endif
 	if (afb_apiset_start_all_services(main_apiset, 1) < 0)
 		goto error;
 
@@ -641,7 +650,11 @@ int main(int argc, char *argv[])
 
 	// ------------- Build session handler & init config -------
 	config = afb_config_parse_arguments(argc, argv);
-
+	if (config->name) {
+		verbose_set_name(config->name, 0);
+		process_name_set_name(config->name);
+		process_name_replace_cmdline(argv, config->name);
+	}
 	afb_debug("main-args");
 
 	// --------- run -----------