X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=abe100b0ef6a7e83032650928f822e4173701c16;hb=645b2320fb04edda76e5761a439c865994f36b3a;hp=9b7e994f467582cf70d7852ad50aa5ad0f13aed9;hpb=e52a48e88d80303e8d857f6757e60a5839d64e0f;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index 9b7e994f..abe100b0 100644
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define NO_PLUGIN_VERBOSE_MACRO
 
 #include <stdio.h>
 #include <assert.h>
@@ -39,16 +40,19 @@
 #include "afb-sig-handler.h"
 #include "verbose.h"
 
+/*
+ * Description of a plugin
+ */
 struct api_so_desc {
 	struct AFB_plugin *plugin;	/* descriptor */
-	size_t apilength;
+	size_t apilength;		/* length of the API name */
 	void *handle;			/* context of dlopen */
-	struct AFB_interface interface;	/* interface */
+	struct AFB_interface interface;	/* interface for the plugin */
 };
 
 static int api_timeout = 15;
 
-static const char plugin_register_function[] = "pluginAfbV1Register";
+static const char plugin_register_function_v1[] = "pluginAfbV1Register";
 
 static void afb_api_so_event_sender_push(struct api_so_desc *desc, const char *name, struct json_object *object)
 {
@@ -73,11 +77,24 @@ static struct afb_event_sender afb_api_so_get_event_sender(struct api_so_desc *d
 	return (struct afb_event_sender){ .itf = &event_sender_itf, .closure = desc };
 }
 
+static void afb_api_so_vverbose(struct api_so_desc *desc, int level, const char *file, int line, const char *fmt, va_list args)
+{
+	char *p;
+
+	if (vasprintf(&p, fmt, args) < 0)
+		vverbose(level, file, line, fmt, args);
+	else {
+		verbose(level, file, line, "%s {plugin %s}", p, desc->plugin->v1.prefix);
+		free(p);
+	}
+}
+
 static const struct afb_daemon_itf daemon_itf = {
 	.get_event_sender = (void*)afb_api_so_get_event_sender,
 	.get_event_loop = (void*)afb_common_get_event_loop,
 	.get_user_bus = (void*)afb_common_get_user_bus,
-	.get_system_bus = (void*)afb_common_get_system_bus
+	.get_system_bus = (void*)afb_common_get_system_bus,
+	.vverbose = (void*)afb_api_so_vverbose
 };
 
 struct monitoring {
@@ -97,9 +114,9 @@ static void call_check(struct afb_req req, struct afb_context *context, const st
 {
 	struct monitoring data;
 
-	int stag = (int)(verb->session & AFB_SESSION_MASK);
+	int stag = (int)verb->session;
 
-	if (stag != AFB_SESSION_NONE) {
+	if ((stag & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
 		if (!afb_context_check(context)) {
 			afb_context_close(context);
 			afb_req_fail(req, "failed", "invalid token's identity");
@@ -108,18 +125,37 @@ static void call_check(struct afb_req req, struct afb_context *context, const st
 	}
 
 	if ((stag & AFB_SESSION_CREATE) != 0) {
-		if (!afb_context_create(context)) {
-			afb_context_close(context);
+		if (afb_context_check_loa(context, 1)) {
 			afb_req_fail(req, "failed", "invalid creation state");
 			return;
 		}
+		afb_context_change_loa(context, 1);
+		afb_context_refresh(context);
 	}
 	
 	if ((stag & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0)
 		afb_context_refresh(context);
 
-	if ((stag & AFB_SESSION_CLOSE) != 0)
+	if ((stag & AFB_SESSION_CLOSE) != 0) {
+		afb_context_change_loa(context, 0);
 		afb_context_close(context);
+	}
+
+	if ((stag & AFB_SESSION_LOA_GE) != 0) {
+		int loa = (stag >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
+		if (!afb_context_check_loa(context, loa)) {
+			afb_req_fail(req, "failed", "invalid LOA");
+			return;
+		}
+	}
+
+	if ((stag & AFB_SESSION_LOA_LE) != 0) {
+		int loa = (stag >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
+		if (afb_context_check_loa(context, loa + 1)) {
+			afb_req_fail(req, "failed", "invalid LOA");
+			return;
+		}
+	}
 
 	data.req = req;
 	data.action = verb->callback;
@@ -141,37 +177,44 @@ static void call(struct api_so_desc *desc, struct afb_req req, struct afb_contex
 
 int afb_api_so_add_plugin(const char *path)
 {
+	int rc;
+	void *handle;
 	struct api_so_desc *desc;
 	struct AFB_plugin *(*pluginAfbV1RegisterFct) (const struct AFB_interface *interface);
 
-	desc = calloc(1, sizeof *desc);
-	if (desc == NULL) {
-		ERROR("out of memory");
-		goto error;
-	}
-
 	// This is a loadable library let's check if it's a plugin
-	desc->handle = dlopen(path, RTLD_NOW | RTLD_LOCAL);
-	if (desc->handle == NULL) {
+	rc = 0;
+	handle = dlopen(path, RTLD_NOW | RTLD_LOCAL);
+	if (handle == NULL) {
 		ERROR("plugin [%s] not loadable", path);
-		goto error2;
+		goto error;
 	}
 
 	/* retrieves the register function */
-	pluginAfbV1RegisterFct = dlsym(desc->handle, plugin_register_function);
+	pluginAfbV1RegisterFct = dlsym(handle, plugin_register_function_v1);
 	if (!pluginAfbV1RegisterFct) {
 		ERROR("plugin [%s] is not an AFB plugin", path);
-		goto error3;
+		goto error2;
 	}
 	INFO("plugin [%s] is a valid AFB plugin", path);
+	rc = -1;
+
+	/* allocates the description */
+	desc = calloc(1, sizeof *desc);
+	if (desc == NULL) {
+		ERROR("out of memory");
+		goto error2;
+	}
+	desc->handle = handle;
 
 	/* init the interface */
-	desc->interface.verbosity = 0;
+	desc->interface.verbosity = verbosity;
 	desc->interface.mode = AFB_MODE_LOCAL;
 	desc->interface.daemon.itf = &daemon_itf;
 	desc->interface.daemon.closure = desc;
 
 	/* init the plugin */
+	NOTICE("plugin [%s] calling registering function %s", path, plugin_register_function_v1);
 	desc->plugin = pluginAfbV1RegisterFct(&desc->interface);
 	if (desc->plugin == NULL) {
 		ERROR("plugin [%s] register function failed. continuing...", path);
@@ -187,6 +230,10 @@ int afb_api_so_add_plugin(const char *path)
 		ERROR("plugin [%s] bad prefix...", path);
 		goto error3;
 	}
+	if (!afb_apis_is_valid_api_name(desc->plugin->v1.prefix)) {
+		ERROR("plugin [%s] invalid prefix...", path);
+		goto error3;
+	}
 	if (desc->plugin->v1.info == NULL || *desc->plugin->v1.info == 0) {
 		ERROR("plugin [%s] bad description...", path);
 		goto error3;
@@ -208,11 +255,11 @@ int afb_api_so_add_plugin(const char *path)
 	return 0;
 
 error3:
-	dlclose(desc->handle);
-error2:
 	free(desc);
+error2:
+	dlclose(handle);
 error:
-	return -1;
+	return rc;
 }
 
 static int adddirs(char path[PATH_MAX], size_t end)
@@ -256,7 +303,8 @@ static int adddirs(char path[PATH_MAX], size_t end)
 			/* case of files */
 			if (!strstr(ent.d_name, ".so"))
 				continue;
-			afb_api_so_add_plugin(path);
+			if (afb_api_so_add_plugin(path) < 0)
+				return -1;
 		}
 	}
 	closedir(dir);
@@ -305,7 +353,8 @@ int afb_api_so_add_pathset(const char *pathset)
 		p = strsep(&ps, sep);
 		if (!p)
 			return 0;
-		afb_api_so_add_path(p);
-	};
+		if (afb_api_so_add_path(p) < 0)
+			return -1;
+	}
 }