Allow pure dynamic bindings

[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 bee5fe8..2a0f9d6 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,7 +66,7 @@ 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());
@@ -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) {
@@ -81,11 +120,12 @@ int afb_api_so_add_binding(const char *path, struct afb_apiset *apiset)
        return load_binding(path, 1, apiset);
 }
 
-static int adddirs(char path[PATH_MAX], size_t end, struct afb_apiset *apiset)
+static int adddirs(char path[PATH_MAX], size_t end, struct afb_apiset *apiset, int failstops)
 {
        DIR *dir;
        struct dirent *dent;
        size_t len;
+       int rc = 0;
 
        /* open the DIR now */
        dir = opendir(path);
@@ -116,26 +156,29 @@ static int adddirs(char path[PATH_MAX], size_t end, struct afb_apiset *apiset)
                        /* 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);
-                       adddirs(path, end+len, apiset);
+                       rc = adddirs(path, end+len, apiset, failstops);
                } else if (dent->d_type == DT_REG) {
                        /* case of files */
                        if (memcmp(&dent->d_name[len - 3], ".so", 4))
                                continue;
                        memcpy(&path[end], dent->d_name, len+1);
-                       if (load_binding(path, 0, apiset) < 0)
-                               return -1;
+                       rc = load_binding(path, 0, apiset);
+               }
+               if (rc < 0 && failstops) {
+                       closedir(dir);
+                       return rc;
                }
        }
        closedir(dir);
        return 0;
 }
 
-int afb_api_so_add_directory(const char *path, struct afb_apiset *apiset)
+int afb_api_so_add_directory(const char *path, struct afb_apiset *apiset, int failstops)
 {
        size_t length;
        char buffer[PATH_MAX];
@@ -147,10 +190,10 @@ int afb_api_so_add_directory(const char *path, struct afb_apiset *apiset)
        }
 
        memcpy(buffer, path, length + 1);
-       return adddirs(buffer, length, apiset);
+       return adddirs(buffer, length, apiset, failstops);
 }
 
-int afb_api_so_add_path(const char *path, struct afb_apiset *apiset)
+int afb_api_so_add_path(const char *path, struct afb_apiset *apiset, int failstops)
 {
        struct stat st;
        int rc;
@@ -159,7 +202,7 @@ int afb_api_so_add_path(const char *path, struct afb_apiset *apiset)
        if (rc < 0)
                ERROR("Invalid binding path [%s]: %m", path);
        else if (S_ISDIR(st.st_mode))
-               rc = afb_api_so_add_directory(path, apiset);
+               rc = afb_api_so_add_directory(path, apiset, failstops);
        else if (strstr(path, ".so"))
                rc = load_binding(path, 0, apiset);
        else
@@ -167,18 +210,30 @@ int afb_api_so_add_path(const char *path, struct afb_apiset *apiset)
        return rc;
 }
 
-int afb_api_so_add_pathset(const char *pathset, struct afb_apiset *apiset)
+int afb_api_so_add_pathset(const char *pathset, struct afb_apiset *apiset, int failstops)
 {
        static char sep[] = ":";
        char *ps, *p;
+       int rc;
 
        ps = strdupa(pathset);
        for (;;) {
                p = strsep(&ps, sep);
                if (!p)
                        return 0;
-               if (afb_api_so_add_path(p, apiset) < 0)
-                       return -1;
+               rc = afb_api_so_add_path(p, apiset, failstops);
+               if (rc < 0)
+                       return rc;
        }
 }
 
+int afb_api_so_add_pathset_fails(const char *pathset, struct afb_apiset *apiset)
+{
+       return afb_api_so_add_pathset(pathset, apiset, 1);
+}
+
+int afb_api_so_add_pathset_nofails(const char *pathset, struct afb_apiset *apiset)
+{
+       return afb_api_so_add_pathset(pathset, apiset, 0);
+}
+