add log macros for plugins

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

diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index 320834f..3cf1fea 100644 (file)
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define NO_PLUGIN_VERBOSE_MACRO
 
 #include <stdio.h>
 #include <assert.h>
@@ -39,16 +40,19 @@
 #include "afb-sig-handler.h"
 #include "verbose.h"
 
+/*
+ * Description of a plugin
+ */
 struct api_so_desc {
        struct AFB_plugin *plugin;      /* descriptor */
-       size_t apilength;
+       size_t apilength;               /* length of the API name */
        void *handle;                   /* context of dlopen */
-       struct AFB_interface interface; /* interface */
+       struct AFB_interface interface; /* interface for the plugin */
 };
 
 static int api_timeout = 15;
 
-static const char plugin_register_function[] = "pluginAfbV1Register";
+static const char plugin_register_function_v1[] = "pluginAfbV1Register";
 
 static void afb_api_so_event_sender_push(struct api_so_desc *desc, const char *name, struct json_object *object)
 {
@@ -73,11 +77,24 @@ static struct afb_event_sender afb_api_so_get_event_sender(struct api_so_desc *d
        return (struct afb_event_sender){ .itf = &event_sender_itf, .closure = desc };
 }
 
+static void afb_api_so_vverbose(struct api_so_desc *desc, int level, const char *file, int line, const char *fmt, va_list args)
+{
+       char *p;
+
+       if (vasprintf(&p, fmt, args) < 0)
+               vverbose(level, file, line, fmt, args);
+       else {
+               verbose(level, file, line, "%s {plugin %s}", p, desc->plugin->v1.prefix);
+               free(p);
+       }
+}
+
 static const struct afb_daemon_itf daemon_itf = {
        .get_event_sender = (void*)afb_api_so_get_event_sender,
        .get_event_loop = (void*)afb_common_get_event_loop,
        .get_user_bus = (void*)afb_common_get_user_bus,
-       .get_system_bus = (void*)afb_common_get_system_bus
+       .get_system_bus = (void*)afb_common_get_system_bus,
+       .vverbose = (void*)afb_api_so_vverbose
 };
 
 struct monitoring {
@@ -97,9 +114,9 @@ static void call_check(struct afb_req req, struct afb_context *context, const st
 {
        struct monitoring data;
 
-       int stag = (int)(verb->session & AFB_SESSION_MASK);
+       int stag = (int)verb->session;
 
-       if (stag != AFB_SESSION_NONE) {
+       if ((stag & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
                if (!afb_context_check(context)) {
                        afb_context_close(context);
                        afb_req_fail(req, "failed", "invalid token's identity");
@@ -124,6 +141,22 @@ static void call_check(struct afb_req req, struct afb_context *context, const st
                afb_context_close(context);
        }
 
+       if ((stag & AFB_SESSION_LOA_GE) != 0) {
+               int loa = (stag >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
+               if (!afb_context_check_loa(context, loa)) {
+                       afb_req_fail(req, "failed", "invalid LOA");
+                       return;
+               }
+       }
+
+       if ((stag & AFB_SESSION_LOA_LE) != 0) {
+               int loa = (stag >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
+               if (afb_context_check_loa(context, loa + 1)) {
+                       afb_req_fail(req, "failed", "invalid LOA");
+                       return;
+               }
+       }
+
        data.req = req;
        data.action = verb->callback;
        afb_sig_monitor((void*)monitored_call, &data, api_timeout);
@@ -158,7 +191,7 @@ int afb_api_so_add_plugin(const char *path)
        }
 
        /* retrieves the register function */
-       pluginAfbV1RegisterFct = dlsym(handle, plugin_register_function);
+       pluginAfbV1RegisterFct = dlsym(handle, plugin_register_function_v1);
        if (!pluginAfbV1RegisterFct) {
                ERROR("plugin [%s] is not an AFB plugin", path);
                goto error2;
@@ -175,7 +208,7 @@ int afb_api_so_add_plugin(const char *path)
        desc->handle = handle;
 
        /* init the interface */
-       desc->interface.verbosity = 0;
+       desc->interface.verbosity = verbosity;
        desc->interface.mode = AFB_MODE_LOCAL;
        desc->interface.daemon.itf = &daemon_itf;
        desc->interface.daemon.closure = desc;