improve log

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

diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c
index 8c4ea48..c5f20b7 100644 (file)
--- a/src/afb-api-so-v1.c
+++ b/src/afb-api-so-v1.c
@@ -16,15 +16,18 @@
  */
 
 #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 <json-c/json.h>
+
 #include <afb/afb-binding.h>
 
 #include "afb-api.h"
+#include "afb-api-so-v1.h"
 #include "afb-apiset.h"
 #include "afb-svc.h"
 #include "afb-evt.h"
@@ -68,10 +71,7 @@ static void call_cb(void *closure, struct afb_xreq *xreq)
        struct api_so_v1 *desc = closure;
 
        verb = search(desc, xreq->verb);
-       if (!verb)
-               afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, desc->binding->v1.prefix);
-       else
-               afb_xreq_so_call(xreq, verb->session, 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)
@@ -106,7 +106,7 @@ static int service_start_cb(void *closure, int share_session, int onneed, struct
 
        /* 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);
@@ -134,12 +134,54 @@ static void set_verbosity_cb(void *closure, int level)
        desc->ditf.interface.verbosity = level;
 }
 
+struct json_object *describe_cb(void *closure)
+{
+       struct api_so_v1 *desc = closure;
+       const struct afb_verb_desc_v1 *verb;
+       struct json_object *r, *v, *f, *a;
+
+       r = json_object_new_object();
+       json_object_object_add(r, "version", json_object_new_int(1));
+       json_object_object_add(r, "info", json_object_new_string(desc->binding->v1.info));
+       v = json_object_new_object();
+       json_object_object_add(r, "verbs", v);
+       verb = desc->binding->v1.verbs;
+       while (verb->name) {
+               f = json_object_new_object();
+               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_CLOSE)
+                       json_object_array_add(a, json_object_new_string("session-close"));
+               if (verb->session & AFB_SESSION_RENEW)
+                       json_object_array_add(a, json_object_new_string("session-renew"));
+               if (verb->session & AFB_SESSION_CHECK)
+                       json_object_array_add(a, json_object_new_string("session-check"));
+               if (verb->session & AFB_SESSION_LOA_EQ) {
+                       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;
+                       }
+                       snprintf(buffer, sizeof buffer, "LOA%s%d", rel, (int)((verb->session >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK));
+                       json_object_array_add(a, json_object_new_string(buffer));
+               }
+               json_object_object_add(f, "flags", a);
+               json_object_object_add(v, verb->name, f);
+               verb++;
+       }
+       return r;
+}
+
 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
+       .set_verbosity = set_verbosity_cb,
+       .describe = describe_cb
 };
 
 int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset)
@@ -163,10 +205,10 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset)
        desc->handle = handle;
 
        /* init the interface */
-       afb_ditf_init(&desc->ditf, path);
+       afb_ditf_init_v1(&desc->ditf, path);
 
        /* init the binding */
-       NOTICE("binding [%s] calling registering function %s", path, afb_api_so_v1_register);
+       INFO("binding [%s] calling registering function %s", path, afb_api_so_v1_register);
        desc->binding = register_function(&desc->ditf.interface);
        if (desc->binding == NULL) {
                ERROR("binding [%s] register function failed. continuing...", path);
@@ -203,7 +245,7 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset)
                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: