X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=714bcd0fdda8c898bd73902b58b09c30f72356f4;hb=2243a0dd1adc75530bed663db808971789729df3;hp=0c8079c4526a484fa63a2b32856d955a3364cef1;hpb=c9ba2ce49808a19a4ef982280a46256797b830ae;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c
index 0c8079c4..714bcd0f 100644
--- a/src/afb-api-so-v2.c
+++ b/src/afb-api-so-v2.c
@@ -26,11 +26,12 @@
 
 #include "afb-apis.h"
 #include "afb-svc.h"
+#include "afb-ditf.h"
 #include "afb-evt.h"
 #include "afb-common.h"
 #include "afb-context.h"
 #include "afb-api-so.h"
-#include "afb-thread.h"
+#include "afb-xreq.h"
 #include "verbose.h"
 
 /*
@@ -43,147 +44,31 @@ static const char afb_api_so_v2_descriptor[] = "afbBindingV2";
  */
 struct api_so_v2 {
 	struct afb_binding_v2 *binding;	/* descriptor */
-	size_t apilength;		/* length of the API name */
 	void *handle;			/* context of dlopen */
 	struct afb_svc *service;	/* handler for service started */
-	struct afb_binding_interface interface;	/* interface for the binding */
+	struct afb_ditf ditf;		/* daemon interface */
 };
 
-static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name);
-static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object);
-static void afb_api_so_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args);
-static int afb_api_so_rootdir_get_fd(void *closure);
-static int afb_api_so_rootdir_open_locale(void *closure, const char *filename, int flags, const char *locale);
-
-static const struct afb_daemon_itf daemon_itf = {
-	.event_broadcast = afb_api_so_event_broadcast_cb,
-	.get_event_loop = afb_common_get_event_loop,
-	.get_user_bus = afb_common_get_user_bus,
-	.get_system_bus = afb_common_get_system_bus,
-	.vverbose = afb_api_so_vverbose_cb,
-	.event_make = afb_api_so_event_make_cb,
-	.rootdir_get_fd = afb_api_so_rootdir_get_fd,
-	.rootdir_open_locale = afb_api_so_rootdir_open_locale
-};
-
-static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name)
+static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *verb)
 {
-	size_t length;
-	char *event;
-	struct api_so_v2 *desc = closure;
-
-	/* makes the event name */
-	assert(desc->binding != NULL);
-	length = strlen(name);
-	event = alloca(length + 2 + desc->apilength);
-	memcpy(event, desc->binding->api, desc->apilength);
-	event[desc->apilength] = '/';
-	memcpy(event + desc->apilength + 1, name, length + 1);
+	const struct afb_verb_v2 *result;
 
-	/* crate the event */
-	return afb_evt_create_event(event);
+	result = desc->binding->verbs;
+	while (result->verb && strcasecmp(result->verb, verb))
+		result++;
+	return result->verb ? result : NULL;
 }
 
