X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v1.c;h=dd2db5bf5568f56fb9e4b691aa00524dc5a64d62;hb=33e615ea0cc26131532f4615ef4a2034488fa48e;hp=739d2557c9a7053ded1d4bc2cc1d59902e4081b9;hpb=4be084408c6d3d7b7f90a2493829c8ce0cebb397;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c
index 739d2557..dd2db5bf 100644
--- a/src/afb-api-so-v1.c
+++ b/src/afb-api-so-v1.c
@@ -16,26 +16,25 @@
  */
 
 #define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
+#include <stdio.h>
 #include <string.h>
 #include <dlfcn.h>
 #include <assert.h>
 
 #include <json-c/json.h>
 
-#include <afb/afb-binding.h>
+#include <afb/afb-binding-v1.h>
 
 #include "afb-api.h"
 #include "afb-api-so-v1.h"
 #include "afb-apiset.h"
-#include "afb-svc.h"
-#include "afb-evt.h"
+#include "afb-export.h"
+//#include "afb-evt.h"
 #include "afb-common.h"
 #include "afb-context.h"
 #include "afb-api-so.h"
 #include "afb-xreq.h"
-#include "afb-ditf.h"
 #include "verbose.h"
 
 /*
@@ -49,10 +48,9 @@ static const char afb_api_so_v1_service_event[] = "afbBindingV1ServiceEvent";
  * Description of a binding
  */
 struct api_so_v1 {
-	struct afb_binding *binding;	/* descriptor */
+	struct afb_binding_v1 *binding;	/* descriptor */
 	void *handle;			/* context of dlopen */
-	struct afb_svc *service;	/* handler for service started */
-	struct afb_ditf ditf;		/* daemon interface */
+	struct afb_export *export;	/* export */
 };
 
 static const struct afb_verb_desc_v1 *search(struct api_so_v1 *desc, const char *name)
