mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-09 22:03:12 +00:00
lib: Add CLI option --moduledir to override default module location (needed for snap support)
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
This commit is contained in:
parent
ae49894874
commit
80b4df3b08
21
lib/libfrr.c
21
lib/libfrr.c
@ -34,6 +34,7 @@ DEFINE_HOOK(frr_late_init, (struct thread_master *tm), (tm))
|
|||||||
|
|
||||||
const char frr_sysconfdir[] = SYSCONFDIR;
|
const char frr_sysconfdir[] = SYSCONFDIR;
|
||||||
const char frr_vtydir[] = DAEMON_VTY_DIR;
|
const char frr_vtydir[] = DAEMON_VTY_DIR;
|
||||||
|
const char frr_moduledir[] = MODULE_PATH;
|
||||||
|
|
||||||
char config_default[256];
|
char config_default[256];
|
||||||
static char pidfile_default[256];
|
static char pidfile_default[256];
|
||||||
@ -61,7 +62,8 @@ static void opt_extend(const struct optspec *os)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#define OPTION_VTYSOCK 1000
|
#define OPTION_VTYSOCK 1000
|
||||||
|
#define OPTION_MODULEDIR 1002
|
||||||
|
|
||||||
static const struct option lo_always[] = {
|
static const struct option lo_always[] = {
|
||||||
{ "help", no_argument, NULL, 'h' },
|
{ "help", no_argument, NULL, 'h' },
|
||||||
@ -69,6 +71,7 @@ static const struct option lo_always[] = {
|
|||||||
{ "daemon", no_argument, NULL, 'd' },
|
{ "daemon", no_argument, NULL, 'd' },
|
||||||
{ "module", no_argument, NULL, 'M' },
|
{ "module", no_argument, NULL, 'M' },
|
||||||
{ "vty_socket", required_argument, NULL, OPTION_VTYSOCK },
|
{ "vty_socket", required_argument, NULL, OPTION_VTYSOCK },
|
||||||
|
{ "moduledir", required_argument, NULL, OPTION_MODULEDIR },
|
||||||
{ NULL }
|
{ NULL }
|
||||||
};
|
};
|
||||||
static const struct optspec os_always = {
|
static const struct optspec os_always = {
|
||||||
@ -77,7 +80,8 @@ static const struct optspec os_always = {
|
|||||||
" -v, --version Print program version\n"
|
" -v, --version Print program version\n"
|
||||||
" -d, --daemon Runs in daemon mode\n"
|
" -d, --daemon Runs in daemon mode\n"
|
||||||
" -M, --module Load specified module\n"
|
" -M, --module Load specified module\n"
|
||||||
" --vty_socket Override vty socket path\n",
|
" --vty_socket Override vty socket path\n"
|
||||||
|
" --moduledir Override modules directory\n",
|
||||||
lo_always
|
lo_always
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -193,6 +197,7 @@ struct option_chain {
|
|||||||
struct option_chain *next;
|
struct option_chain *next;
|
||||||
const char *arg;
|
const char *arg;
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct option_chain *modules = NULL, **modnext = &modules;
|
static struct option_chain *modules = NULL, **modnext = &modules;
|
||||||
static int errors = 0;
|
static int errors = 0;
|
||||||
|
|
||||||
@ -277,6 +282,14 @@ static int frr_opt(int opt)
|
|||||||
}
|
}
|
||||||
di->vty_sock_path = optarg;
|
di->vty_sock_path = optarg;
|
||||||
break;
|
break;
|
||||||
|
case OPTION_MODULEDIR:
|
||||||
|
if (di->module_path) {
|
||||||
|
fprintf(stderr, "----moduledir option specified more than once!\n");
|
||||||
|
errors++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
di->module_path = optarg;
|
||||||
|
break;
|
||||||
case 'u':
|
case 'u':
|
||||||
if (di->flags & FRR_NO_PRIVSEP)
|
if (di->flags & FRR_NO_PRIVSEP)
|
||||||
return 1;
|
return 1;
|
||||||
@ -319,6 +332,8 @@ struct thread_master *frr_init(void)
|
|||||||
struct option_chain *oc;
|
struct option_chain *oc;
|
||||||
struct frrmod_runtime *module;
|
struct frrmod_runtime *module;
|
||||||
char moderr[256];
|
char moderr[256];
|
||||||
|
const char *dir;
|
||||||
|
dir = di->module_path ? di->module_path : frr_moduledir;
|
||||||
|
|
||||||
srandom(time(NULL));
|
srandom(time(NULL));
|
||||||
|
|
||||||
@ -331,7 +346,7 @@ struct thread_master *frr_init(void)
|
|||||||
frrmod_init(di->module);
|
frrmod_init(di->module);
|
||||||
while (modules) {
|
while (modules) {
|
||||||
modules = (oc = modules)->next;
|
modules = (oc = modules)->next;
|
||||||
module = frrmod_load(oc->arg, moderr, sizeof(moderr));
|
module = frrmod_load(oc->arg, dir, moderr, sizeof(moderr));
|
||||||
if (!module) {
|
if (!module) {
|
||||||
fprintf(stderr, "%s\n", moderr);
|
fprintf(stderr, "%s\n", moderr);
|
||||||
exit(1);
|
exit(1);
|
||||||
|
@ -52,6 +52,7 @@ struct frr_daemon_info {
|
|||||||
const char *config_file;
|
const char *config_file;
|
||||||
const char *pid_file;
|
const char *pid_file;
|
||||||
const char *vty_path;
|
const char *vty_path;
|
||||||
|
const char *module_path;
|
||||||
|
|
||||||
const char *proghelp;
|
const char *proghelp;
|
||||||
void (*printhelp)(FILE *target);
|
void (*printhelp)(FILE *target);
|
||||||
@ -107,5 +108,6 @@ extern void frr_run(struct thread_master *master);
|
|||||||
extern char config_default[256];
|
extern char config_default[256];
|
||||||
extern const char frr_sysconfdir[];
|
extern const char frr_sysconfdir[];
|
||||||
extern const char frr_vtydir[];
|
extern const char frr_vtydir[];
|
||||||
|
extern const char frr_moduledir[];
|
||||||
|
|
||||||
#endif /* _ZEBRA_FRR_H */
|
#endif /* _ZEBRA_FRR_H */
|
||||||
|
@ -69,7 +69,7 @@ void frrmod_init(struct frrmod_runtime *modinfo)
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct frrmod_runtime *frrmod_load(const char *spec,
|
struct frrmod_runtime *frrmod_load(const char *spec,
|
||||||
char *err, size_t err_len)
|
const char *dir, char *err, size_t err_len)
|
||||||
{
|
{
|
||||||
void *handle = NULL;
|
void *handle = NULL;
|
||||||
char name[PATH_MAX], fullpath[PATH_MAX], *args;
|
char name[PATH_MAX], fullpath[PATH_MAX], *args;
|
||||||
@ -84,12 +84,12 @@ struct frrmod_runtime *frrmod_load(const char *spec,
|
|||||||
if (!strchr(name, '/')) {
|
if (!strchr(name, '/')) {
|
||||||
if (!handle && execname) {
|
if (!handle && execname) {
|
||||||
snprintf(fullpath, sizeof(fullpath), "%s/%s_%s.so",
|
snprintf(fullpath, sizeof(fullpath), "%s/%s_%s.so",
|
||||||
MODULE_PATH, execname, name);
|
dir, execname, name);
|
||||||
handle = dlopen(fullpath, RTLD_NOW | RTLD_GLOBAL);
|
handle = dlopen(fullpath, RTLD_NOW | RTLD_GLOBAL);
|
||||||
}
|
}
|
||||||
if (!handle) {
|
if (!handle) {
|
||||||
snprintf(fullpath, sizeof(fullpath), "%s/%s.so",
|
snprintf(fullpath, sizeof(fullpath), "%s/%s.so",
|
||||||
MODULE_PATH, name);
|
dir, name);
|
||||||
handle = dlopen(fullpath, RTLD_NOW | RTLD_GLOBAL);
|
handle = dlopen(fullpath, RTLD_NOW | RTLD_GLOBAL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -95,7 +95,7 @@ extern struct frrmod_runtime *frrmod_list;
|
|||||||
|
|
||||||
extern void frrmod_init(struct frrmod_runtime *modinfo);
|
extern void frrmod_init(struct frrmod_runtime *modinfo);
|
||||||
extern struct frrmod_runtime *frrmod_load(const char *spec,
|
extern struct frrmod_runtime *frrmod_load(const char *spec,
|
||||||
char *err, size_t err_len);
|
const char *dir, char *err, size_t err_len);
|
||||||
#if 0
|
#if 0
|
||||||
/* not implemented yet */
|
/* not implemented yet */
|
||||||
extern void frrmod_unload(struct frrmod_runtime *module);
|
extern void frrmod_unload(struct frrmod_runtime *module);
|
||||||
|
Loading…
Reference in New Issue
Block a user