*/
#define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
+#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
+#include <stdio.h>
#include <string.h>
#include <dlfcn.h>
#include <assert.h>
#include <json-c/json.h>
-#include <afb/afb-binding.h>
+#include <afb/afb-binding-v1.h>
#include "afb-api.h"
+#include "afb-api-so-v1.h"
#include "afb-apiset.h"
#include "afb-svc.h"
#include "afb-evt.h"
* Description of a binding
*/
struct api_so_v1 {
- struct afb_binding *binding; /* descriptor */
+ struct afb_binding_v1 *binding; /* descriptor */
void *handle; /* context of dlopen */
struct afb_svc *service; /* handler for service started */
+ struct afb_binding_interface_v1 interface;
struct afb_ditf ditf; /* daemon interface */
};
struct api_so_v1 *desc = closure;
verb = search(desc, xreq->verb);
- if (!verb)
- afb_xreq_fail_unknown_verb(xreq);
- else
- if (!xreq_session_check_apply(xreq, verb->session))
- afb_xreq_call(xreq, verb->callback);
+ afb_xreq_call_verb_v1(xreq, verb);
}
static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
/* get the initialisation */
init = dlsym(desc->handle, afb_api_so_v1_service_init);
- if (init == NULL) {
+ onevent = dlsym(desc->handle, afb_api_so_v1_service_event);
+ if (init == NULL && onevent == NULL) {
/* not an error when onneed */
if (onneed != 0)
return 0;
}
/* 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);
+ desc->service = afb_svc_create_v1(apiset, share_session, init, onevent);
if (desc->service == NULL) {
/* starting error */
ERROR("Starting service %s failed", desc->binding->v1.prefix);
static int get_verbosity_cb(void *closure)
{
struct api_so_v1 *desc = closure;
- return desc->ditf.interface.verbosity;
+ return desc->interface.verbosity;
}
static void set_verbosity_cb(void *closure, int level)
{
struct api_so_v1 *desc = closure;
- desc->ditf.interface.verbosity = level;
+ desc->interface.verbosity = level;
}
struct json_object *describe_cb(void *closure)
a = json_object_new_array();
json_object_object_add(f, "name", json_object_new_string(verb->name));
json_object_object_add(f, "info", json_object_new_string(verb->info));
- if (verb->session & AFB_SESSION_CREATE)
- json_object_array_add(a, json_object_new_string("session-create"));
- if (verb->session & AFB_SESSION_CLOSE)
+ if (verb->session & AFB_SESSION_CLOSE_V1)
json_object_array_add(a, json_object_new_string("session-close"));
- if (verb->session & AFB_SESSION_RENEW)
+ if (verb->session & AFB_SESSION_RENEW_V1)
json_object_array_add(a, json_object_new_string("session-renew"));
- if (verb->session & AFB_SESSION_CHECK)
+ if (verb->session & AFB_SESSION_CHECK_V1)
json_object_array_add(a, json_object_new_string("session-check"));
- if (verb->session & AFB_SESSION_LOA_EQ) {
+ if (verb->session & AFB_SESSION_LOA_EQ_V1) {
const char *rel = "?";
char buffer[80];
- switch (verb->session & AFB_SESSION_LOA_EQ) {
- case AFB_SESSION_LOA_GE: rel = ">="; break;
- case AFB_SESSION_LOA_LE: rel = "<="; break;
- case AFB_SESSION_LOA_EQ: rel = "=="; break;
+ switch (verb->session & AFB_SESSION_LOA_EQ_V1) {
+ case AFB_SESSION_LOA_GE_V1: rel = ">="; break;
+ case AFB_SESSION_LOA_LE_V1: rel = "<="; break;
+ case AFB_SESSION_LOA_EQ_V1: rel = "=="; break;
}
- snprintf(buffer, sizeof buffer, "LOA%s%d", rel, (int)((verb->session >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK));
+ snprintf(buffer, sizeof buffer, "LOA%s%d", rel, (int)((verb->session >> AFB_SESSION_LOA_SHIFT_V1) & AFB_SESSION_LOA_MASK_V1));
json_object_array_add(a, json_object_new_string(buffer));
}
json_object_object_add(f, "flags", a);
int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset)
{
struct api_so_v1 *desc;
- struct afb_binding *(*register_function) (const struct afb_binding_interface *interface);
+ struct afb_binding_v1 *(*register_function) (const struct afb_binding_interface_v1 *interface);
struct afb_api afb_api;
/* retrieves the register function */
desc->handle = handle;
/* init the interface */
- afb_ditf_init(&desc->ditf, path);
+ afb_ditf_init_v1(&desc->ditf, path, &desc->interface);
/* init the binding */
- NOTICE("binding [%s] calling registering function %s", path, afb_api_so_v1_register);
- desc->binding = register_function(&desc->ditf.interface);
+ INFO("binding [%s] calling registering function %s", path, afb_api_so_v1_register);
+ desc->binding = register_function(&desc->interface);
if (desc->binding == NULL) {
ERROR("binding [%s] register function failed. continuing...", path);
goto error2;
ERROR("binding [%s] can't be registered...", path);
goto error2;
}
- NOTICE("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix);
+ INFO("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix);
return 1;
error2: