X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v1.c;h=b68d064a42c36231dd6978fff9eea22585a37266;hb=refs%2Fheads%2Fsandbox%2FDDTLK%2Fpakage;hp=8c4ea484a0a356dab1464287918276c920d71694;hpb=a8e971702f23ee67e02b4716ad4159f12cefdca6;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c index 8c4ea484..b68d064a 100644 --- a/src/afb-api-so-v1.c +++ b/src/afb-api-so-v1.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 "IoT.bzh" + * Copyright (C) 2016, 2017, 2018 "IoT.bzh" * Author José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,24 +15,27 @@ * limitations under the License. */ +#if defined(WITH_LEGACY_BINDING_V1) + #define _GNU_SOURCE -#define NO_BINDING_VERBOSE_MACRO +#include #include #include #include +#include -#include +#include +#include #include "afb-api.h" +#include "afb-api-so-v1.h" #include "afb-apiset.h" -#include "afb-svc.h" -#include "afb-evt.h" +#include "afb-export.h" #include "afb-common.h" #include "afb-context.h" #include "afb-api-so.h" #include "afb-xreq.h" -#include "afb-ditf.h" #include "verbose.h" /* @@ -42,173 +45,179 @@ static const char afb_api_so_v1_register[] = "afbBindingV1Register"; static const char afb_api_so_v1_service_init[] = "afbBindingV1ServiceInit"; static const char afb_api_so_v1_service_event[] = "afbBindingV1ServiceEvent"; -/* - * Description of a binding - */ -struct api_so_v1 { - struct afb_binding *binding; /* descriptor */ - void *handle; /* context of dlopen */ - struct afb_svc *service; /* handler for service started */ - struct afb_ditf ditf; /* daemon interface */ -}; - -static const struct afb_verb_desc_v1 *search(struct api_so_v1 *desc, const char *name) +static const struct afb_verb_desc_v1 *search(struct afb_binding_v1 *binding, const char *name) { const struct afb_verb_desc_v1 *verb; - verb = desc->binding->v1.verbs; + verb = binding->v1.verbs; while (verb->name && strcasecmp(verb->name, name)) verb++; return verb->name ? verb : NULL; } -static void call_cb(void *closure, struct afb_xreq *xreq) +void afb_api_so_v1_process_call(struct afb_binding_v1 *binding, struct afb_xreq *xreq) { const struct afb_verb_desc_v1 *verb; - struct api_so_v1 *desc = closure; - verb = search(desc, xreq->verb); - if (!verb) - afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, desc->binding->v1.prefix); - else - afb_xreq_so_call(xreq, verb->session, verb->callback); + verb = search(binding, xreq->request.called_verb); + afb_xreq_call_verb_v1(xreq, verb); } -static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset) +static struct json_object *addperm(struct json_object *o, struct json_object *x) { - int (*init)(struct afb_service service); - void (*onevent)(const char *event, struct json_object *object); - - struct api_so_v1 *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->v1.prefix); - return -1; - } + struct json_object *a; - /* get the initialisation */ - init = dlsym(desc->handle, afb_api_so_v1_service_init); - if (init == NULL) { - /* not an error when onneed */ - if (onneed != 0) - return 0; + if (!o) + return x; - /* no initialisation method */ - ERROR("Binding %s is not a service", desc->binding->v1.prefix); - return -1; + 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); } - - /* get the event handler if any */ - onevent = dlsym(desc->handle, afb_api_so_v1_service_event); - desc->service = afb_svc_create(apiset, share_session, init, onevent); - if (desc->service == NULL) { - /* starting error */ - ERROR("Starting service %s failed", desc->binding->v1.prefix); - return -1; - } - - return 0; + json_object_array_add(a, x); + return o; } -static void update_hooks_cb(void *closure) +static struct json_object *addperm_key_val(struct json_object *o, const char *key, struct json_object *val) { - struct api_so_v1 *desc = closure; - afb_ditf_update_hook(&desc->ditf); + struct json_object *x = json_object_new_object(); + json_object_object_add(x, key, val); + return addperm(o, x); } -static int get_verbosity_cb(void *closure) +static struct json_object *addperm_key_valstr(struct json_object *o, const char *key, const char *val) { - struct api_so_v1 *desc = closure; - return desc->ditf.interface.verbosity; + return addperm_key_val(o, key, json_object_new_string(val)); } -static void set_verbosity_cb(void *closure, int level) +static struct json_object *addperm_key_valint(struct json_object *o, const char *key, int val) { - struct api_so_v1 *desc = closure; - desc->ditf.interface.verbosity = level; + return addperm_key_val(o, key, json_object_new_int(val)); } -static struct afb_api_itf so_v1_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 -}; +struct json_object *afb_api_so_v1_make_description_openAPIv3(struct afb_binding_v1 *binding, const char *apiname) +{ + char buffer[256]; + const struct afb_verb_desc_v1 *verb; + struct json_object *r, *f, *a, *i, *p, *g; + + 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->v1.info ?: apiname)); + + p = json_object_new_object(); + json_object_object_add(r, "paths", p); + verb = binding->v1.verbs; + while (verb->name) { + buffer[0] = '/'; + strncpy(buffer + 1, verb->name, 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 = NULL; + if (verb->session & AFB_SESSION_CLOSE_X1) + a = addperm_key_valstr(a, "session", "close"); + if (verb->session & AFB_SESSION_CHECK_X1) + a = addperm_key_valstr(a, "session", "check"); + if (verb->session & AFB_SESSION_RENEW_X1) + a = addperm_key_valstr(a, "token", "refresh"); + if (verb->session & AFB_SESSION_LOA_MASK_X1) + a = addperm_key_valint(a, "LOA", (verb->session >> AFB_SESSION_LOA_SHIFT_X1) & AFB_SESSION_LOA_MASK_X1); + 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++; + } + return r; +} -int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset) +int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *declare_set, struct afb_apiset * call_set) { - struct api_so_v1 *desc; - struct afb_binding *(*register_function) (const struct afb_binding_interface *interface); - struct afb_api afb_api; + struct afb_binding_v1 *binding; /* descriptor */ + struct afb_binding_v1 *(*register_function) (const struct afb_binding_interface_v1 *interface); + int (*init)(struct afb_service_x1 service); + void (*onevent)(const char *event, struct json_object *object); + struct afb_export *export; /* retrieves the register function */ register_function = dlsym(handle, afb_api_so_v1_register); if (!register_function) return 0; + INFO("binding [%s] is a valid AFB binding V1", path); /* allocates the description */ - desc = calloc(1, sizeof *desc); - if (desc == NULL) { - ERROR("out of memory"); + init = dlsym(handle, afb_api_so_v1_service_init); + onevent = dlsym(handle, afb_api_so_v1_service_event); + export = afb_export_create_v1(declare_set, call_set, path, init, onevent, path); + if (export == NULL) { + ERROR("binding [%s] creation failure...", path); goto error; } - desc->handle = handle; - - /* init the interface */ - afb_ditf_init(&desc->ditf, path); - - /* init the binding */ - NOTICE("binding [%s] calling registering function %s", path, afb_api_so_v1_register); - desc->binding = register_function(&desc->ditf.interface); - if (desc->binding == NULL) { - ERROR("binding [%s] register function failed. continuing...", path); - goto error2; + binding = afb_export_register_v1(export, register_function); + if (binding == NULL) { + ERROR("binding [%s] register failure...", path); + goto error; } /* check the returned structure */ - if (desc->binding->type != AFB_BINDING_VERSION_1) { - ERROR("binding [%s] invalid type %d...", path, desc->binding->type); - goto error2; + if (binding->type != AFB_BINDING_VERSION_1) { + ERROR("binding [%s] invalid type %d...", path, binding->type); + goto error; } - if (desc->binding->v1.prefix == NULL || *desc->binding->v1.prefix == 0) { + if (binding->v1.prefix == NULL || *binding->v1.prefix == 0) { ERROR("binding [%s] bad prefix...", path); - goto error2; + goto error; } - if (!afb_api_is_valid_name(desc->binding->v1.prefix)) { + if (!afb_api_is_valid_name(binding->v1.prefix)) { ERROR("binding [%s] invalid prefix...", path); - goto error2; + goto error; } - if (desc->binding->v1.info == NULL || *desc->binding->v1.info == 0) { + if (binding->v1.info == NULL || *binding->v1.info == 0) { ERROR("binding [%s] bad description...", path); - goto error2; + goto error; } - if (desc->binding->v1.verbs == NULL) { - ERROR("binding [%s] no APIs...", path); - goto error2; + if (binding->v1.verbs == NULL) { + ERROR("binding [%s] no verbs...", path); + goto error; } /* records the binding */ - afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix); - afb_api.closure = desc; - afb_api.itf = &so_v1_api_itf; - if (afb_apiset_add(apiset, desc->binding->v1.prefix, afb_api) < 0) { + if (!strcmp(path, afb_export_apiname(export))) { + if (afb_export_rename(export, binding->v1.prefix) < 0) { + ERROR("binding [%s] can't be renamed to %s", path, binding->v1.prefix); + goto error; + } + } + + if (afb_export_declare(export, 0) < 0) { ERROR("binding [%s] can't be registered...", path); - goto error2; + goto error; } - NOTICE("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix); + INFO("binding %s loaded with API prefix %s", path, afb_export_apiname(export)); + afb_export_unref(export); return 1; -error2: - free(desc); error: + afb_export_unref(export); + return -1; } +#endif +