improve log
[src/app-framework-binder.git] / src / afb-api-so-v2.c
index 092fd31..11cd56f 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 #define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
+#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <string.h>
 #include <dlfcn.h>
@@ -26,6 +26,7 @@
 #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"
 #include "afb-context.h"
 #include "afb-api-so.h"
 #include "afb-xreq.h"
-#include "afb-perm.h"
 #include "verbose.h"
 
 /*
  * names of symbols
  */
 static const char afb_api_so_v2_descriptor[] = "afbBindingV2";
-
-/**
- * structure for memorizing verbs sorted with permissions
- */
-struct verb_v2 {
-       const struct afb_verb_v2 *verb;
-       struct afb_perm *perm;
-};
+static const char afb_api_so_v2_verbosity[] = "afbBindingV2verbosity";
 
 /*
  * Description of a binding
  */
 struct api_so_v2 {
        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 */
-       int count;
-       struct verb_v2 verbs[1];
 };
 
-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 *v;
-       int i, l, u, c;
-
-       l = 0;
-       u = desc->count;
-       while (l < u) {
-               i = (l + u) >> 1;
-               v = desc->verbs[i].verb;
-               c = strcasecmp(v->verb, verb);
-               if (c == 0)
-                       return v;
-               if (c < 0)
-                       l = i + 1;
-               else
-                       u = i;
-       }
+       const struct afb_verb_v2 *verb;
+
+       verb = desc->binding->verbs;
+       while (verb->verb && strcasecmp(verb->verb, name))
+               verb++;
+       return verb->verb ? verb : NULL;
        return NULL;
 }
 
@@ -94,8 +76,8 @@ static void call_cb(void *closure, struct afb_xreq *xreq)
 
 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;
 
@@ -124,7 +106,7 @@ static int service_start_cb(void *closure, int share_session, int onneed, struct
 
        /* 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);
@@ -143,13 +125,13 @@ static void update_hooks_cb(void *closure)
 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)
@@ -168,68 +150,36 @@ static struct afb_api_itf so_v2_api_itf = {
 
 };
 
-int afb_api_so_v2_add_binding(const 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;
        struct afb_api afb_api;
-       const struct afb_verb_v2 *bv;
-       int count, i, j;
 
        /* basic checks */
        assert(binding->api);
        assert(binding->specification);
        assert(binding->verbs);
 
-       /* count the verbs */
-       count = 0;
-       while (binding->verbs[count].verb)
-               count++;
-
        /* allocates the description */
-       desc = malloc(sizeof *desc + (count - 1) * sizeof desc->verbs);
+       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);
-       desc->count = count;
-
-       /* fill the verbs sorted */
-       for (i = 0 ; i < count ; i++) {
-               desc->verbs[i].perm = NULL;
-               j = i;
-               bv = &binding->verbs[j];
-               while (j && strcasecmp(bv->verb, desc->verbs[j-1].verb->verb) < 0) {
-                       desc->verbs[j].verb = desc->verbs[j-1].verb;
-                       j--;
-               }
-               desc->verbs[j].verb = bv;
-       }
-
-       /* makes the permissions */
-       for (i = 0 ; i < count ; i++) {
-               if (desc->verbs[i].verb->permissions) {
-                       desc->verbs[i].perm = afb_perm_parse(desc->verbs[i].verb->permissions);
-                       if (!desc->verbs[i].perm) {
-                               ERROR("Bad permission specification for verb %s of api %s: %s",
-                                       desc->verbs[i].verb->verb, binding->api,
-                                       desc->verbs[i].verb->permissions);
-                               goto error2;
-                       }
-               }
-       }
 
        /* 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;
@@ -243,14 +193,10 @@ int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle
                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:
-       count = desc->count;
-       while (count)
-               if (desc->verbs[--count].perm)
-                       afb_perm_unref(desc->verbs[count].perm);
        free(desc);
 error:
        return -1;
@@ -259,15 +205,21 @@ error:
 int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset)
 {
        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;
@@ -285,7 +237,7 @@ int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset)
                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;