Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
libafbwsc: add function 'afb_ws_client_connect_api'
[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
cfa992e
..
2a0f9d6
100644
(file)
--- a/
src/afb-api-so.c
+++ b/
src/afb-api-so.c
@@
-27,6
+27,7
@@
#include "afb-api-so.h"
#include "afb-api-so-v1.h"
#include "afb-api-so-v2.h"
#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"
#include "verbose.h"
#include "sig-monitor.h"
@@
-65,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;
// This is a loadable library let's check if it's a binding
rc = -!!force;
- handle = safe_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());
if (handle == NULL) {
if (force)
ERROR("binding [%s] not loadable: %s", path, dlerror());
@@
-83,6
+84,15
@@
static int load_binding(const char *path, int force, struct afb_apiset *apiset)
if (rc)
return 0; /* yes version 2 */
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) {
/* try the version 1 */
rc = afb_api_so_v1_add(path, handle, apiset);
if (rc < 0) {