X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=320834f7e23a3402605ab3e67936af03018054b5;hb=c20a2d779c32a4c0580a99e2cda2c3c6bc6156f3;hp=72599e5b07edb4b1634be356f2f7266153148531;hpb=06382af9092babedbf56aa1c00b3bd7cb0b86cda;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so.c b/src/afb-api-so.c index 72599e5b..320834f7 100644 --- a/src/afb-api-so.c +++ b/src/afb-api-so.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "session.h" #include "afb-common.h" @@ -48,9 +48,9 @@ struct api_so_desc { static int api_timeout = 15; -static const char plugin_register_function[] = "pluginRegister"; +static const char plugin_register_function[] = "pluginAfbV1Register"; -static void afb_api_so_evmgr_push(struct api_so_desc *desc, const char *name, struct json_object *object) +static void afb_api_so_event_sender_push(struct api_so_desc *desc, const char *name, struct json_object *object) { size_t length; char *event; @@ -58,23 +58,23 @@ static void afb_api_so_evmgr_push(struct api_so_desc *desc, const char *name, st assert(desc->plugin != NULL); length = strlen(name); event = alloca(length + 2 + desc->apilength); - memcpy(event, desc->plugin->prefix, 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 const struct afb_event_sender_itf event_sender_itf = { + .push = (void*)afb_api_so_event_sender_push }; -static struct afb_evmgr afb_api_so_get_evmgr(struct api_so_desc *desc) +static struct afb_event_sender afb_api_so_get_event_sender(struct api_so_desc *desc) { - return (struct afb_evmgr){ .itf = &evmgr_itf, .closure = desc }; + return (struct afb_event_sender){ .itf = &event_sender_itf, .closure = desc }; } static const struct afb_daemon_itf daemon_itf = { - .get_evmgr = (void*)afb_api_so_get_evmgr, + .get_event_sender = (void*)afb_api_so_get_event_sender, .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 @@ -93,7 +93,7 @@ static void monitored_call(int signum, struct monitoring *data) data->action(data->req); } -static void call_check(struct afb_req req, struct afb_context *context, const struct AFB_restapi *verb) +static void call_check(struct afb_req req, struct afb_context *context, const struct AFB_verb_desc_v1 *verb) { struct monitoring data; @@ -108,18 +108,21 @@ static void call_check(struct afb_req req, struct afb_context *context, const st } if ((stag & AFB_SESSION_CREATE) != 0) { - if (!afb_context_create(context)) { - afb_context_close(context); + if (afb_context_check_loa(context, 1)) { afb_req_fail(req, "failed", "invalid creation state"); return; } + afb_context_change_loa(context, 1); + afb_context_refresh(context); } if ((stag & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0) afb_context_refresh(context); - if ((stag & AFB_SESSION_CLOSE) != 0) + if ((stag & AFB_SESSION_CLOSE) != 0) { + afb_context_change_loa(context, 0); afb_context_close(context); + } data.req = req; data.action = verb->callback; @@ -128,42 +131,48 @@ static void call_check(struct afb_req req, struct afb_context *context, const st 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_restapi *v; + const struct AFB_verb_desc_v1 *v; - v = desc->plugin->apis; + 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->prefix); + 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) { + int rc; + void *handle; struct api_so_desc *desc; - struct AFB_plugin *(*pluginRegisterFct) (const struct AFB_interface *interface); - - desc = calloc(1, sizeof *desc); - if (desc == NULL) { - ERROR("out of memory"); - goto error; - } + struct AFB_plugin *(*pluginAfbV1RegisterFct) (const struct AFB_interface *interface); // 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) { + rc = 0; + handle = dlopen(path, RTLD_NOW | RTLD_LOCAL); + if (handle == NULL) { ERROR("plugin [%s] not loadable", path); - goto error2; + goto error; } /* retrieves the register function */ - pluginRegisterFct = dlsym(desc->handle, plugin_register_function); - if (!pluginRegisterFct) { + pluginAfbV1RegisterFct = dlsym(handle, plugin_register_function); + if (!pluginAfbV1RegisterFct) { ERROR("plugin [%s] is not an AFB plugin", path); - goto error3; + goto error2; } INFO("plugin [%s] is a valid AFB plugin", path); + rc = -1; + + /* allocates the description */ + desc = calloc(1, sizeof *desc); + if (desc == NULL) { + ERROR("out of memory"); + goto error2; + } + desc->handle = handle; /* init the interface */ desc->interface.verbosity = 0; @@ -172,47 +181,51 @@ int afb_api_so_add_plugin(const char *path) desc->interface.daemon.closure = desc; /* init the plugin */ - desc->plugin = pluginRegisterFct(&desc->interface); + 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_JSON) { + if (desc->plugin->type != AFB_PLUGIN_VERSION_1) { ERROR("plugin [%s] invalid type %d...", path, desc->plugin->type); goto error3; } - if (desc->plugin->prefix == NULL || *desc->plugin->prefix == 0) { + if (desc->plugin->v1.prefix == NULL || *desc->plugin->v1.prefix == 0) { ERROR("plugin [%s] bad prefix...", path); goto error3; } - if (desc->plugin->info == NULL || *desc->plugin->info == 0) { + if (!afb_apis_is_valid_api_name(desc->plugin->v1.prefix)) { + ERROR("plugin [%s] invalid prefix...", path); + goto error3; + } + if (desc->plugin->v1.info == NULL || *desc->plugin->v1.info == 0) { ERROR("plugin [%s] bad description...", path); goto error3; } - if (desc->plugin->apis == NULL) { + if (desc->plugin->v1.verbs == NULL) { ERROR("plugin [%s] no APIs...", path); goto error3; } /* records the plugin */ - desc->apilength = strlen(desc->plugin->prefix); - if (afb_apis_add(desc->plugin->prefix, (struct afb_api){ + 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; } - NOTICE("plugin %s loaded with API prefix %s", path, desc->plugin->prefix); + NOTICE("plugin %s loaded with API prefix %s", path, desc->plugin->v1.prefix); return 0; error3: - dlclose(desc->handle); -error2: free(desc); +error2: + dlclose(handle); error: - return -1; + return rc; } static int adddirs(char path[PATH_MAX], size_t end) @@ -256,7 +269,8 @@ static int adddirs(char path[PATH_MAX], size_t end) /* case of files */ if (!strstr(ent.d_name, ".so")) continue; - afb_api_so_add_plugin(path); + if (afb_api_so_add_plugin(path) < 0) + return -1; } } closedir(dir); @@ -305,7 +319,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; + } }