X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=59a319521fb0dd46583d35bfcbc24a379d39e258;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=edc31d530e26510ff24b13f109d3dca4c7ff094b;hpb=ae5d707f9348b50d44724ec2b091f4528ff0a72b;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c index edc31d53..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,15 +15,19 @@ * limitations under the License. */ +#if WITH_LEGACY_BINDING_V2 && WITH_DYNAMIC_BINDING + #define _GNU_SOURCE #include #include #include #include +#include +#include -#include #include +#include #include "afb-api.h" #include "afb-api-so-v2.h" @@ -34,6 +38,7 @@ #include "afb-context.h" #include "afb-api-so.h" #include "afb-xreq.h" +#include "sig-monitor.h" #include "verbose.h" /* @@ -42,77 +47,56 @@ static const char afb_api_so_v2_descriptor[] = "afbBindingV2"; static const char afb_api_so_v2_data[] = "afbBindingV2data"; -/* - * Description of a binding - */ -struct api_so_v2 { - const struct afb_binding_v2 *binding; /* descriptor */ - void *handle; /* context of dlopen */ - struct afb_export *export; /* exportations */ +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); } -static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset) -{ - struct api_so_v2 *desc = closure; - return afb_export_start(desc->export, share_session, onneed, apiset); -} - -static void update_hooks_cb(void *closure) -{ - struct api_so_v2 *desc = closure; - afb_export_update_hook(desc->export); -} - -static int get_verbosity_cb(void *closure) -{ - struct api_so_v2 *desc = closure; - return afb_export_verbosity_get(desc->export); -} - -static void set_verbosity_cb(void *closure, int level) -{ - struct api_so_v2 *desc = closure; - afb_export_verbosity_set(desc->export, level); -} - -static struct json_object *make_description_openAPIv3(struct api_so_v2 *desc) +struct json_object *afb_api_so_v2_make_description_openAPIv3(const struct afb_binding_v2 *binding, const char *apiname) { char buffer[256]; const struct afb_verb_v2 *verb; struct json_object *r, *f, *a, *i, *p, *g; + enum json_tokener_error jerr; + + if (binding->specification) { + r = json_tokener_parse_verbose(binding->specification, &jerr); + if (jerr == json_tokener_success) + return r; + } 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(afb_export_apiname(desc->export))); + 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(desc->binding->info ?: afb_export_apiname(desc->export))); + 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 = desc->binding->verbs; + verb = binding->verbs; while (verb->verb) { buffer[0] = '/'; strncpy(buffer + 1, verb->verb, sizeof buffer - 1); @@ -122,7 +106,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 = afb_auth_json_v2(verb->auth, verb->session); + a = afb_auth_json_x2(verb->auth, verb->session); if (a) json_object_object_add(g, "x-permissions", a); @@ -136,30 +120,29 @@ static struct json_object *make_description_openAPIv3(struct api_so_v2 *desc) return r; } -static struct json_object *describe_cb(void *closure) +static void do_preinit(int sig, 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_openAPIv3(desc); - return r; -} + struct preinit *preinit = closure; -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 + 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, struct afb_binding_data_v2 *data) +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); @@ -168,45 +151,40 @@ 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 || !export) { + 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->handle = handle; - desc->export = export; + /* 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->preinit) { INFO("binding %s calling preinit function", binding->api); - rc = binding->preinit(); + preinit.binding = binding; + sig_monitor(0, do_preinit, &preinit); + rc = preinit.return_code; if (rc < 0) { - ERROR("binding %s preinit function failed...", afb_export_apiname(desc->export)); + 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 = &so_v2_api_itf; - 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", afb_export_apiname(desc->export), afb_apiset_name(apiset)); + INFO("binding %s added to set %s", afb_export_apiname(export), afb_apiset_name(declare_set)); return 1; error: - afb_export_destroy(export); - free(desc); + 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; struct afb_binding_data_v2 *data; @@ -233,20 +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 0 - if (binding->specification == NULL || *binding->specification == 0) { - ERROR("binding [%s] bad specification...", path); - goto error; - } -#endif + if (binding->verbs == NULL) { ERROR("binding [%s] no verbs...", path); goto error; } - return afb_api_so_v2_add_binding(binding, handle, apiset, data); + return afb_api_so_v2_add_binding(binding, handle, declare_set, call_set, data, path); error: return -1; } +#endif