afb-api-so: improve error messages

[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 55e474c..acdb9b5 100644 (file)
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -27,7 +27,37 @@
 #include "afb-api-so.h"
 #include "afb-api-so-v1.h"
 #include "afb-api-so-v2.h"
+#include "afb-api-so-vdyn.h"
 #include "verbose.h"
+#include "sig-monitor.h"
+
+struct safe_dlopen
+{
+       const char *path;
+       void *handle;
+       int flags;
+};
+
+static void safe_dlopen_cb(int sig, void *closure)
+{
+       struct safe_dlopen *sd = closure;
+       if (!sig)
+               sd->handle = dlopen(sd->path, sd->flags);
+       else {
+               ERROR("dlopen of %s raised signal %s", sd->path, strsignal(sig));
+               sd->handle = NULL;
+       }
+}
+
+static void *safe_dlopen(const char *filename, int flags)
+{
+       struct safe_dlopen sd;
+       sd.path = filename;
+       sd.flags = flags;
+       sd.handle = NULL;
+       sig_monitor(0, safe_dlopen_cb, &sd);
+       return sd.handle;
+}
 
 static int load_binding(const char *path, int force, struct afb_apiset *apiset)
 {
@@ -36,12 +66,12 @@ static int load_binding(const char *path, int force, struct afb_apiset *apiset)
 
        // This is a loadable library let's check if it's a binding
        rc = -!!force;
-       handle = dlopen(path, RTLD_NOW | RTLD_LOCAL);
+       handle = safe_dlopen(path, RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND);
        if (handle == NULL) {
                if (force)
                        ERROR("binding [%s] not loadable: %s", path, dlerror());
                else
-                       INFO("binding [%s] not loadable: %s", path, dlerror());
+                       WARNING("binding [%s] not loadable: %s", path, dlerror());
                goto error;
        }
 
@@ -54,6 +84,15 @@ static int load_binding(const char *path, int force, struct afb_apiset *apiset)
        if (rc)
                return 0; /* yes version 2 */
 
+       /* try the version dyn */
+       rc = afb_api_so_vdyn_add(path, handle, apiset);
+       if (rc < 0) {
+               /* error when loading a valid dyn binding */
+               goto error2;
+       }
+       if (rc)
+               return 0; /* yes version dyn */
+
        /* try the version 1 */
        rc = afb_api_so_v1_add(path, handle, apiset);
        if (rc < 0) {
@@ -117,9 +156,9 @@ static int adddirs(char path[PATH_MAX], size_t end, struct afb_apiset *apiset, i
                        /* case of directories */
                        if (dent->d_name[0] == '.') {
                                if (len == 1)
-                                       continue;
+                                       continue; /* . */
                                if (dent->d_name[1] == '.' && len == 2)
-                                       continue;
+                                       continue; /* .. */
                        }
                        memcpy(&path[end], dent->d_name, len+1);
                        rc = adddirs(path, end+len, apiset, failstops);