proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 07:15:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: Convert to using frr_vtydir instead of DAEMON_VTY_DIR

Browse Source 
In a variety of places we are using DAEMON_VTY_DIR, convert
to use frr_vtydir.  This will allow us in a future commit
to have the -N namespace option be automatically used.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2019-05-30 19:38:00 -04:00
parent 0d675e4946
commit 3c649c719f
4 changed files with 10 additions and 5 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,
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[512];
unsigned char protocol_group[16]; /* babel's link-local multicast address */ unsigned char protocol_group[16]; /* babel's link-local multicast address */
int protocol_port; /* babel's port */ 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 */ /* create the threads handler */
master = frr_init (); master = frr_init ();

5
watchfrr/watchfrr.c
View File

@ -648,6 +648,7 @@ static void daemon_send_ready(int exitcode)
{ {
FILE *fp; FILE *fp;
static int sent = 0; static int sent = 0;
char started[512];
if (sent) if (sent)
return; return;
@ -669,7 +670,9 @@ static void daemon_send_ready(int exitcode)
frr_detach(); 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) if (fp)
fclose(fp); fclose(fp);
#if defined HAVE_SYSTEMD #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]; char fname[MAXPATHLEN];
FILE *f; FILE *f;
snprintf(fname, MAXPATHLEN, "%s/%s_%u", DAEMON_VTY_DIR, "netlink", snprintf(fname, MAXPATHLEN, "%s/%s_%u", frr_vtydir, "netlink", counter);
counter);
frr_elevate_privs(&zserv_privs) { frr_elevate_privs(&zserv_privs) {
f = fopen(fname, "w"); 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); copy = stream_dup(orig);
stream_set_getp(copy, 0); 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) { frr_elevate_privs(&zserv_privs) {
fd = open(fname, O_CREAT | O_WRONLY | O_EXCL, 0644); fd = open(fname, O_CREAT | O_WRONLY | O_EXCL, 0644);