X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=a22e4442cd8fc31ec6650e1e0979d9b6cc6b45a3;hb=41618d081d650f9cc105034bfa37d3b861663db7;hp=cc3447ab856b79796833c5bf764966df586f5a2e;hpb=65bc678960567038ca4d07d1f9c5784b6c7a7834;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so.c b/src/afb-api-so.c index cc3447ab..a22e4442 100644 --- a/src/afb-api-so.c +++ b/src/afb-api-so.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 "IoT.bzh" + * Copyright (C) 2016, 2017 "IoT.bzh" * Author José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,247 +16,117 @@ */ #define _GNU_SOURCE +#define NO_BINDING_VERBOSE_MACRO #include -#include +#include #include #include -#include -#include -#include -#include +#include #include -#include -#include -#include - -#include "session.h" -#include "afb-common.h" -#include "afb-context.h" -#include "afb-apis.h" #include "afb-api-so.h" -#include "afb-sig-handler.h" +#include "afb-api-so-v1.h" +#include "afb-api-so-v2.h" #include "verbose.h" -struct api_so_desc { - struct AFB_plugin *plugin; /* descriptor */ - size_t apilength; - void *handle; /* context of dlopen */ - struct AFB_interface interface; /* interface */ -}; - -static int api_timeout = 15; - -static const char plugin_register_function[] = "pluginAfbV1Entry"; - -static void afb_api_so_evmgr_push(struct api_so_desc *desc, const char *name, struct json_object *object) -{ - size_t length; - char *event; - - assert(desc->plugin != NULL); - length = strlen(name); - event = alloca(length + 2 + desc->apilength); - memcpy(event, desc->plugin->v1.prefix, desc->apilength); - event[desc->apilength] = '/'; - memcpy(event + desc->apilength + 1, name, length + 1); - ctxClientEventSend(NULL, event, object); -} - -static const struct afb_evmgr_itf evmgr_itf = { - .push = (void*)afb_api_so_evmgr_push -}; - -static struct afb_evmgr afb_api_so_get_evmgr(struct api_so_desc *desc) -{ - return (struct afb_evmgr){ .itf = &evmgr_itf, .closure = desc }; -} - -static const struct afb_daemon_itf daemon_itf = { - .get_evmgr = (void*)afb_api_so_get_evmgr, - .get_event_loop = (void*)afb_common_get_event_loop, - .get_user_bus = (void*)afb_common_get_user_bus, - .get_system_bus = (void*)afb_common_get_system_bus -}; - -struct monitoring { - struct afb_req req; - void (*action)(struct afb_req); -}; - -static void monitored_call(int signum, struct monitoring *data) -{ - if (signum != 0) - afb_req_fail_f(data->req, "aborted", "signal %s(%d) caught", strsignal(signum), signum); - else - data->action(data->req); -} - -static void call_check(struct afb_req req, struct afb_context *context, const struct AFB_verb_desc_v1 *verb) -{ - struct monitoring data; - - int stag = (int)(verb->session & AFB_SESSION_MASK); - - if (stag != AFB_SESSION_NONE) { - if (!afb_context_check(context)) { - afb_context_close(context); - afb_req_fail(req, "failed", "invalid token's identity"); - return; - } - } - - if ((stag & AFB_SESSION_CREATE) != 0) { - if (!afb_context_create(context)) { - afb_context_close(context); - afb_req_fail(req, "failed", "invalid creation state"); - return; - } - } - - if ((stag & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0) - afb_context_refresh(context); - - if ((stag & AFB_SESSION_CLOSE) != 0) - afb_context_close(context); - - data.req = req; - data.action = verb->callback; - afb_sig_monitor((void*)monitored_call, &data, api_timeout); -} - -static void call(struct api_so_desc *desc, struct afb_req req, struct afb_context *context, const char *verb, size_t lenverb) -{ - const struct AFB_verb_desc_v1 *v; - - v = desc->plugin->v1.verbs; - while (v->name && (strncasecmp(v->name, verb, lenverb) || v->name[lenverb])) - v++; - if (v->name) - call_check(req, context, v); - else - afb_req_fail_f(req, "unknown-verb", "verb %.*s unknown within api %s", (int)lenverb, verb, desc->plugin->v1.prefix); -} - -int afb_api_so_add_plugin(const char *path) +static int load_binding(const char *path, int force) { - struct api_so_desc *desc; - struct AFB_plugin *(*pluginAfbV1RegisterFct) (const struct AFB_interface *interface); - - desc = calloc(1, sizeof *desc); - if (desc == NULL) { - ERROR("out of memory"); + int rc; + void *handle; + + // This is a loadable library let's check if it's a binding + rc = -!!force; + handle = dlopen(path, RTLD_NOW | RTLD_LOCAL); + if (handle == NULL) { + if (force) + ERROR("binding [%s] not loadable: %s", path, dlerror()); + else + INFO("binding [%s] not loadable: %s", path, dlerror()); goto error; } - // This is a loadable library let's check if it's a plugin - desc->handle = dlopen(path, RTLD_NOW | RTLD_LOCAL); - if (desc->handle == NULL) { - ERROR("plugin [%s] not loadable", path); - goto error2; - } - /* retrieves the register function */ - pluginAfbV1RegisterFct = dlsym(desc->handle, plugin_register_function); - if (!pluginAfbV1RegisterFct) { - ERROR("plugin [%s] is not an AFB plugin", path); - goto error3; - } - INFO("plugin [%s] is a valid AFB plugin", path); - - /* init the interface */ - desc->interface.verbosity = 0; - desc->interface.mode = AFB_MODE_LOCAL; - desc->interface.daemon.itf = &daemon_itf; - desc->interface.daemon.closure = desc; - - /* init the plugin */ - desc->plugin = pluginAfbV1RegisterFct(&desc->interface); - if (desc->plugin == NULL) { - ERROR("plugin [%s] register function failed. continuing...", path); - goto error3; - } - - /* check the returned structure */ - if (desc->plugin->type != AFB_PLUGIN_VERSION_1) { - ERROR("plugin [%s] invalid type %d...", path, desc->plugin->type); - goto error3; - } - if (desc->plugin->v1.prefix == NULL || *desc->plugin->v1.prefix == 0) { - ERROR("plugin [%s] bad prefix...", path); - goto error3; - } - if (desc->plugin->v1.info == NULL || *desc->plugin->v1.info == 0) { - ERROR("plugin [%s] bad description...", path); - goto error3; + rc = afb_api_so_v2_add(path, handle); + if (rc < 0) { + /* error when loading a valid v2 binding */ + goto error2; } - if (desc->plugin->v1.verbs == NULL) { - ERROR("plugin [%s] no APIs...", path); - goto error3; + rc = afb_api_so_v1_add(path, handle); + if (rc < 0) { + /* error when loading a valid v1 binding */ + goto error2; } - - /* records the plugin */ - desc->apilength = strlen(desc->plugin->v1.prefix); - if (afb_apis_add(desc->plugin->v1.prefix, (struct afb_api){ - .closure = desc, - .call = (void*)call}) < 0) { - ERROR("plugin [%s] can't be registered...", path); - goto error3; + if (rc == 0) { + /* not a v1 binding */ + if (force) + ERROR("binding [%s] is not an AFB binding", path); + else + INFO("binding [%s] is not an AFB binding", path); + goto error2; } - NOTICE("plugin %s loaded with API prefix %s", path, desc->plugin->v1.prefix); return 0; -error3: - dlclose(desc->handle); error2: - free(desc); + dlclose(handle); error: - return -1; + return rc; +} + + +int afb_api_so_add_binding(const char *path) +{ + return load_binding(path, 1); } static int adddirs(char path[PATH_MAX], size_t end) { DIR *dir; - struct dirent ent, *result; + struct dirent *dent; size_t len; /* open the DIR now */ dir = opendir(path); if (dir == NULL) { - ERROR("can't scan plugin directory %s, %m", path); + ERROR("can't scan binding directory %s, %m", path); return -1; } - INFO("Scanning dir=[%s] for plugins", path); + INFO("Scanning dir=[%s] for bindings", path); /* scan each entry */ if (end) path[end++] = '/'; for (;;) { - readdir_r(dir, &ent, &result); - if (result == NULL) + errno = 0; + dent = readdir(dir); + if (dent == NULL) { + if (errno != 0) + ERROR("read error while scanning directory %.*s: %m", (int)(end - 1), path); break; + } - len = strlen(ent.d_name); + len = strlen(dent->d_name); if (len + end >= PATH_MAX) { - ERROR("path too long while scanning plugins for %s", ent.d_name); + ERROR("path too long while scanning bindings for %s", dent->d_name); continue; } - memcpy(&path[end], ent.d_name, len+1); - if (ent.d_type == DT_DIR) { + if (dent->d_type == DT_DIR) { /* case of directories */ - if (ent.d_name[0] == '.') { + if (dent->d_name[0] == '.') { if (len == 1) continue; - if (ent.d_name[1] == '.' && len == 2) + if (dent->d_name[1] == '.' && len == 2) continue; } + memcpy(&path[end], dent->d_name, len+1); adddirs(path, end+len);; - } else if (ent.d_type == DT_REG) { + } else if (dent->d_type == DT_REG) { /* case of files */ - if (!strstr(ent.d_name, ".so")) + if (memcmp(&dent->d_name[len - 3], ".so", 4)) continue; - afb_api_so_add_plugin(path); + memcpy(&path[end], dent->d_name, len+1); + if (load_binding(path, 0) < 0) + return -1; } } closedir(dir); @@ -285,13 +155,13 @@ int afb_api_so_add_path(const char *path) rc = stat(path, &st); if (rc < 0) - ERROR("Invalid plugin path [%s]: %m", path); + ERROR("Invalid binding path [%s]: %m", path); else if (S_ISDIR(st.st_mode)) rc = afb_api_so_add_directory(path); else if (strstr(path, ".so")) - rc = afb_api_so_add_plugin(path); + rc = load_binding(path, 0); else - INFO("not a plugin [%s], skipped", path); + INFO("not a binding [%s], skipped", path); return rc; } @@ -305,7 +175,8 @@ int afb_api_so_add_pathset(const char *pathset) p = strsep(&ps, sep); if (!p) return 0; - afb_api_so_add_path(p); - }; + if (afb_api_so_add_path(p) < 0) + return -1; + } }