fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 15:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: add function _nl_has_capability() to access nl_has_capability() dynamically

Browse source 
The libnl function nl_has_capability() was only added recently, so don't depend on it
at compile time. Instead use dlopen to load the function if the libnl library contains it.

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-02-23 14:22:32 +01:00
parent c2e99b181f
commit ff801bcafc
1 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/platform/nm-linux-platform.c
View file

@ -23,6 +23,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <fcntl.h> #include <fcntl.h>
#include <dlfcn.h>
#include <netinet/icmp6.h> #include <netinet/icmp6.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <linux/ip.h> #include <linux/ip.h>
@ -58,6 +59,15 @@
#define warning(...) nm_log_warn (LOGD_PLATFORM, __VA_ARGS__) #define warning(...) nm_log_warn (LOGD_PLATFORM, __VA_ARGS__)
#define error(...) nm_log_err (LOGD_PLATFORM, __VA_ARGS__) #define error(...) nm_log_err (LOGD_PLATFORM, __VA_ARGS__)
struct libnl_vtable
{
void *handle;
int (*f_nl_has_capability) (int capability);
};
typedef struct { typedef struct {
struct nl_sock *nlh; struct nl_sock *nlh;
struct nl_sock *nlh_event; struct nl_sock *nlh_event;
@ -89,6 +99,43 @@ nm_linux_platform_setup (void)
/******************************************************************/ /******************************************************************/
static int
_nl_f_nl_has_capability (int capability)
{
return FALSE;
}
static struct libnl_vtable *
_nl_get_vtable ()
{
static struct libnl_vtable vtable;
if (G_UNLIKELY (!vtable.f_nl_has_capability)) {
void *handle;
handle = dlopen ("libnl-3.so", RTLD_LAZY | RTLD_NOLOAD);
if (handle) {
vtable.handle = handle;
vtable.f_nl_has_capability = dlsym (handle, "nl_has_capability");
}
if (!vtable.f_nl_has_capability)
vtable.f_nl_has_capability = &_nl_f_nl_has_capability;
g_return_val_if_fail (vtable.handle, &vtable);
}
return &vtable;
}
static gboolean
_nl_has_capability (int capability)
{
return (_nl_get_vtable ()->f_nl_has_capability) (capability);
}
/******************************************************************/
/* libnl library workarounds and additions */ /* libnl library workarounds and additions */
/* Automatic deallocation of local variables */ /* Automatic deallocation of local variables */