@@ -76,105 +74,163 @@ static void call_cb(void *closure, struct afb_xreq *xreq)
 
 static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
 {
+	int rc;
 	int (*init)(struct afb_service service);
 	void (*onevent)(const char *event, struct json_object *object);
 
 	struct api_so_v1 *desc = closure;
 
 	/* check state */
-	if (desc->service != NULL) {
+	if (afb_export_is_started(desc->export)) {
 		/* not an error when onneed */
 		if (onneed != 0)
-			return 0;
+			goto done;
 
 		/* already started: it is an error */
-		ERROR("Service %s already started", desc->binding->v1.prefix);
+		ERROR("Service %s already started", afb_export_apiname(desc->export));
 		return -1;
 	}
 
 	/* get the initialisation */
 	init = dlsym(desc->handle, afb_api_so_v1_service_init);
-	if (init == NULL) {
-		/* not an error when onneed */
-		if (onneed != 0)
-			return 0;
+	onevent = dlsym(desc->handle, afb_api_so_v1_service_event);
 
-		/* no initialisation method */
-		ERROR("Binding %s is not a service", desc->binding->v1.prefix);
-		return -1;
+	/* unshare the session if asked */
+	if (!share_session) {
+		rc = afb_export_unshare_session(desc->export);
+		if (rc < 0) {
+			ERROR("Can't unshare the session for %s", afb_export_apiname(desc->export));
+			return -1;
+		}
 	}
 
-	/* get the event handler if any */
-	onevent = dlsym(desc->handle, afb_api_so_v1_service_event);
-	desc->service = afb_svc_create_v1(apiset, share_session, init, onevent);
-	if (desc->service == NULL) {
-		/* starting error */
-		ERROR("Starting service %s failed", desc->binding->v1.prefix);
+	/* set event handling */
+	rc = afb_export_handle_events(desc->export, onevent);
+	if (rc < 0) {
+		ERROR("Can't set event handler for %s", afb_export_apiname(desc->export));
 		return -1;
 	}
 
+	/* Starts the service */
+	rc = afb_export_start_v1(desc->export, init);
+	if (rc < 0) {
+		/* initialisation error */
+		ERROR("Initialisation of service %s failed (%d): %m", afb_export_apiname(desc->export), rc);
+		return rc;
+	}
+
+done:
 	return 0;
 }
 
 static void update_hooks_cb(void *closure)
 {
 	struct api_so_v1 *desc = closure;
-	afb_ditf_update_hook(&desc->ditf);
+	afb_export_update_hook(desc->export);
 }
 
 static int get_verbosity_cb(void *closure)
 {
 	struct api_so_v1 *desc = closure;
-	return desc->ditf.interface.verbosity;
+	return afb_export_verbosity_get(desc->export);
 }
 
 static void set_verbosity_cb(void *closure, int level)
 {
 	struct api_so_v1 *desc = closure;
-	desc->ditf.interface.verbosity = level;
+	afb_export_verbosity_set(desc->export, level);
 }
 
-struct json_object *describe_cb(void *closure)
+static struct json_object *addperm(struct json_object *o, struct json_object *x)
 {
-	struct api_so_v1 *desc = closure;
+	struct json_object *a;
+
+	if (!o)
+		return x;
+
+	if (!json_object_object_get_ex(o, "allOf", &a)) {
+		a = json_object_new_array();
+		json_object_array_add(a, o);
+		o = json_object_new_object();
+		json_object_object_add(o, "allOf", a);
+	}
+	json_object_array_add(a, x);
+	return o;
+}
+
+static struct json_object *addperm_key_val(struct json_object *o, const char *key, struct json_object *val)
+{
+	struct json_object *x = json_object_new_object();
+	json_object_object_add(x, key, val);
+	return addperm(o, x);
+}
+
+static struct json_object *addperm_key_valstr(struct json_object *o, const char *key, const char *val)
+{
+	return addperm_key_val(o, key, json_object_new_string(val));
+}
+
+static struct json_object *addperm_key_valint(struct json_object *o, const char *key, int val)
+{
+	return addperm_key_val(o, key, json_object_new_int(val));
+}
+
+static struct json_object *make_description_openAPIv3(struct api_so_v1 *desc)
+{
+	char buffer[256];
 	const struct afb_verb_desc_v1 *verb;
-	struct json_object *r, *v, *f, *a;
+	struct json_object *r, *f, *a, *i, *p, *g;
 
 	r = json_object_new_object();
-	json_object_object_add(r, "version", json_object_new_int(1));
-	json_object_object_add(r, "info", json_object_new_string(desc->binding->v1.info));
-	v = json_object_new_object();
-	json_object_object_add(r, "verbs", v);
+	json_object_object_add(r, "openapi", json_object_new_string("3.0.0"));
+
+	i = json_object_new_object();
+	json_object_object_add(r, "info", i);
+	json_object_object_add(i, "title", json_object_new_string(afb_export_apiname(desc->export)));
+	json_object_object_add(i, "version", json_object_new_string("0.0.0"));
+	json_object_object_add(i, "description", json_object_new_string(desc->binding->v1.info ?: afb_export_apiname(desc->export)));
+
+	p = json_object_new_object();
+	json_object_object_add(r, "paths", p);
 	verb = desc->binding->v1.verbs;
 	while (verb->name) {
+		buffer[0] = '/';
+		strncpy(buffer + 1, verb->name, sizeof buffer - 1);
+		buffer[sizeof buffer - 1] = 0;
 		f = json_object_new_object();
-		a = json_object_new_array();
-		json_object_object_add(f, "name", json_object_new_string(verb->name));
-		json_object_object_add(f, "info", json_object_new_string(verb->info));
-		if (verb->session & AFB_SESSION_CLOSE)
-			json_object_array_add(a, json_object_new_string("session-close"));
-		if (verb->session & AFB_SESSION_RENEW)
-			json_object_array_add(a, json_object_new_string("session-renew"));
-		if (verb->session & AFB_SESSION_CHECK)
-			json_object_array_add(a, json_object_new_string("session-check"));
-		if (verb->session & AFB_SESSION_LOA_EQ) {
-			const char *rel = "?";
-			char buffer[80];
-			switch (verb->session & AFB_SESSION_LOA_EQ) {
-			case AFB_SESSION_LOA_GE: rel = ">="; break;
-			case AFB_SESSION_LOA_LE: rel = "<="; break;
-			case AFB_SESSION_LOA_EQ: rel = "=="; break;
-			}
-			snprintf(buffer, sizeof buffer, "LOA%s%d", rel, (int)((verb->session >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK));
-			json_object_array_add(a, json_object_new_string(buffer));
-		}
-		json_object_object_add(f, "flags", a);
-		json_object_object_add(v, verb->name, f);
+		json_object_object_add(p, buffer, f);
+		g = json_object_new_object();
+		json_object_object_add(f, "get", g);
+
+		a = NULL;
+		if (verb->session & AFB_SESSION_CLOSE_V1)
+			a = addperm_key_valstr(a, "session", "close");
+		if (verb->session & AFB_SESSION_CHECK_V1)
+			a = addperm_key_valstr(a, "session", "check");
+		if (verb->session & AFB_SESSION_RENEW_V1)
+			a = addperm_key_valstr(a, "token", "refresh");
+		if (verb->session & AFB_SESSION_LOA_MASK_V1)
+			a = addperm_key_valint(a, "LOA", (verb->session >> AFB_SESSION_LOA_SHIFT_V1) & AFB_SESSION_LOA_MASK_V1);
+		if (a)
+			json_object_object_add(g, "x-permissions", a);
+
+		a = json_object_new_object();
+		json_object_object_add(g, "responses", a);
+		f = json_object_new_object();
+		json_object_object_add(a, "200", f);
+		json_object_object_add(f, "description", json_object_new_string(verb->info));
 		verb++;
 	}
 	return r;
 }
 
+static struct json_object *describe_cb(void *closure)
+{
+	struct api_so_v1 *desc = closure;
+
+	return make_description_openAPIv3(desc);
+}
+
 static struct afb_api_itf so_v1_api_itf = {
 	.call = call_cb,
 	.service_start = service_start_cb,
@@ -187,8 +243,9 @@ static struct afb_api_itf so_v1_api_itf = {
 int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset)
 {
 	struct api_so_v1 *desc;
-	struct afb_binding *(*register_function) (const struct afb_binding_interface *interface);
+	struct afb_binding_v1 *(*register_function) (const struct afb_binding_interface_v1 *interface);
 	struct afb_api afb_api;
+	struct afb_export *export;
 
 	/* retrieves the register function */
 	register_function = dlsym(handle, afb_api_so_v1_register);
@@ -197,60 +254,62 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset)
 	INFO("binding [%s] is a valid AFB binding V1", path);
 
 	/* allocates the description */
+	export = afb_export_create_v1(path);
 	desc = calloc(1, sizeof *desc);
-	if (desc == NULL) {
+	if (desc == NULL || export == NULL) {
 		ERROR("out of memory");
 		goto error;
 	}
+	desc->export = export;
 	desc->handle = handle;
 
-	/* init the interface */
-	afb_ditf_init_v1(&desc->ditf, path);
-
 	/* init the binding */
-	NOTICE("binding [%s] calling registering function %s", path, afb_api_so_v1_register);
-	desc->binding = register_function(&desc->ditf.interface);
+	INFO("binding [%s] calling registering function %s", path, afb_api_so_v1_register);
+	desc->binding = afb_export_register_v1(desc->export, register_function);
 	if (desc->binding == NULL) {
 		ERROR("binding [%s] register function failed. continuing...", path);
-		goto error2;
+		goto error;
 	}
 
 	/* check the returned structure */
 	if (desc->binding->type != AFB_BINDING_VERSION_1) {
 		ERROR("binding [%s] invalid type %d...", path, desc->binding->type);
-		goto error2;
+		goto error;
 	}
 	if (desc->binding->v1.prefix == NULL || *desc->binding->v1.prefix == 0) {
 		ERROR("binding [%s] bad prefix...", path);
-		goto error2;
+		goto error;
 	}
 	if (!afb_api_is_valid_name(desc->binding->v1.prefix)) {
 		ERROR("binding [%s] invalid prefix...", path);
-		goto error2;
+		goto error;
 	}
 	if (desc->binding->v1.info == NULL || *desc->binding->v1.info == 0) {
 		ERROR("binding [%s] bad description...", path);
-		goto error2;
+		goto error;
 	}
 	if (desc->binding->v1.verbs == NULL) {
 		ERROR("binding [%s] no APIs...", path);
-		goto error2;
+		goto error;
 	}
 
 	/* records the binding */
-	afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix);
+	if (!strcmp(path, afb_export_apiname(desc->export)))
+		afb_export_rename(desc->export, desc->binding->v1.prefix);
 	afb_api.closure = desc;
 	afb_api.itf = &so_v1_api_itf;
-	if (afb_apiset_add(apiset, desc->binding->v1.prefix, afb_api) < 0) {
+	afb_api.noconcurrency = 0;
+	if (afb_apiset_add(apiset, afb_export_apiname(desc->export), afb_api) < 0) {
 		ERROR("binding [%s] can't be registered...", path);
-		goto error2;
+		goto error;
 	}
-	NOTICE("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix);
+	INFO("binding %s loaded with API prefix %s", path, afb_export_apiname(desc->export));
 	return 1;
 
-error2:
-	free(desc);
 error:
+	afb_export_destroy(export);
+	free(desc);
+
 	return -1;
 }