X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v1.c;h=3eea464597b0bfc0235c7c66d74ab4a288f903c5;hb=a63851bb4726c89d9a3c5755d78d1c4bbc3f3b2e;hp=63ea3f8ad86c39720e65d7444f27f68d82dde48a;hpb=0b838a6101edc810098ee0645d3bfd966096ae07;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c index 63ea3f8a..3eea4645 100644 --- a/src/afb-api-so-v1.c +++ b/src/afb-api-so-v1.c @@ -16,21 +16,27 @@ */ #define _GNU_SOURCE -#define NO_BINDING_VERBOSE_MACRO +#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO +#include #include #include #include -#include +#include -#include "afb-apis.h" +#include + +#include "afb-api.h" +#include "afb-api-so-v1.h" +#include "afb-apiset.h" #include "afb-svc.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" /* @@ -44,88 +50,13 @@ static const char afb_api_so_v1_service_event[] = "afbBindingV1ServiceEvent"; * Description of a binding */ struct api_so_v1 { - struct afb_binding *binding; /* descriptor */ - size_t apilength; /* length of the API name */ + struct afb_binding_v1 *binding; /* descriptor */ void *handle; /* context of dlopen */ struct afb_svc *service; /* handler for service started */ - struct afb_binding_interface interface; /* interface for the binding */ -}; - -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 + struct afb_binding_interface_v1 interface; + struct afb_ditf ditf; /* daemon interface */ }; -static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name) -{ - size_t length; - char *event; - struct api_so_v1 *desc = closure; - - /* makes the event name */ - assert(desc->binding != NULL); - length = strlen(name); - event = alloca(length + 2 + desc->apilength); - memcpy(event, desc->binding->v1.prefix, 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_v1 *desc = closure; - - /* makes the event name */ - assert(desc->binding != NULL); - length = strlen(name); - event = alloca(length + 2 + desc->apilength); - memcpy(event, desc->binding->v1.prefix, 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_v1 *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->v1.prefix); - 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 const struct afb_verb_desc_v1 *search(struct api_so_v1 *desc, const char *name) { const struct afb_verb_desc_v1 *verb; @@ -142,19 +73,12 @@ static void call_cb(void *closure, struct afb_xreq *xreq) struct api_so_v1 *desc = closure; 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); - else { - xreq->timeout = afb_api_so_timeout; - xreq->sessionflags = (int)verb->session; - xreq->group = desc; - xreq->callback = verb->callback; - afb_xreq_call(xreq); - } + afb_xreq_call_verb_v1(xreq, verb); } -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 rc; int (*init)(struct afb_service service); void (*onevent)(const char *event, struct json_object *object); @@ -173,7 +97,8 @@ static int service_start_cb(void *closure, int share_session, int onneed) /* get the initialisation */ init = dlsym(desc->handle, afb_api_so_v1_service_init); - if (init == NULL) { + onevent = dlsym(desc->handle, afb_api_so_v1_service_event); + if (init == NULL && onevent == NULL) { /* not an error when onneed */ if (onneed != 0) return 0; @@ -184,23 +109,149 @@ 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(desc->binding->v1.prefix, apiset, share_session, onevent, NULL); if (desc->service == NULL) { - /* starting error */ - ERROR("Starting service %s failed", desc->binding->v1.prefix); + ERROR("Creation of service %s failed", desc->binding->v1.prefix); return -1; } + /* Starts the service */ + rc = afb_svc_start_v1(desc->service, init); + if (rc < 0) { + /* initialisation error */ + ERROR("Initialisation of service %s failed (%d): %m", desc->binding->v1.prefix, rc); + afb_svc_destroy(desc->service, NULL); + desc->service = NULL; + return rc; + } + return 0; } -int afb_api_so_v1_add(const char *path, void *handle) +static void update_hooks_cb(void *closure) +{ + struct api_so_v1 *desc = closure; + afb_ditf_update_hook(&desc->ditf); + if (desc->service) + afb_svc_update_hook(desc->service); +} + +static int get_verbosity_cb(void *closure) +{ + struct api_so_v1 *desc = closure; + return desc->interface.verbosity; +} + +static void set_verbosity_cb(void *closure, int level) +{ + struct api_so_v1 *desc = closure; + desc->interface.verbosity = level; +} + +static struct json_object *addperm(struct json_object *o, struct json_object *x) +{ + 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, *f, *a, *i, *p, *g; + + r = json_object_new_object(); + 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(desc->binding->v1.prefix)); + 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 ?: desc->binding->v1.prefix)); + + 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(); + 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, + .update_hooks = update_hooks_cb, + .get_verbosity = get_verbosity_cb, + .set_verbosity = set_verbosity_cb, + .describe = describe_cb +}; + +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_verb_desc_v1 fake_verb; - struct afb_binding fake_binding; + struct afb_binding_v1 *(*register_function) (const struct afb_binding_interface_v1 *interface); + struct afb_api afb_api; /* retrieves the register function */ register_function = dlsym(handle, afb_api_so_v1_register); @@ -217,21 +268,10 @@ int afb_api_so_v1_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; - - /* for log purpose, a fake binding is needed here */ - desc->binding = &fake_binding; - fake_binding.type = AFB_BINDING_VERSION_1; - fake_binding.v1.info = path; - fake_binding.v1.prefix = path; - fake_binding.v1.verbs = &fake_verb; - fake_verb.name = NULL; + afb_ditf_init_v1(&desc->ditf, path, &desc->interface); /* init the binding */ - NOTICE("binding [%s] calling registering function %s", path, afb_api_so_v1_register); + INFO("binding [%s] calling registering function %s", path, afb_api_so_v1_register); desc->binding = register_function(&desc->interface); if (desc->binding == NULL) { ERROR("binding [%s] register function failed. continuing...", path); @@ -247,7 +287,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; } @@ -261,15 +301,14 @@ int afb_api_so_v1_add(const char *path, void *handle) } /* records the binding */ - desc->apilength = strlen(desc->binding->v1.prefix); - if (afb_apis_add(desc->binding->v1.prefix, (struct afb_api){ - .closure = desc, - .call = call_cb, - .service_start = service_start_cb }) < 0) { + afb_ditf_rename(&desc->ditf, 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) { ERROR("binding [%s] can't be registered...", path); goto error2; } - NOTICE("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix); + INFO("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix); return 1; error2: