X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=dcefc76934c919ec5e10b2ee39616f06ce1e3898;hb=5659246230cef16abae4b1edda9791a1f25fc03d;hp=1c5fe520b6ba5f7558cb035f0e92cf656fd97182;hpb=db01090e1f869965c07b12d9480fa6f3d2e7b1b0;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c index 1c5fe520..dcefc769 100644 --- a/src/afb-api-so-v2.c +++ b/src/afb-api-so-v2.c @@ -16,7 +16,6 @@ */ #define _GNU_SOURCE -#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO #include #include @@ -29,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-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" /* @@ -50,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) @@ -76,89 +71,73 @@ static void call_cb(void *closure, struct afb_xreq *xreq) afb_xreq_call_verb_v2(xreq, verb); } -struct call_sync -{ - struct api_so_v2 *desc; - struct afb_xreq *xreq; -}; - -static void call_sync_cb_cb(int signum, void *closure) -{ - struct call_sync *cs = closure; - if (!signum) - call_cb(cs->desc, cs->xreq); - else { - if (!cs->xreq->replied) - afb_xreq_fail(cs->xreq, "aborted", "internal error"); - } -} - -static void call_sync_cb(void *closure, struct afb_xreq *xreq) -{ - struct call_sync cs = { .desc = closure, .xreq = xreq }; - - if (jobs_call(closure, 0, call_sync_cb_cb, &cs)) - call_cb(closure, xreq); -} - 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) { + if (afb_export_is_started(desc->export)) { /* not an error when onneed */ if (onneed != 0) - return 0; + goto done; /* already started: it is an error */ - ERROR("Service %s already started", desc->binding->api); + ERROR("Service %s already started", afb_export_apiname(desc->export)); 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) - return 0; - /* no initialisation method */ - ERROR("Binding %s is not a service", desc->binding->api); - return -1; + /* unshare the session if asked */ + if (!share_session) { + rc = afb_export_unshare_session(desc->export); + if (rc < 0) { + ERROR("Can't unshare the session for %s", afb_export_apiname(desc->export)); + return -1; + } } - /* get the event handler if any */ - desc->service = afb_svc_create_v2(apiset, share_session, start, onevent, desc->data); - if (desc->service == NULL) { - /* starting error */ - ERROR("Starting service %s failed", desc->binding->api); + /* set event handling */ + rc = afb_export_handle_events(desc->export, onevent); + if (rc < 0) { + ERROR("Can't set event handler for %s", afb_export_apiname(desc->export)); return -1; } + /* Starts the service */ + rc = afb_export_start_v2(desc->export, start); + if (rc < 0) { + /* initialisation error */ + ERROR("Initialisation of service %s failed (%d): %m", afb_export_apiname(desc->export), rc); + return rc; + } + +done: return 0; } static void update_hooks_cb(void *closure) { struct api_so_v2 *desc = closure; - afb_ditf_update_hook(&desc->ditf); + 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; + afb_export_verbosity_set(desc->export, level); } static struct json_object *addperm(struct json_object *o, struct json_object *x) @@ -195,7 +174,36 @@ static struct json_object *addperm_key_valint(struct json_object *o, const char return addperm_key_val(o, key, json_object_new_int(val)); } -static struct json_object *make_description(struct api_so_v2 *desc) +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; +} + +static struct json_object *make_description_openAPIv3(struct api_so_v2 *desc) { char buffer[256]; const struct afb_verb_v2 *verb; @@ -206,8 +214,9 @@ static struct json_object *make_description(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->binding->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 ?: afb_export_apiname(desc->export))); p = json_object_new_object(); json_object_object_add(r, "paths", p); @@ -230,10 +239,8 @@ static struct json_object *make_description(struct api_so_v2 *desc) 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 0 if (verb->auth) - a = -#endif + a = addauth(a, verb->auth); if (a) json_object_object_add(g, "x-permissions", a); @@ -241,7 +248,7 @@ static struct json_object *make_description(struct api_so_v2 *desc) 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->verb)); + json_object_object_add(f, "description", json_object_new_string(verb->info?:verb->verb)); verb++; } return r; @@ -252,7 +259,7 @@ static struct json_object *describe_cb(void *closure) struct api_so_v2 *desc = closure; struct json_object *r = desc->binding->specification ? json_tokener_parse(desc->binding->specification) : NULL; if (!r) - r = make_description(desc); + r = make_description_openAPIv3(desc); return r; } @@ -265,20 +272,12 @@ static struct afb_api_itf so_v2_api_itf = { .describe = describe_cb }; -static struct afb_api_itf so_v2_sync_api_itf = { - .call = call_sync_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_v2_add_binding(const struct afb_binding_v2 *binding, void *handle, struct afb_apiset *apiset, struct afb_binding_data_v2 *data) { int rc; struct api_so_v2 *desc; struct afb_api afb_api; + struct afb_export *export; /* basic checks */ assert(binding); @@ -287,43 +286,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(binding->api, data); desc = calloc(1, sizeof *desc); if (desc == NULL) { 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...", binding->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 = binding->noconcurrency ? &so_v2_sync_api_itf : &so_v2_api_itf; - if (afb_apiset_add(apiset, binding->api, afb_api) < 0) { - ERROR("binding %s can't be registered to set %s...", binding->api, afb_apiset_name(apiset)); - goto error2; + afb_api.itf = &so_v2_api_itf; + afb_api.noconcurrency = binding->noconcurrency; + 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", binding->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; }