proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-03 03:21:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4431 from donaldsharp/mad_gainz

Browse Source 
Switch over to `-N FOO` adding FOO to the various directories/files we open up
This commit is contained in:
Rafael Zalamena 2019-06-05 11:30:19 -03:00 committed by GitHub
commit 9e8238f5d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 92 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
babeld/babel_main.c
View File

@ -68,7 +68,7 @@ const unsigned char ones[16] =
{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
static const char *state_file = DAEMON_VTY_DIR "/babel-state";
static char state_file[1024];
unsigned char protocol_group[16]; /* babel's link-local multicast address */
int protocol_port; /* babel's port */
@ -187,6 +187,9 @@ main(int argc, char **argv)
}
}
snprintf(state_file, sizeof(state_file), "%s/%s",
frr_vtydir, "babel-state");
/* create the threads handler */
master = frr_init ();

12
bfdd/bfdd.c
View File

@ -160,7 +160,8 @@ static void bg_init(void)
int main(int argc, char *argv[])
{
const char *ctl_path = BFDD_CONTROL_SOCKET;
char ctl_path[512];
bool ctlsockused = false;
int opt;
/* Initialize system sockets. */
@ -170,6 +171,8 @@ int main(int argc, char *argv[])
frr_opt_add("", longopts,
" --bfdctl Specify bfdd control socket\n");
snprintf(ctl_path, sizeof(ctl_path), BFDD_CONTROL_SOCKET,
"", "");
while (true) {
opt = frr_getopt(argc, argv, NULL);
if (opt == EOF)
@ -177,7 +180,8 @@ int main(int argc, char *argv[])
switch (opt) {
case OPTION_CTLSOCK:
ctl_path = optarg;
strlcpy(ctl_path, optarg, sizeof(ctl_path));
ctlsockused = true;
break;
default:
@ -186,6 +190,10 @@ int main(int argc, char *argv[])
}
}
if (bfdd_di.pathspace && !ctlsockused)
snprintf(ctl_path, sizeof(ctl_path), BFDD_CONTROL_SOCKET,
"/", bfdd_di.pathspace);
#if 0 /* TODO add support for JSON configuration files. */
parse_config(conf);
#endif

8
configure.ac
View File

@ -2202,10 +2202,10 @@ fi
AC_MSG_RESULT([${frr_statedir}])
AC_SUBST([frr_statedir])
AC_DEFINE_UNQUOTED([LDPD_SOCKET], ["$frr_statedir/ldpd.sock"], [ldpd control socket])
AC_DEFINE_UNQUOTED([ZEBRA_SERV_PATH], ["$frr_statedir/zserv.api"], [zebra api socket])
AC_DEFINE_UNQUOTED([BFDD_CONTROL_SOCKET], ["$frr_statedir/bfdd.sock"], [bfdd control socket])
AC_DEFINE_UNQUOTED([DAEMON_VTY_DIR], ["$frr_statedir"], [daemon vty directory])
AC_DEFINE_UNQUOTED([LDPD_SOCKET], ["$frr_statedir%s%s/ldpd.sock"], [ldpd control socket])
AC_DEFINE_UNQUOTED([ZEBRA_SERV_PATH], ["$frr_statedir%s%s/zserv.api"], [zebra api socket])
AC_DEFINE_UNQUOTED([BFDD_CONTROL_SOCKET], ["$frr_statedir%s%s/bfdd.sock"], [bfdd control socket])
AC_DEFINE_UNQUOTED([DAEMON_VTY_DIR], ["$frr_statedir%s%s"], [daemon vty directory])
AC_DEFINE_UNQUOTED([DAEMON_DB_DIR], ["$frr_statedir"], [daemon database directory])
dnl autoconf does this, but it does it too late...

6
doc/user/basic.rst
View File

@ -479,6 +479,12 @@ These options apply to all |PACKAGE_NAME| daemons.
Set the user and group to run as.
.. option:: -N <namespace>
Set the namespace that the daemon will run in. A "/<namespace>" will
be added to all files that use the statedir. If you have "/var/run/frr"
as the default statedir then it will become "/var/run/frr/<namespace>".
.. option:: -v, --version
Print program version.

3
doc/user/bfd.rst
View File

@ -47,6 +47,9 @@ may also be specified (:ref:`common-invocation-options`).
#define BFDD_CONTROL_SOCKET "|INSTALL_PREFIX_STATE|/bfdd.sock"
This option overrides the location addition that the -N option provides
to the bfdd.sock
.. _bfd-commands:

6
doc/user/ldpd.rst
View File

@ -24,6 +24,12 @@ Running Ldpd
The *ldpd* daemon can be invoked with any of the common
options (:ref:`common-invocation-options`).
..option:: --ctl_socket
This option allows you to override the path to the ldpd.sock file
used to control this daemon. If specified this option overrides
the -N option path addition.
The *zebra* daemon must be running before *ldpd* is invoked.
Configuration of *ldpd* is done in its configuration file

6
doc/user/zebra.rst
View File

@ -58,6 +58,12 @@ Besides the common invocation options (:ref:`common-invocation-options`), the
.. seealso:: :ref:`zebra-vrf`
.. option:: -z <path_to_socket>, --socket <path_to_socket>
If this option is supplied on the cli, the path to the zebra
control socket(zapi), is used. This option overrides a -N <namespace>
option if handed to it on the cli.
.. option:: --v6-rr-semantics
The linux kernel is receiving the ability to use the same route

11
ldpd/ldpd.c
View File

@ -116,7 +116,7 @@ struct zebra_privs_t ldpd_privs =
};
/* CTL Socket path */
char ctl_sock_path[MAXPATHLEN] = LDPD_SOCKET;
char ctl_sock_path[MAXPATHLEN];
/* LDPd options. */
#define OPTION_CTLSOCK 1001
@ -219,6 +219,10 @@ main(int argc, char *argv[])
int pipe_parent2lde[2], pipe_parent2lde_sync[2];
char *ctl_sock_name;
struct thread *thread = NULL;
bool ctl_sock_used = false;
snprintf(ctl_sock_path, sizeof(ctl_sock_path), LDPD_SOCKET,
"", "");
ldpd_process = PROC_MAIN;
log_procname = log_procnames[ldpd_process];
@ -244,6 +248,7 @@ main(int argc, char *argv[])
case 0:
break;
case OPTION_CTLSOCK:
ctl_sock_used = true;
ctl_sock_name = strrchr(LDPD_SOCKET, '/');
if (ctl_sock_name)
/* skip '/' */
@ -277,6 +282,10 @@ main(int argc, char *argv[])
}
}
if (ldpd_di.pathspace && !ctl_sock_used)
snprintf(ctl_sock_path, sizeof(ctl_sock_path), LDPD_SOCKET,
"/", ldpd_di.pathspace);
strlcpy(init.user, ldpd_privs.user, sizeof(init.user));
strlcpy(init.group, ldpd_privs.group, sizeof(init.group));
strlcpy(init.ctl_sock_path, ctl_sock_path, sizeof(init.ctl_sock_path));

