X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=d56c9852a77c309c76410a535fc575da0f02cb3a;hb=05e0214d821f1a7604b4a0897907f347761b56e6;hp=2d939fbcb17d7c1018427499b1dba766261172be;hpb=a8e971702f23ee67e02b4716ad4159f12cefdca6;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c
index 2d939fbc..d56c9852 100644
--- a/src/afb-api-so-v2.c
+++ b/src/afb-api-so-v2.c
@@ -23,6 +23,7 @@
 #include <assert.h>
 
 #include <afb/afb-binding.h>
+#include <json-c/json.h>
 
 #include "afb-api.h"
 #include "afb-apiset.h"
@@ -44,7 +45,7 @@ static const char afb_api_so_v2_descriptor[] = "afbBindingV2";
  * Description of a binding
  */
 struct api_so_v2 {
-	struct afb_binding_v2 *binding;	/* descriptor */
+	const struct afb_binding_v2 *binding;	/* descriptor */
 	void *handle;			/* context of dlopen */
 	struct afb_svc *service;	/* handler for service started */
 	struct afb_ditf ditf;		/* daemon interface */
@@ -67,9 +68,10 @@ static void call_cb(void *closure, struct afb_xreq *xreq)
 
 	verb = search(desc, xreq->verb);
 	if (!verb)
-		afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, desc->binding->api);
+		afb_xreq_fail_unknown_verb(xreq);
 	else
-		afb_xreq_so_call(xreq, verb->session, verb->callback);
+		if (!xreq_session_check_apply(xreq, verb->session))
+			afb_xreq_call(xreq, verb->callback);
 }
 
 static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
@@ -132,45 +134,32 @@ static void set_verbosity_cb(void *closure, int level)
 	desc->ditf.interface.verbosity = level;
 }
 
+static struct json_object *describe_cb(void *closure)
+{
+	struct api_so_v2 *desc = closure;
+	return desc->binding->specification ? json_tokener_parse(desc->binding->specification) : NULL;
+}
+
 static struct afb_api_itf so_v2_api_itf = {
 	.call = call_cb,
 	.service_start = service_start_cb,
 	.update_hooks = update_hooks_cb,
 	.get_verbosity = get_verbosity_cb,
-	.set_verbosity = set_verbosity_cb
+	.set_verbosity = set_verbosity_cb,
+	.describe = describe_cb
+
 };
 
-int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset)
+int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle, struct afb_apiset *apiset)
 {
 	int rc;
 	struct api_so_v2 *desc;
-	struct afb_binding_v2 *binding;
 	struct afb_api afb_api;
 
-	/* retrieves the register function */
-	binding = dlsym(handle, afb_api_so_v2_descriptor);
-	if (!binding)
-		return 0;
-
-	INFO("binding [%s] looks like an AFB binding V2", path);
-
 	/* basic checks */
-	if (binding->api == NULL || *binding->api == 0) {
-		ERROR("binding [%s] bad api name...", path);
-		goto error;
-	}
-	if (!afb_api_is_valid_name(binding->api)) {
-		ERROR("binding [%s] invalid api name...", path);
-		goto error;
-	}
-	if (binding->specification == NULL || *binding->specification == 0) {
-		ERROR("binding [%s] bad specification...", path);
-		goto error;
-	}
-	if (binding->verbs == NULL) {
-		ERROR("binding [%s] no verbs...", path);
-		goto error;
-	}
+	assert(binding->api);
+	assert(binding->specification);
+	assert(binding->verbs);
 
 	/* allocates the description */
 	desc = calloc(1, sizeof *desc);
@@ -184,14 +173,12 @@ int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset)
 	/* init the interface */
 	afb_ditf_init(&desc->ditf, binding->api);
 
-	/* for log purpose, a fake binding is needed here */
-
 	/* init the binding */
 	if (binding->init) {
-		NOTICE("binding %s [%s] calling init function", binding->api, path);
+		INFO("binding %s calling init function", binding->api);
 		rc = binding->init(&desc->ditf.interface);
 		if (rc < 0) {
-			ERROR("binding %s [%s] initialisation function failed...", binding->api, path);
+			ERROR("binding %s initialisation function failed...", binding->api);
 			goto error2;
 		}
 	}
@@ -200,10 +187,10 @@ int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset)
 	afb_api.closure = desc;
 	afb_api.itf = &so_v2_api_itf;
 	if (afb_apiset_add(apiset, binding->api, afb_api) < 0) {
-		ERROR("binding [%s] can't be registered...", path);
+		ERROR("binding %s can't be registered to set %s...", binding->api, afb_apiset_name(apiset));
 		goto error2;
 	}
-	NOTICE("binding %s loaded with API prefix %s", path, binding->api);
+	NOTICE("binding %s added to set %s", binding->api, afb_apiset_name(apiset));
 	return 1;
 
 error2:
@@ -212,3 +199,38 @@ error:
 	return -1;
 }
 
+int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset)
+{
+	const struct afb_binding_v2 *binding;
+
+	/* retrieves the register function */
+	binding = dlsym(handle, afb_api_so_v2_descriptor);
+	if (!binding)
+		return 0;
+
+	INFO("binding [%s] looks like an AFB binding V2", path);
+
+	/* basic checks */
+	if (binding->api == NULL || *binding->api == 0) {
+		ERROR("binding [%s] bad api name...", path);
+		goto error;
+	}
+	if (!afb_api_is_valid_name(binding->api)) {
+		ERROR("binding [%s] invalid api name...", path);
+		goto error;
+	}
+	if (binding->specification == NULL || *binding->specification == 0) {
+		ERROR("binding [%s] bad specification...", path);
+		goto error;
+	}
+	if (binding->verbs == NULL) {
+		ERROR("binding [%s] no verbs...", path);
+		goto error;
+	}
+
+	return afb_api_so_v2_add_binding(binding, handle, apiset);
+
+ error:
+	return -1;
+}
+