Make monitor use the interface version 2

[src/app-framework-binder.git] / src / afb-api-so-v2.c

diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c
index 714bcd0..d56c985 100644 (file)
--- a/src/afb-api-so-v2.c
+++ b/src/afb-api-so-v2.c
@@ -23,8 +23,10 @@
 #include <assert.h>
 
 #include <afb/afb-binding.h>
+#include <json-c/json.h>
 
-#include "afb-apis.h"
+#include "afb-api.h"
+#include "afb-apiset.h"
 #include "afb-svc.h"
 #include "afb-ditf.h"
 #include "afb-evt.h"
@@ -43,7 +45,7 @@ static const char afb_api_so_v2_descriptor[] = "afbBindingV2";
  * Description of a binding
  */
 struct api_so_v2 {
-       struct afb_binding_v2 *binding; /* descriptor */
+       const struct afb_binding_v2 *binding;   /* descriptor */
        void *handle;                   /* context of dlopen */
        struct afb_svc *service;        /* handler for service started */
        struct afb_ditf ditf;           /* daemon interface */
@@ -66,12 +68,13 @@ static void call_cb(void *closure, struct afb_xreq *xreq)
 
        verb = search(desc, xreq->verb);
        if (!verb)
-               afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, desc->binding->api);
+               afb_xreq_fail_unknown_verb(xreq);
        else
-               afb_xreq_call(xreq, verb->session, verb->callback);
+               if (!xreq_session_check_apply(xreq, verb->session))
+                       afb_xreq_call(xreq, 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 (*start)(const struct afb_binding_interface *interface, struct afb_service service);
        void (*onevent)(const char *event, struct json_object *object);
@@ -103,7 +106,7 @@ static int service_start_cb(void *closure, int share_session, int onneed)
 
        /* get the event handler if any */
        onevent = desc->binding->onevent;
-       desc->service = afb_svc_create_v2(share_session, onevent, start, &desc->ditf.interface);
+       desc->service = afb_svc_create_v2(apiset, share_session, onevent, start, &desc->ditf.interface);
        if (desc->service == NULL) {
                /* starting error */
                ERROR("Starting service %s failed", desc->binding->api);
@@ -131,45 +134,32 @@ static void set_verbosity_cb(void *closure, int level)
        desc->ditf.interface.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 = {
        .call = call_cb,
        .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(const char *path, void *handle)
+int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle, struct afb_apiset *apiset)
 {
        int rc;
        struct api_so_v2 *desc;
-       struct afb_binding_v2 *binding;
        struct afb_api afb_api;
 
-       /* retrieves the register function */
-       binding = dlsym(handle, afb_api_so_v2_descriptor);
-       if (!binding)
-               return 0;
-
-       INFO("binding [%s] looks like an AFB binding V2", path);
-
        /* basic checks */
-       if (binding->api == NULL || *binding->api == 0) {
-               ERROR("binding [%s] bad api name...", path);
-               goto error;
-       }
-       if (!afb_apis_is_valid_api_name(binding->api)) {
-               ERROR("binding [%s] invalid api name...", path);
-               goto error;
-       }
-       if (binding->specification == NULL || *binding->specification == 0) {
-               ERROR("binding [%s] bad specification...", path);
-               goto error;
-       }
-       if (binding->verbs == NULL) {
-               ERROR("binding [%s] no verbs...", path);
-               goto error;
-       }
+       assert(binding->api);
+       assert(binding->specification);
+       assert(binding->verbs);
 
        /* allocates the description */
        desc = calloc(1, sizeof *desc);
@@ -183,14 +173,12 @@ int afb_api_so_v2_add(const char *path, void *handle)
        /* init the interface */
        afb_ditf_init(&desc->ditf, binding->api);
 
-       /* for log purpose, a fake binding is needed here */
-
        /* init the binding */
        if (binding->init) {
-               NOTICE("binding %s [%s] calling init function", binding->api, path);
+               INFO("binding %s calling init function", binding->api);
                rc = binding->init(&desc->ditf.interface);
                if (rc < 0) {
-                       ERROR("binding %s [%s] initialisation function failed...", binding->api, path);
+                       ERROR("binding %s initialisation function failed...", binding->api);
                        goto error2;
                }
        }
@@ -198,11 +186,11 @@ int afb_api_so_v2_add(const char *path, void *handle)
        /* records the binding */
        afb_api.closure = desc;
        afb_api.itf = &so_v2_api_itf;
-       if (afb_apis_add(binding->api, afb_api) < 0) {
-               ERROR("binding [%s] can't be registered...", path);
+       if (afb_apiset_add(apiset, binding->api, afb_api) < 0) {
+               ERROR("binding %s can't be registered to set %s...", binding->api, afb_apiset_name(apiset));
                goto error2;
        }
-       NOTICE("binding %s loaded with API prefix %s", path, binding->api);
+       NOTICE("binding %s added to set %s", binding->api, afb_apiset_name(apiset));
        return 1;
 
 error2:
@@ -211,3 +199,38 @@ error:
        return -1;
 }
 
+int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset)
+{
+       const struct afb_binding_v2 *binding;
+
+       /* retrieves the register function */
+       binding = dlsym(handle, afb_api_so_v2_descriptor);
+       if (!binding)
+               return 0;
+
+       INFO("binding [%s] looks like an AFB binding V2", path);
+
+       /* basic checks */
+       if (binding->api == NULL || *binding->api == 0) {
+               ERROR("binding [%s] bad api name...", path);
+               goto error;
+       }
+       if (!afb_api_is_valid_name(binding->api)) {
+               ERROR("binding [%s] invalid api name...", path);
+               goto error;
+       }
+       if (binding->specification == NULL || *binding->specification == 0) {
+               ERROR("binding [%s] bad specification...", path);
+               goto error;
+       }
+       if (binding->verbs == NULL) {
+               ERROR("binding [%s] no verbs...", path);
+               goto error;
+       }
+
+       return afb_api_so_v2_add_binding(binding, handle, apiset);
+
+ error:
+       return -1;
+}
+