X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=b741b13ae527a95ef3f4e07bc59f80b8f4545f5c;hb=b41ed8f8cbbdf7cff415f69f6f9b4a92cfe1f37d;hp=408c3f5a87437d271e8a2cd0afc9b83ce8a06e53;hpb=779f425daa66d2b0cd431fdc6f7f4ed976cbae15;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index 408c3f5a..b741b13a 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>
@@ -29,7 +30,6 @@
 
 #include <afb/afb-plugin.h>
 #include <afb/afb-req-itf.h>
-#include <afb/afb-event-sender-itf.h>
 
 #include "session.h"
 #include "afb-common.h"
@@ -39,18 +39,26 @@
 #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";
+
+void afb_api_so_set_timeout(int to)
+{
+	api_timeout = to;
+}
 
-static void afb_api_so_event_sender_push(struct api_so_desc *desc, const char *name, struct json_object *object)
+static int afb_api_so_event_broadcast(struct api_so_desc *desc, const char *name, struct json_object *object)
 {
 	size_t length;
 	char *event;
@@ -61,23 +69,27 @@ static void afb_api_so_event_sender_push(struct api_so_desc *desc, const char *n
 	memcpy(event, desc->plugin->v1.prefix, desc->apilength);
 	event[desc->apilength] = '/';
 	memcpy(event + desc->apilength + 1, name, length + 1);
-	ctxClientEventSend(NULL, event, object);
+	return ctxClientEventSend(NULL, event, object);
 }
 
-static const struct afb_event_sender_itf event_sender_itf = {
-	.push = (void*)afb_api_so_event_sender_push
-};
-
-static struct afb_event_sender afb_api_so_get_event_sender(struct api_so_desc *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)
 {
-	return (struct afb_event_sender){ .itf = &event_sender_itf, .closure = desc };
+	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,
+	.event_broadcast = (void*)afb_api_so_event_broadcast,
 	.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 +109,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 +120,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;
@@ -155,7 +186,7 @@ int afb_api_so_add_plugin(const char *path)
 	}
 
 	/* retrieves the register function */
-	pluginAfbV1RegisterFct = dlsym(handle, plugin_register_function);
+	pluginAfbV1RegisterFct = dlsym(handle, plugin_register_function_v1);
 	if (!pluginAfbV1RegisterFct) {
 		ERROR("plugin [%s] is not an AFB plugin", path);
 		goto error2;
@@ -172,12 +203,13 @@ int afb_api_so_add_plugin(const char *path)
 	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);