X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=120747465d9df3cb03b5dd4c12732cf50634d537;hb=7e674cc7202abfae0dd07df8805a0dea743bf4be;hp=6038d9644f59d80cc1c3c062c9942e4d17366d1f;hpb=968c3fca18c7518f240d2487a561e8df8b2907a7;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c index 6038d964..12074746 100644 --- a/src/afb-api-so-v2.c +++ b/src/afb-api-so-v2.c @@ -23,6 +23,7 @@ #include #include +#include #include "afb-api.h" #include "afb-apiset.h" @@ -33,6 +34,7 @@ #include "afb-context.h" #include "afb-api-so.h" #include "afb-xreq.h" +#include "afb-perm.h" #include "verbose.h" /* @@ -40,24 +42,45 @@ */ static const char afb_api_so_v2_descriptor[] = "afbBindingV2"; +/** + * structure for memorizing verbs sorted with permissions + */ +struct verb_v2 { + const struct afb_verb_v2 *verb; + struct afb_perm *perm; +}; + /* * 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 */ + int count; + struct verb_v2 verbs[1]; }; static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *verb) { - const struct afb_verb_v2 *result; - - result = desc->binding->verbs; - while (result->verb && strcasecmp(result->verb, verb)) - result++; - return result->verb ? result : NULL; + const struct afb_verb_v2 *v; + int i, l, u, c; + + l = 0; + u = desc->count; + while (l < u) { + i = (l + u) >> 1; + v = desc->verbs[i].verb; + c = strcasecmp(v->verb, verb); + if (c == 0) + return v; + if (c < 0) + l = i + 1; + else + u = i; + } + return NULL; } static void call_cb(void *closure, struct afb_xreq *xreq) @@ -133,66 +156,86 @@ 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); + const struct afb_verb_v2 *bv; + int count, i, j; /* 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); + + /* count the verbs */ + count = 0; + while (binding->verbs[count].verb) + count++; /* allocates the description */ - desc = calloc(1, sizeof *desc); + desc = malloc(sizeof *desc + (count - 1) * sizeof desc->verbs); if (desc == NULL) { ERROR("out of memory"); goto error; } desc->binding = binding; desc->handle = handle; + desc->service = NULL; + memset(&desc->ditf, 0, sizeof desc->ditf); + desc->count = count; + + /* fill the verbs sorted */ + for (i = 0 ; i < count ; i++) { + desc->verbs[i].perm = NULL; + j = i; + bv = &binding->verbs[j]; + while (j && strcasecmp(bv->verb, desc->verbs[j-1].verb->verb) < 0) { + desc->verbs[j].verb = desc->verbs[j-1].verb; + j--; + } + desc->verbs[j].verb = bv; + } + + /* makes the permissions */ + for (i = 0 ; i < count ; i++) { + if (desc->verbs[i].verb->permissions) { + desc->verbs[i].perm = afb_perm_parse(desc->verbs[i].verb->permissions); + if (!desc->verbs[i].perm) { + ERROR("Bad permission specification for verb %s of api %s: %s", + desc->verbs[i].verb->verb, binding->api, + desc->verbs[i].verb->permissions); + goto error2; + } + } + } /* 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; } } @@ -201,15 +244,54 @@ 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: + count = desc->count; + while (count) + if (desc->verbs[--count].perm) + afb_perm_unref(desc->verbs[count].perm); free(desc); 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; +} +