X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafb-api-so-v2.c;h=7df83dd8fc05a37f81959fc2dd086da848bff5b0;hb=9fe2dfd3c4df334607083f989346090e1051a565;hp=2770f64a29efc5d3c863ef22642311fc803842c2;hpb=6797f9722dd3e5463e0f7c118397955bb59a40c7;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c index 2770f64a..7df83dd8 100644 --- a/src/afb-api-so-v2.c +++ b/src/afb-api-so-v2.c @@ -26,11 +26,11 @@ #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" @@ -44,134 +44,11 @@ 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) -{ - 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); - - /* crate the event */ - return afb_evt_create_event(event); -} - -static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object) -{ - 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 const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *verb) { const struct afb_verb_v2 *result; @@ -182,20 +59,7 @@ static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *verb return result->verb ? result : NULL; } -static void call_cb(void *closure, struct afb_req req, struct afb_context *context, const char *name) -{ - struct api_so_v2 *desc = closure; - const struct afb_verb_v2 *verb; - - verb = search(desc, name); - if (!verb) - afb_req_fail_f(req, "unknown-verb", "verb %s unknown within api %s", name, desc->binding->api); - else if (call_check(req, context, verb)) { - afb_thread_req_call(req, verb->callback, afb_api_so_timeout, desc); - } -} - -static void xcall_cb(void *closure, struct afb_xreq *xreq) +static void call_cb(void *closure, struct afb_xreq *xreq) { struct api_so_v2 *desc = closure; const struct afb_verb_v2 *verb; @@ -203,13 +67,8 @@ static void xcall_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); - else { - xreq->timeout = afb_api_so_timeout; - xreq->sessionflags = (int)verb->session; - xreq->group = desc; - xreq->callback = verb->callback; - afb_xreq_call(xreq); - } + else + afb_xreq_call(xreq, verb->session, verb->callback); } static int service_start_cb(void *closure, int share_session, int onneed) @@ -244,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); @@ -295,17 +154,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; @@ -313,11 +169,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, - .xcall = xcall_cb, .service_start = service_start_cb }) < 0) { ERROR("binding [%s] can't be registered...", path); goto error2;