X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v1.c;h=7bb2c328a703666099bd9006ddd9998f3ea37e32;hb=05e0214d821f1a7604b4a0897907f347761b56e6;hp=4ec378e1b896a027d3d907d9abd2ff3dd0683114;hpb=5d248158cc380d0a164fa56b46a7bdede4115407;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c
index 4ec378e1..7bb2c328 100644
--- a/src/afb-api-so-v1.c
+++ b/src/afb-api-so-v1.c
@@ -22,9 +22,12 @@
 #include <dlfcn.h>
 #include <assert.h>
 
+#include <json-c/json.h>
+
 #include <afb/afb-binding.h>
 
-#include "afb-apis.h"
+#include "afb-api.h"
+#include "afb-apiset.h"
 #include "afb-svc.h"
 #include "afb-evt.h"
 #include "afb-common.h"
@@ -68,12 +71,13 @@ 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->v1.prefix);
+		afb_xreq_fail_unknown_verb(xreq);
 	else
-		afb_xreq_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)
+static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
 {
 	int (*init)(struct afb_service service);
 	void (*onevent)(const char *event, struct json_object *object);
@@ -105,7 +109,7 @@ static int service_start_cb(void *closure, int share_session, int onneed)
 
 	/* get the event handler if any */
 	onevent = dlsym(desc->handle, afb_api_so_v1_service_event);
-	desc->service = afb_svc_create(share_session, init, onevent);
+	desc->service = afb_svc_create(apiset, share_session, init, onevent);
 	if (desc->service == NULL) {
 		/* starting error */
 		ERROR("Starting service %s failed", desc->binding->v1.prefix);
@@ -133,15 +137,59 @@ static void set_verbosity_cb(void *closure, int level)
 	desc->ditf.interface.verbosity = level;
 }
 
+struct json_object *describe_cb(void *closure)
+{
+	struct api_so_v1 *desc = closure;
+	const struct afb_verb_desc_v1 *verb;
+	struct json_object *r, *v, *f, *a;
+
+	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);
+	verb = desc->binding->v1.verbs;
+	while (verb->name) {
+		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_CREATE)
+			json_object_array_add(a, json_object_new_string("session-create"));
+		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);
+		verb++;
+	}
+	return r;
+}
+
 static struct afb_api_itf so_v1_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_v1_add(const char *path, void *handle)
+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);
@@ -181,7 +229,7 @@ int afb_api_so_v1_add(const char *path, void *handle)
 		ERROR("binding [%s] bad prefix...", path);
 		goto error2;
 	}
-	if (!afb_apis_is_valid_api_name(desc->binding->v1.prefix)) {
+	if (!afb_api_is_valid_name(desc->binding->v1.prefix)) {
 		ERROR("binding [%s] invalid prefix...", path);
 		goto error2;
 	}
@@ -198,7 +246,7 @@ int afb_api_so_v1_add(const char *path, void *handle)
 	afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix);
 	afb_api.closure = desc;
 	afb_api.itf = &so_v1_api_itf;
-	if (afb_apis_add(desc->binding->v1.prefix, afb_api) < 0) {
+	if (afb_apiset_add(apiset, desc->binding->v1.prefix, afb_api) < 0) {
 		ERROR("binding [%s] can't be registered...", path);
 		goto error2;
 	}