matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ip: add IP_LIB_DIR environment variable 

Do not hardcode /usr/lib/ip as a path and allow libraries path
configuration in run-time.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Sergey Ryazanov 2020-11-22 20:39:21 +03:00 committed by David Ahern
parent c29f65db34
commit d7190d4ced
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ip/ip.c
View File

@ -26,6 +26,10 @@
#include "rt_names.h" #include "rt_names.h"
#include "bpf_util.h" #include "bpf_util.h"
#ifndef LIBDIR
#define LIBDIR "/usr/lib"
#endif
int preferred_family = AF_UNSPEC; int preferred_family = AF_UNSPEC;
int human_readable; int human_readable;
int use_iec; int use_iec;
@ -42,6 +46,17 @@ bool do_all;
struct rtnl_handle rth = { .fd = -1 }; struct rtnl_handle rth = { .fd = -1 };
const char *get_ip_lib_dir(void)
{
const char *lib_dir;
lib_dir = getenv("IP_LIB_DIR");
if (!lib_dir)
lib_dir = LIBDIR "/ip";
return lib_dir;
}
static void usage(void) __attribute__((noreturn)); static void usage(void) __attribute__((noreturn));
static void usage(void) static void usage(void)

2
ip/ip_common.h
View File

@ -27,6 +27,8 @@ struct link_filter {
int target_nsid; int target_nsid;
}; };
const char *get_ip_lib_dir(void);
int get_operstate(const char *name); int get_operstate(const char *name);
int print_linkinfo(struct nlmsghdr *n, void *arg); int print_linkinfo(struct nlmsghdr *n, void *arg);
int print_addrinfo(struct nlmsghdr *n, void *arg); int print_addrinfo(struct nlmsghdr *n, void *arg);

5
ip/iplink.c
View File

@ -34,9 +34,6 @@
#include "namespace.h" #include "namespace.h"
#define IPLINK_IOCTL_COMPAT 1 #define IPLINK_IOCTL_COMPAT 1
#ifndef LIBDIR
#define LIBDIR "/usr/lib"
#endif
#ifndef GSO_MAX_SIZE #ifndef GSO_MAX_SIZE
#define GSO_MAX_SIZE 65536 #define GSO_MAX_SIZE 65536
@ -157,7 +154,7 @@ struct link_util *get_link_kind(const char *id)
if (strcmp(l->id, id) == 0) if (strcmp(l->id, id) == 0)
return l; return l;
snprintf(buf, sizeof(buf), LIBDIR "/ip/link_%s.so", id); snprintf(buf, sizeof(buf), "%s/link_%s.so", get_ip_lib_dir(), id);
dlh = dlopen(buf, RTLD_LAZY); dlh = dlopen(buf, RTLD_LAZY);
if (dlh == NULL) { if (dlh == NULL) {
/* look in current binary, only open once */ /* look in current binary, only open once */