*/
#define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
+#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
#include <string.h>
#include <dlfcn.h>
#include <assert.h>
#include <afb/afb-binding.h>
+#include <json-c/json.h>
#include "afb-api.h"
+#include "afb-api-so-v2.h"
#include "afb-apiset.h"
#include "afb-svc.h"
#include "afb-ditf.h"
* names of symbols
*/
static const char afb_api_so_v2_descriptor[] = "afbBindingV2";
+static const char afb_api_so_v2_verbosity[] = "afbBindingV2verbosity";
/*
* Description of a binding
*/
struct api_so_v2 {
- struct afb_binding_v2 *binding; /* descriptor */
+ const struct afb_binding_v2 *binding; /* descriptor */
+ int *verbosity; /* verbosity */
void *handle; /* context of dlopen */
struct afb_svc *service; /* handler for service started */
struct afb_ditf ditf; /* daemon interface */
};
-static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *verb)
+static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *name)
{
- const struct afb_verb_v2 *result;
+ const struct afb_verb_v2 *verb;
- result = desc->binding->verbs;
- while (result->verb && strcasecmp(result->verb, verb))
- result++;
- return result->verb ? result : NULL;
+ verb = desc->binding->verbs;
+ while (verb->verb && strcasecmp(verb->verb, name))
+ verb++;
+ return verb->verb ? verb : NULL;
+ return NULL;
}
static void call_cb(void *closure, struct afb_xreq *xreq)
const struct afb_verb_v2 *verb;
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_v2(xreq, verb);
}
static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
{
- int (*start)(const struct afb_binding_interface *interface, struct afb_service service);
- void (*onevent)(const char *event, struct json_object *object);
+ int (*start)(struct afb_service service);
+ void (*onevent)(struct afb_service service, const char *event, struct json_object *object);
struct api_so_v2 *desc = closure;
/* get the event handler if any */
onevent = desc->binding->onevent;
- desc->service = afb_svc_create_v2(apiset, share_session, onevent, start, &desc->ditf.interface);
+ desc->service = afb_svc_create_v2(apiset, share_session, start, onevent, &desc->ditf);
if (desc->service == NULL) {
/* starting error */
ERROR("Starting service %s failed", desc->binding->api);
static int get_verbosity_cb(void *closure)
{
struct api_so_v2 *desc = closure;
- return desc->ditf.interface.verbosity;
+ return *desc->verbosity;
}
static void set_verbosity_cb(void *closure, int level)
{
struct api_so_v2 *desc = closure;
- desc->ditf.interface.verbosity = level;
+ *desc->verbosity = level;
+}
+
+static struct json_object *describe_cb(void *closure)
+{
+ struct api_so_v2 *desc = closure;
+ return desc->binding->specification ? json_tokener_parse(desc->binding->specification) : NULL;
}
static struct afb_api_itf so_v2_api_itf = {
.service_start = service_start_cb,
.update_hooks = update_hooks_cb,
.get_verbosity = get_verbosity_cb,
- .set_verbosity = set_verbosity_cb
+ .set_verbosity = set_verbosity_cb,
+ .describe = describe_cb
+
};
-int afb_api_so_v2_add_binding(struct afb_binding_v2 *binding, void *handle, struct afb_apiset *apiset)
+int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle, struct afb_apiset *apiset, int *pver)
{
int rc;
struct api_so_v2 *desc;
assert(binding->verbs);
/* allocates the description */
- desc = calloc(1, sizeof *desc);
+ desc = malloc(sizeof *desc);
if (desc == NULL) {
ERROR("out of memory");
goto error;
}
desc->binding = binding;
+ desc->verbosity = pver;
desc->handle = handle;
+ desc->service = NULL;
+ memset(&desc->ditf, 0, sizeof desc->ditf);
/* init the interface */
- afb_ditf_init(&desc->ditf, binding->api);
+ afb_ditf_init_v2(&desc->ditf, binding->api);
/* init the binding */
if (binding->init) {
INFO("binding %s calling init function", binding->api);
- rc = binding->init(&desc->ditf.interface);
+ rc = binding->init(desc->ditf.daemon);
if (rc < 0) {
ERROR("binding %s initialisation function failed...", binding->api);
goto error2;
ERROR("binding %s can't be registered to set %s...", binding->api, afb_apiset_name(apiset));
goto error2;
}
- NOTICE("binding %s added to set %s", binding->api, afb_apiset_name(apiset));
+ INFO("binding %s added to set %s", binding->api, afb_apiset_name(apiset));
return 1;
error2:
int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset)
{
- struct afb_binding_v2 *binding;
+ const struct afb_binding_v2 *binding;
+ int *pver;
/* retrieves the register function */
binding = dlsym(handle, afb_api_so_v2_descriptor);
- if (!binding)
+ pver = dlsym(handle, afb_api_so_v2_verbosity);
+ if (!binding && !pver)
return 0;
INFO("binding [%s] looks like an AFB binding V2", path);
/* basic checks */
+ if (!binding || !pver) {
+ ERROR("binding [%s] incomplete symbols...", path);
+ goto error;
+ }
if (binding->api == NULL || *binding->api == 0) {
ERROR("binding [%s] bad api name...", path);
goto error;
goto error;
}
- return afb_api_so_v2_add_binding(binding, handle, apiset);
+ return afb_api_so_v2_add_binding(binding, handle, apiset, pver);
error:
return -1;
Code Review / src / app-framework-binder.git / blobdiff