X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=5954eb1140a0490cbe84535310b938942ca38ce6;hb=3535d4cb73628c720da1bf74627ded2aec6f2ca1;hp=3281224326c0d4e3f4f63e5f4383e856af4c1716;hpb=6634329b7a1a94aa1555649b933010fb9fcd0381;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c index 32812243..5954eb11 100644 --- a/src/afb-api-so-v2.c +++ b/src/afb-api-so-v2.c @@ -28,14 +28,12 @@ #include "afb-api.h" #include "afb-api-so-v2.h" #include "afb-apiset.h" -#include "afb-svc.h" -#include "afb-ditf.h" +#include "afb-auth.h" +#include "afb-export.h" #include "afb-evt.h" -#include "afb-common.h" #include "afb-context.h" #include "afb-api-so.h" #include "afb-xreq.h" -#include "jobs.h" #include "verbose.h" /* @@ -49,10 +47,8 @@ static const char afb_api_so_v2_data[] = "afbBindingV2data"; */ struct api_so_v2 { const struct afb_binding_v2 *binding; /* descriptor */ - struct afb_binding_data_v2 *data; /* data */ - void *handle; /* context of dlopen */ - struct afb_svc *service; /* handler for service started */ - struct afb_ditf ditf; /* daemon interface */ + void *handle; /* context of dlopen */ + struct afb_export *export; /* exportations */ }; static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *name) @@ -71,147 +67,33 @@ static void call_cb(void *closure, struct afb_xreq *xreq) struct api_so_v2 *desc = closure; const struct afb_verb_v2 *verb; - verb = search(desc, xreq->verb); + xreq->request.dynapi = (void*)desc->export; /* hack: this avoids to export afb_export structure */ + verb = search(desc, xreq->request.verb); afb_xreq_call_verb_v2(xreq, verb); } static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset) { - int rc; - int (*start)(); - void (*onevent)(const char *event, struct json_object *object); - struct api_so_v2 *desc = closure; - - /* check state */ - if (desc->service != NULL) { - /* not an error when onneed */ - if (onneed != 0) - goto done; - - /* already started: it is an error */ - ERROR("Service %s already started", desc->ditf.api); - return -1; - } - - /* get the initialisation */ - start = desc->binding->init; - onevent = desc->binding->onevent; - if (start == NULL && onevent == NULL) { - /* not an error when onneed */ - if (onneed != 0) - goto done; - - /* no initialisation method */ - ERROR("Binding %s is not a service", desc->ditf.api); - return -1; - } - - /* get the event handler if any */ - desc->service = afb_svc_create(desc->ditf.api, apiset, share_session, onevent, &desc->data->service); - if (desc->service == NULL) { - /* starting error */ - ERROR("Starting service %s failed", desc->ditf.api); - return -1; - } - - /* Starts the service */ - desc->ditf.state = Daemon_Init; - rc = afb_svc_start_v2(desc->service, start); - if (rc < 0) { - /* initialisation error */ - ERROR("Initialisation of service %s failed (%d): %m", desc->ditf.api, rc); - afb_svc_destroy(desc->service, &desc->data->service); - desc->service = NULL; - return rc; - } - -done: - desc->ditf.state = Daemon_Run; - return 0; + return afb_export_start(desc->export, share_session, onneed, apiset); } static void update_hooks_cb(void *closure) { struct api_so_v2 *desc = closure; - afb_ditf_update_hook(&desc->ditf); - if (desc->service) - afb_svc_update_hook(desc->service); + afb_export_update_hook(desc->export); } static int get_verbosity_cb(void *closure) { struct api_so_v2 *desc = closure; - return desc->data->verbosity; + return afb_export_verbosity_get(desc->export); } static void set_verbosity_cb(void *closure, int level) { struct api_so_v2 *desc = closure; - desc->data->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 *addauth_or_array(struct json_object *o, const struct afb_auth *auth); - -static struct json_object *addauth(struct json_object *o, const struct afb_auth *auth) -{ - switch(auth->type) { - case afb_auth_No: return addperm(o, json_object_new_boolean(0)); - case afb_auth_Token: return addperm_key_valstr(o, "session", "check"); - case afb_auth_LOA: return addperm_key_valint(o, "LOA", auth->loa); - case afb_auth_Permission: return addperm_key_valstr(o, "permission", auth->text); - case afb_auth_Or: return addperm_key_val(o, "anyOf", addauth_or_array(json_object_new_array(), auth)); - case afb_auth_And: return addauth(addauth(o, auth->first), auth->next); - case afb_auth_Not: return addperm_key_val(o, "not", addauth(NULL, auth->first)); - case afb_auth_Yes: return addperm(o, json_object_new_boolean(1)); - } - return o; -} - -static struct json_object *addauth_or_array(struct json_object *o, const struct afb_auth *auth) -{ - if (auth->type != afb_auth_Or) - json_object_array_add(o, addauth(NULL, auth)); - else { - addauth_or_array(o, auth->first); - addauth_or_array(o, auth->next); - } - - return o; + afb_export_verbosity_set(desc->export, level); } static struct json_object *make_description_openAPIv3(struct api_so_v2 *desc) @@ -225,9 +107,9 @@ static struct json_object *make_description_openAPIv3(struct api_so_v2 *desc) i = json_object_new_object(); json_object_object_add(r, "info", i); - json_object_object_add(i, "title", json_object_new_string(desc->ditf.api)); + json_object_object_add(i, "title", json_object_new_string(afb_export_apiname(desc->export))); 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->info ?: desc->ditf.api)); + json_object_object_add(i, "description", json_object_new_string(desc->binding->info ?: afb_export_apiname(desc->export))); p = json_object_new_object(); json_object_object_add(r, "paths", p); @@ -241,17 +123,7 @@ static struct json_object *make_description_openAPIv3(struct api_so_v2 *desc) g = json_object_new_object(); json_object_object_add(f, "get", g); - a = NULL; - if (verb->session & AFB_SESSION_CLOSE_V2) - a = addperm_key_valstr(a, "session", "close"); - if (verb->session & AFB_SESSION_CHECK_V2) - a = addperm_key_valstr(a, "session", "check"); - if (verb->session & AFB_SESSION_REFRESH_V2) - a = addperm_key_valstr(a, "token", "refresh"); - if (verb->session & AFB_SESSION_LOA_MASK_V2) - a = addperm_key_valint(a, "LOA", verb->session & AFB_SESSION_LOA_MASK_V2); - if (verb->auth) - a = addauth(a, verb->auth); + a = afb_auth_json_v2(verb->auth, verb->session); if (a) json_object_object_add(g, "x-permissions", a); @@ -288,6 +160,7 @@ int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle int rc; struct api_so_v2 *desc; struct afb_api afb_api; + struct afb_export *export; /* basic checks */ assert(binding); @@ -296,44 +169,41 @@ int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle assert(data); /* allocates the description */ + export = afb_export_create_v2(apiset, binding->api, data, binding->init, binding->onevent); desc = calloc(1, sizeof *desc); - if (desc == NULL) { + if (!desc || !export) { ERROR("out of memory"); goto error; } desc->binding = binding; - desc->data = data; desc->handle = handle; - desc->service = NULL; - - /* init the interface */ - desc->data->verbosity = verbosity; - afb_ditf_init_v2(&desc->ditf, binding->api, data); + desc->export = export; /* init the binding */ if (binding->preinit) { INFO("binding %s calling preinit function", binding->api); rc = binding->preinit(); if (rc < 0) { - ERROR("binding %s preinit function failed...", desc->ditf.api); - goto error2; + ERROR("binding %s preinit function failed...", afb_export_apiname(desc->export)); + goto error; } } /* records the binding */ afb_api.closure = desc; afb_api.itf = &so_v2_api_itf; - afb_api.noconcurrency = binding->noconcurrency; - if (afb_apiset_add(apiset, desc->ditf.api, afb_api) < 0) { - ERROR("binding %s can't be registered to set %s...", desc->ditf.api, afb_apiset_name(apiset)); - goto error2; + afb_api.group = binding->noconcurrency ? export : NULL; + if (afb_apiset_add(apiset, afb_export_apiname(desc->export), afb_api) < 0) { + ERROR("binding %s can't be registered to set %s...", afb_export_apiname(desc->export), afb_apiset_name(apiset)); + goto error; } - INFO("binding %s added to set %s", desc->ditf.api, afb_apiset_name(apiset)); + INFO("binding %s added to set %s", afb_export_apiname(desc->export), afb_apiset_name(apiset)); return 1; -error2: - free(desc); error: + afb_export_destroy(export); + free(desc); + return -1; } @@ -360,7 +230,7 @@ int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset) ERROR("binding [%s] bad api name...", path); goto error; } - if (!afb_api_is_valid_name(binding->api)) { + if (!afb_api_is_valid_name(binding->api, 1)) { ERROR("binding [%s] invalid api name...", path); goto error; }