-static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object)
+static void call_cb(void *closure, struct afb_xreq *xreq)
 {
-	size_t length;
-	char *event;
 	struct api_so_v2 *desc = closure;
-
-	/* makes the event name */
-	assert(desc->binding != NULL);
-	length = strlen(name);
-	event = alloca(length + 2 + desc->apilength);
-	memcpy(event, desc->binding->api, desc->apilength);
-	event[desc->apilength] = '/';
-	memcpy(event + desc->apilength + 1, name, length + 1);
-
-	return afb_evt_broadcast(event, object);
-}
-
-static void afb_api_so_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args)
-{
-	char *p;
-	struct api_so_v2 *desc = closure;
-
-	if (vasprintf(&p, fmt, args) < 0)
-		vverbose(level, file, line, fmt, args);
-	else {
-		verbose(level, file, line, "%s {binding %s}", p, desc->binding->api);
-		free(p);
-	}
-}
-
-static int afb_api_so_rootdir_get_fd(void *closure)
-{
-	return afb_common_rootdir_get_fd();
-}
-
-static int afb_api_so_rootdir_open_locale(void *closure, const char *filename, int flags, const char *locale)
-{
-	return afb_common_rootdir_open_locale(filename, flags, locale);
-}
-
-static int call_check(struct afb_req req, struct afb_context *context, const struct afb_verb_v2 *verb)
-{
-	int stag = (int)verb->session;
-
-	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");
-			return 0;
-		}
-	}
-
-	if ((stag & AFB_SESSION_CREATE) != 0) {
-		if (afb_context_check_loa(context, 1)) {
-			afb_req_fail(req, "failed", "invalid creation state");
-			return 0;
-		}
-		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) {
-		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 0;
-		}
-	}
-
-	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 0;
-		}
-	}
-	return 1;
-}
-
-static void call_cb(void *closure, struct afb_req req, struct afb_context *context, const char *strverb)
-{
 	const struct afb_verb_v2 *verb;
-	struct api_so_v2 *desc = closure;
 
-	verb = desc->binding->verbs;
-	while (verb->verb && strcasecmp(verb->verb, strverb))
-		verb++;
-	if (!verb->verb)
-		afb_req_fail_f(req, "unknown-verb", "verb %s unknown within api %s", strverb, desc->binding->api);
-	else if (call_check(req, context, verb)) {
-		afb_thread_req_call(req, verb->callback, afb_api_so_timeout, desc);
-	}
+	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);
+	else
+		afb_xreq_call(xreq, verb->session, verb->callback);
 }
 
 static int service_start_cb(void *closure, int share_session, int onneed)
@@ -218,7 +103,7 @@ static int service_start_cb(void *closure, int share_session, int onneed)
 
 	/* get the event handler if any */
 	onevent = desc->binding->onevent;
-	desc->service = afb_svc_create_v2(share_session, onevent, start, &desc->interface);
+	desc->service = afb_svc_create_v2(share_session, onevent, start, &desc->ditf.interface);
 	if (desc->service == NULL) {
 		/* starting error */
 		ERROR("Starting service %s failed", desc->binding->api);
@@ -228,11 +113,38 @@ static int service_start_cb(void *closure, int share_session, int onneed)
 	return 0;
 }
 
+static void update_hooks_cb(void *closure)
+{
+	struct api_so_v2 *desc = closure;
+	afb_ditf_update_hook(&desc->ditf);
+}
+
+static int get_verbosity_cb(void *closure)
+{
+	struct api_so_v2 *desc = closure;
+	return desc->ditf.interface.verbosity;
+}
+
+static void set_verbosity_cb(void *closure, int level)
+{
+	struct api_so_v2 *desc = closure;
+	desc->ditf.interface.verbosity = level;
+}
+
+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
+};
+
 int afb_api_so_v2_add(const char *path, void *handle)
 {
 	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);
@@ -269,17 +181,14 @@ int afb_api_so_v2_add(const char *path, void *handle)
 	desc->handle = handle;
 
 	/* init the interface */
-	desc->interface.verbosity = verbosity;
-	desc->interface.mode = AFB_MODE_LOCAL;
-	desc->interface.daemon.itf = &daemon_itf;
-	desc->interface.daemon.closure = desc;
+	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);
-		rc = binding->init(&desc->interface);
+		rc = binding->init(&desc->ditf.interface);
 		if (rc < 0) {
 			ERROR("binding %s [%s] initialisation function failed...", binding->api, path);
 			goto error2;
@@ -287,11 +196,9 @@ int afb_api_so_v2_add(const char *path, void *handle)
 	}
 
 	/* records the binding */
-	desc->apilength = strlen(binding->api);
-	if (afb_apis_add(binding->api, (struct afb_api){
-			.closure = desc,
-			.call = call_cb,
-			.service_start = service_start_cb }) < 0) {
+	afb_api.closure = desc;
+	afb_api.itf = &so_v2_api_itf;
+	if (afb_apis_add(binding->api, afb_api) < 0) {
 		ERROR("binding [%s] can't be registered...", path);
 		goto error2;
 	}