X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=59a319521fb0dd46583d35bfcbc24a379d39e258;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=e0769213382f9a6d8de17351bb53dd37dc10c25c;hpb=bd4f365ba69281941c14b2c02d58f4b37a22b42d;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c index e0769213..59a31952 100644 --- a/src/afb-api-so-v2.c +++ b/src/afb-api-so-v2.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 "IoT.bzh" + * Copyright (C) 2015-2020 "IoT.bzh" * Author José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,243 +15,192 @@ * limitations under the License. */ +#if WITH_LEGACY_BINDING_V2 && WITH_DYNAMIC_BINDING + #define _GNU_SOURCE -#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO +#include #include #include #include +#include +#include -#include #include +#include #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 "sig-monitor.h" #include "verbose.h" /* * names of symbols */ static const char afb_api_so_v2_descriptor[] = "afbBindingV2"; -static const char afb_api_so_v2_verbosity[] = "afbBindingV2verbosity"; +static const char afb_api_so_v2_data[] = "afbBindingV2data"; -/* - * Description of a binding - */ -struct api_so_v2 { - const struct afb_binding_v2 *binding; /* descriptor */ - int *verbosity; /* verbosity */ - void *handle; /* context of dlopen */ - struct afb_svc *service; /* handler for service started */ - struct afb_ditf ditf; /* daemon interface */ +struct preinit +{ + int return_code; + const struct afb_binding_v2 *binding; }; -static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *name) +static const struct afb_verb_v2 *search(const struct afb_binding_v2 *binding, const char *name) { const struct afb_verb_v2 *verb; - verb = desc->binding->verbs; + verb = binding->verbs; while (verb->verb && strcasecmp(verb->verb, name)) verb++; return verb->verb ? verb : NULL; return NULL; } -static void call_cb(void *closure, struct afb_xreq *xreq) +void afb_api_so_v2_process_call(const struct afb_binding_v2 *binding, struct afb_xreq *xreq) { - struct api_so_v2 *desc = closure; const struct afb_verb_v2 *verb; - verb = search(desc, xreq->verb); + verb = search(binding, xreq->request.called_verb); 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 json_object *afb_api_so_v2_make_description_openAPIv3(const struct afb_binding_v2 *binding, const char *apiname) { - 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 (*start)(struct afb_service service); - void (*onevent)(struct afb_service service, 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) - return 0; - - /* already started: it is an error */ - ERROR("Service %s already started", desc->binding->api); - return -1; - } - - /* get the initialisation */ - start = desc->binding->start; - if (start == NULL) { - /* not an error when onneed */ - if (onneed != 0) - return 0; + char buffer[256]; + const struct afb_verb_v2 *verb; + struct json_object *r, *f, *a, *i, *p, *g; + enum json_tokener_error jerr; - /* no initialisation method */ - ERROR("Binding %s is not a service", desc->binding->api); - return -1; + if (binding->specification) { + r = json_tokener_parse_verbose(binding->specification, &jerr); + if (jerr == json_tokener_success) + return r; } - /* get the event handler if any */ - onevent = desc->binding->onevent; - desc->service = afb_svc_create_v2(apiset, share_session, start, onevent, &desc->ditf); - if (desc->service == NULL) { - /* starting error */ - ERROR("Starting service %s failed", desc->binding->api); - return -1; + 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(apiname)); + json_object_object_add(i, "version", json_object_new_string("0.0.0")); + json_object_object_add(i, "description", json_object_new_string(binding->info ?: apiname)); + + p = json_object_new_object(); + json_object_object_add(r, "paths", p); + verb = binding->verbs; + while (verb->verb) { + buffer[0] = '/'; + strncpy(buffer + 1, verb->verb, 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 = afb_auth_json_x2(verb->auth, verb->session); + 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->verb)); + verb++; } - - return 0; + return r; } -static void update_hooks_cb(void *closure) +static void do_preinit(int sig, void *closure) { - struct api_so_v2 *desc = closure; - afb_ditf_update_hook(&desc->ditf); -} - -static int get_verbosity_cb(void *closure) -{ - struct api_so_v2 *desc = closure; - return *desc->verbosity; -} - -static void set_verbosity_cb(void *closure, int level) -{ - struct api_so_v2 *desc = closure; - *desc->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, - .describe = describe_cb -}; + struct preinit *preinit = closure; -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 + if (!sig) + preinit->return_code = preinit->binding->preinit(); + else { + errno = EINTR; + preinit->return_code = -1; + } }; -int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle, struct afb_apiset *apiset, int *pver) +int afb_api_so_v2_add_binding( + const struct afb_binding_v2 *binding, + void *handle, + struct afb_apiset *declare_set, + struct afb_apiset * call_set, + struct afb_binding_data_v2 *data, + const char *path) { int rc; - struct api_so_v2 *desc; - struct afb_api afb_api; + struct afb_export *export; + struct preinit preinit; /* basic checks */ + assert(binding); assert(binding->api); - assert(binding->specification); assert(binding->verbs); + assert(data); /* allocates the description */ - desc = malloc(sizeof *desc); - if (desc == NULL) { + export = afb_export_create_v2(declare_set, call_set, binding->api, binding, data, binding->init, binding->onevent, path); + if (!export) { ERROR("out of memory"); goto error; } - desc->binding = binding; - desc->verbosity = pver; - desc->handle = handle; - desc->service = NULL; - memset(&desc->ditf, 0, sizeof desc->ditf); - - /* init the interface */ - afb_ditf_init_v2(&desc->ditf, binding->api); + /* records the binding */ + if (afb_export_declare(export, binding->noconcurrency) < 0) { + ERROR("binding %s can't be registered to set %s...", afb_export_apiname(export), afb_apiset_name(declare_set)); + goto error; + } /* init the binding */ - if (binding->init) { - INFO("binding %s calling init function", binding->api); - rc = binding->init(desc->ditf.daemon); + if (binding->preinit) { + INFO("binding %s calling preinit function", binding->api); + preinit.binding = binding; + sig_monitor(0, do_preinit, &preinit); + rc = preinit.return_code; if (rc < 0) { - ERROR("binding %s initialisation function failed...", binding->api); - goto error2; + ERROR("binding %s preinit function failed...", afb_export_apiname(export)); + afb_export_undeclare(export); + goto error; } } - /* records the binding */ - afb_api.closure = desc; - afb_api.itf = binding->concurrent ? &so_v2_api_itf : &so_v2_sync_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; - } - INFO("binding %s added to set %s", binding->api, afb_apiset_name(apiset)); + INFO("binding %s added to set %s", afb_export_apiname(export), afb_apiset_name(declare_set)); return 1; -error2: - free(desc); error: + afb_export_unref(export); + return -1; } -int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset) +int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *declare_set, struct afb_apiset * call_set) { const struct afb_binding_v2 *binding; - int *pver; + struct afb_binding_data_v2 *data; /* retrieves the register function */ binding = dlsym(handle, afb_api_so_v2_descriptor); - pver = dlsym(handle, afb_api_so_v2_verbosity); - if (!binding && !pver) + data = dlsym(handle, afb_api_so_v2_data); + if (!binding && !data) return 0; INFO("binding [%s] looks like an AFB binding V2", path); /* basic checks */ - if (!binding || !pver) { - ERROR("binding [%s] incomplete symbols...", path); + if (!binding || !data) { + ERROR("binding [%s] incomplete symbol set: %s is missing", + path, binding ? afb_api_so_v2_data : afb_api_so_v2_descriptor); goto error; } if (binding->api == NULL || *binding->api == 0) { @@ -262,18 +211,16 @@ int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset) 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, pver); + return afb_api_so_v2_add_binding(binding, handle, declare_set, call_set, data, path); error: return -1; } +#endif