From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 30 May 2019 23:38:00 +0000 (-0400)
Subject: *: Convert to using frr_vtydir instead of DAEMON_VTY_DIR
X-Git-Tag: base_7.2~263^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3c649c719f327725ebd85643ff07f18e95ecb2b5;p=matthieu%2Ffrr.git

*: Convert to using frr_vtydir instead of DAEMON_VTY_DIR

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>
---

diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index eaff97a495..6e2d4ecea0 100644
--- a/babeld/babel_main.c
+++ b/babeld/babel_main.c
@@ -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[512];
 
 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 ();
 
diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c
index 34f8dabdf1..f0ce88a5b3 100644
--- a/watchfrr/watchfrr.c
+++ b/watchfrr/watchfrr.c
@@ -648,6 +648,7 @@ static void daemon_send_ready(int exitcode)
 {
 	FILE *fp;
 	static int sent = 0;
+	char started[512];
 
 	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
diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c
index fe37a33358..387a3531bd 100644
--- a/zebra/kernel_netlink.c
+++ b/zebra/kernel_netlink.c
@@ -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");
 	}
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 49e43f4942..61200806ba 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -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);