40
lib/libfrr.c
View File

@ -46,7 +46,7 @@ DEFINE_KOOH(frr_early_fini, (), ())
DEFINE_KOOH(frr_fini, (), ())
const char frr_sysconfdir[] = SYSCONFDIR;
const char frr_vtydir[] = DAEMON_VTY_DIR;
char frr_vtydir[256];
#ifdef HAVE_SQLITE3
const char frr_dbdir[] = DAEMON_DB_DIR;
#endif
@ -57,7 +57,7 @@ char frr_protonameinst[256] = "NONE";
char config_default[512];
char frr_zclientpath[256];
static char pidfile_default[512];
static char pidfile_default[1024];
#ifdef HAVE_SQLITE3
static char dbfile_default[512];
#endif
@ -179,7 +179,7 @@ bool frr_zclient_addr(struct sockaddr_storage *sa, socklen_t *sa_len,
memset(sa, 0, sizeof(*sa));
if (!path)
path = ZEBRA_SERV_PATH;
path = frr_zclientpath;
if (!strncmp(path, ZAPI_TCP_PATHNAME, strlen(ZAPI_TCP_PATHNAME))) {
/* note: this functionality is disabled at bottom */
@ -285,6 +285,11 @@ bool frr_zclient_addr(struct sockaddr_storage *sa, socklen_t *sa_len,
static struct frr_daemon_info *di = NULL;
void frr_init_vtydir(void)
{
snprintf(frr_vtydir, sizeof(frr_vtydir), DAEMON_VTY_DIR, "", "");
}
void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv)
{
di = daemon;
@ -307,10 +312,13 @@ void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv)
if (di->flags & FRR_DETACH_LATER)
nodetach_daemon = true;
frr_init_vtydir();
snprintf(config_default, sizeof(config_default), "%s/%s.conf",
frr_sysconfdir, di->name);
snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s.pid",
frr_vtydir, di->name);
snprintf(frr_zclientpath, sizeof(frr_zclientpath),
ZEBRA_SERV_PATH, "", "");
#ifdef HAVE_SQLITE3
snprintf(dbfile_default, sizeof(dbfile_default), "%s/%s.db",
frr_dbdir, di->name);
@ -319,8 +327,6 @@ void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv)
strlcpy(frr_protoname, di->logname, sizeof(frr_protoname));
strlcpy(frr_protonameinst, di->logname, sizeof(frr_protonameinst));
strlcpy(frr_zclientpath, ZEBRA_SERV_PATH, sizeof(frr_zclientpath));
di->cli_mode = FRR_CLI_CLASSIC;
}
@ -400,6 +406,10 @@ static int frr_opt(int opt)
errors++;
break;
}
if (di->zpathspace)
fprintf(stderr,
"-N option overriden by -z for zebra named socket path\n");
if (strchr(optarg, '/') || strchr(optarg, '.')) {
fprintf(stderr,
"slashes or dots are not permitted in the --pathspace option.\n");
@ -407,6 +417,14 @@ static int frr_opt(int opt)
break;
}
di->pathspace = optarg;
if (!di->zpathspace)
snprintf(frr_zclientpath, sizeof(frr_zclientpath),
ZEBRA_SERV_PATH, "/", di->pathspace);
snprintf(frr_vtydir, sizeof(frr_vtydir), DAEMON_VTY_DIR, "/",
di->pathspace);
snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s.pid",
frr_vtydir, di->name);
break;
#ifdef HAVE_SQLITE3
case OPTION_DB_FILE:
@ -426,6 +444,10 @@ static int frr_opt(int opt)
di->terminal = 1;
break;
case 'z':
di->zpathspace = true;
if (di->pathspace)
fprintf(stderr,
"-z option overrides -N option for zebra named socket path\n");
if (di->flags & FRR_NO_ZCLIENT)
return 1;
strlcpy(frr_zclientpath, optarg, sizeof(frr_zclientpath));
@ -595,8 +617,8 @@ struct thread_master *frr_init(void)
snprintf(config_default, sizeof(config_default), "%s%s%s%s.conf",
frr_sysconfdir, p_pathspace, di->name, p_instance);
snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s%s%s.pid",
frr_vtydir, p_pathspace, di->name, p_instance);
snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s%s.pid",
frr_vtydir, di->name, p_instance);
#ifdef HAVE_SQLITE3
snprintf(dbfile_default, sizeof(dbfile_default), "%s/%s%s%s.db",
frr_dbdir, p_pathspace, di->name, p_instance);
@ -880,9 +902,7 @@ static void frr_vty_serv(void)
const char *dir;
char defvtydir[256];
snprintf(defvtydir, sizeof(defvtydir), "%s%s%s", frr_vtydir,
di->pathspace ? "/" : "",
di->pathspace ? di->pathspace : "");
snprintf(defvtydir, sizeof(defvtydir), "%s", frr_vtydir);
dir = di->vty_sock_path ? di->vty_sock_path : defvtydir;

