#include <afb/afb-plugin.h>
#include <afb/afb-req-itf.h>
-#include <afb/afb-evmgr-itf.h>
+#include <afb/afb-event-sender-itf.h>
#include "session.h"
#include "afb-common.h"
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;
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
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;
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)
{
struct api_so_desc *desc;
- struct AFB_plugin *(*pluginRegisterFct) (const struct AFB_interface *interface);
+ struct AFB_plugin *(*pluginAfbV1RegisterFct) (const struct AFB_interface *interface);
desc = calloc(1, sizeof *desc);
if (desc == NULL) {
}
/* retrieves the register function */
- pluginRegisterFct = dlsym(desc->handle, plugin_register_function);
- if (!pluginRegisterFct) {
+ pluginAfbV1RegisterFct = dlsym(desc->handle, plugin_register_function);
+ if (!pluginAfbV1RegisterFct) {
ERROR("plugin [%s] is not an AFB plugin", path);
goto error3;
}
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 (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: