#include <afb/afb-binding.h>
-#include "afb-apis.h"
+#include "afb-api.h"
+#include "afb-apiset.h"
#include "afb-svc.h"
#include "afb-evt.h"
#include "afb-common.h"
if (!verb)
afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, desc->binding->v1.prefix);
else
- afb_xreq_call(xreq, verb->session, verb->callback);
+ afb_xreq_so_call(xreq, verb->session, verb->callback);
}
-static int service_start_cb(void *closure, int share_session, int onneed)
+static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
{
int (*init)(struct afb_service service);
void (*onevent)(const char *event, struct json_object *object);
/* get the event handler if any */
onevent = dlsym(desc->handle, afb_api_so_v1_service_event);
- desc->service = afb_svc_create(share_session, init, onevent);
+ desc->service = afb_svc_create(apiset, share_session, init, onevent);
if (desc->service == NULL) {
/* starting error */
ERROR("Starting service %s failed", desc->binding->v1.prefix);
afb_ditf_update_hook(&desc->ditf);
}
-int afb_api_so_v1_add(const char *path, void *handle)
+static int get_verbosity_cb(void *closure)
+{
+ struct api_so_v1 *desc = closure;
+ return desc->ditf.interface.verbosity;
+}
+
+static void set_verbosity_cb(void *closure, int level)
+{
+ struct api_so_v1 *desc = closure;
+ desc->ditf.interface.verbosity = level;
+}
+
+static struct afb_api_itf so_v1_api_itf = {
+ .call = call_cb,
+ .service_start = service_start_cb,
+ .update_hooks = update_hooks_cb,
+ .get_verbosity = get_verbosity_cb,
+ .set_verbosity = set_verbosity_cb
+};
+
+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);
ERROR("binding [%s] bad prefix...", path);
goto error2;
}
- if (!afb_apis_is_valid_api_name(desc->binding->v1.prefix)) {
+ if (!afb_api_is_valid_name(desc->binding->v1.prefix)) {
ERROR("binding [%s] invalid prefix...", path);
goto error2;
}
/* records the binding */
afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix);
afb_api.closure = desc;
- afb_api.call = call_cb;
- afb_api.service_start = service_start_cb;
- afb_api.update_hooks = update_hooks_cb;
- if (afb_apis_add(desc->binding->v1.prefix, afb_api) < 0) {
+ afb_api.itf = &so_v1_api_itf;
+ if (afb_apiset_add(apiset, desc->binding->v1.prefix, afb_api) < 0) {
ERROR("binding [%s] can't be registered...", path);
goto error2;
}