6
lib/libfrr.h
View File

@ -81,7 +81,10 @@ struct frr_daemon_info {
#endif
const char *vty_path;
const char *module_path;
const char *pathspace;
bool zpathspace;
const char *early_logging;
const char *early_loglevel;
@ -120,6 +123,7 @@ struct frr_daemon_info {
.version = FRR_VERSION, ) \
/* end */
extern void frr_init_vtydir(void);
extern void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv);
extern void frr_opt_add(const char *optstr, const struct option *longopts,
const char *helpstr);
@ -150,7 +154,7 @@ extern void frr_fini(void);
extern char config_default[512];
extern char frr_zclientpath[256];
extern const char frr_sysconfdir[];
extern const char frr_vtydir[];
extern char frr_vtydir[256];
extern const char frr_moduledir[];
extern char frr_protoname[];

2
vtysh/vtysh_main.c
View File

@ -332,6 +332,8 @@ int main(int argc, char **argv, char **env)
progname = ((p = strrchr(argv[0], '/')) ? ++p : argv[0]);
strlcpy(sysconfdir, frr_sysconfdir, sizeof(sysconfdir));
frr_init_vtydir();
strlcpy(vtydir, frr_vtydir, sizeof(vtydir));
/* Option handling. */

5
watchfrr/watchfrr.c
View File

@ -648,6 +648,7 @@ static void daemon_send_ready(int exitcode)
{
FILE *fp;
static int sent = 0;
char started[1024];
if (sent)
return;
@ -669,7 +670,9 @@ static void daemon_send_ready(int exitcode)
frr_detach();
fp = fopen(DAEMON_VTY_DIR "/watchfrr.started", "w");
snprintf(started, sizeof(started), "%s%s", frr_vtydir,
"watchfrr.started");
fp = fopen(started, "w");
if (fp)
fclose(fp);
#if defined HAVE_SYSTEMD

3
zebra/kernel_netlink.c
View File

@ -340,8 +340,7 @@ static void netlink_write_incoming(const char *buf, const unsigned int size,
char fname[MAXPATHLEN];
FILE *f;
snprintf(fname, MAXPATHLEN, "%s/%s_%u", DAEMON_VTY_DIR, "netlink",
counter);
snprintf(fname, MAXPATHLEN, "%s/%s_%u", frr_vtydir, "netlink", counter);
frr_elevate_privs(&zserv_privs) {
f = fopen(fname, "w");
}

2
zebra/zapi_msg.c
View File

@ -2526,7 +2526,7 @@ static void zserv_write_incoming(struct stream *orig, uint16_t command)
copy = stream_dup(orig);
stream_set_getp(copy, 0);
snprintf(fname, MAXPATHLEN, "%s/%u", DAEMON_VTY_DIR, command);
snprintf(fname, MAXPATHLEN, "%s/%u", frr_vtydir, command);
frr_elevate_privs(&zserv_privs) {
fd = open(fname, O_CREAT | O_WRONLY | O_EXCL, 0644);