forked from Mirror/frr
*: rename frr_vtydir to frr_runstatedir
Also remove frr_init_vtydir(), just initialize to default. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter
parent
444bc5e237
commit
42eeea090e
|
|
@ -171,8 +171,8 @@ main(int argc, char **argv)
|
|||
}
|
||||
}
|
||||
|
||||
snprintf(state_file, sizeof(state_file), "%s/%s",
|
||||
frr_vtydir, "babel-state");
|
||||
snprintf(state_file, sizeof(state_file), "%s/%s", frr_runstatedir,
|
||||
"babel-state");
|
||||
|
||||
/* create the threads handler */
|
||||
master = frr_init ();
|
||||
|
|
|
|||
|
|
@ -2732,6 +2732,7 @@ AC_SUBST([CFG_YANGMODELS])
|
|||
AC_DEFINE_UNQUOTED([VTYSH_BIN_PATH], ["$vtysh_bin"], [path to vtysh binary])
|
||||
AC_DEFINE_UNQUOTED([MODULE_PATH], ["$CFG_MODULE"], [path to modules])
|
||||
AC_DEFINE_UNQUOTED([SCRIPT_PATH], ["$CFG_SCRIPT"], [path to scripts])
|
||||
AC_DEFINE_UNQUOTED([FRR_RUNSTATE_PATH], ["$CFG_STATE"], [/run/frr equivalent])
|
||||
AC_DEFINE_UNQUOTED([YANG_MODELS_PATH], ["$CFG_YANGMODELS"], [path to YANG data models])
|
||||
AC_DEFINE_UNQUOTED([WATCHFRR_SH_PATH], ["${CFG_SBIN%/}/watchfrr.sh"], [path to watchfrr.sh])
|
||||
|
||||
|
|
@ -2744,7 +2745,6 @@ AC_DEFINE_UNQUOTED([MGMTD_BE_SERVER_PATH], ["$CFG_STATE/mgmtd_be.sock"], [mgmtd
|
|||
AC_DEFINE_UNQUOTED([OSPF6D_GR_STATE], ["$CFG_STATE/ospf6d-gr.json"], [ospf6d GR state information])
|
||||
AC_DEFINE_UNQUOTED([ISISD_RESTART], ["$CFG_STATE%s/isid-restart.json"], [isisd restart information])
|
||||
AC_DEFINE_UNQUOTED([OSPF6_AUTH_SEQ_NUM_FILE], ["$CFG_STATE/ospf6d-at-seq-no.dat"], [ospf6d AT Sequence number information])
|
||||
AC_DEFINE_UNQUOTED([DAEMON_VTY_DIR], ["$CFG_STATE%s%s"], [daemon vty directory])
|
||||
AC_DEFINE_UNQUOTED([DAEMON_DB_DIR], ["$CFG_STATE"], [daemon database directory])
|
||||
|
||||
dnl various features
|
||||
|
|
|
|||
22
lib/libfrr.c
22
lib/libfrr.c
|
|
@ -45,7 +45,7 @@ DEFINE_KOOH(frr_early_fini, (), ());
|
|||
DEFINE_KOOH(frr_fini, (), ());
|
||||
|
||||
const char frr_sysconfdir[] = SYSCONFDIR;
|
||||
char frr_vtydir[256];
|
||||
char frr_runstatedir[256] = FRR_RUNSTATE_PATH;
|
||||
#ifdef HAVE_SQLITE3
|
||||
const char frr_dbdir[] = DAEMON_DB_DIR;
|
||||
#endif
|
||||
|
|
@ -310,11 +310,6 @@ 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;
|
||||
|
|
@ -344,11 +339,10 @@ 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);
|
||||
frr_runstatedir, di->name);
|
||||
snprintf(frr_zclientpath, sizeof(frr_zclientpath),
|
||||
ZEBRA_SERV_PATH, "", "");
|
||||
#ifdef HAVE_SQLITE3
|
||||
|
|
@ -505,10 +499,10 @@ static int frr_opt(int opt)
|
|||
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(frr_runstatedir, sizeof(frr_runstatedir),
|
||||
FRR_RUNSTATE_PATH "/%s", di->pathspace);
|
||||
snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s.pid",
|
||||
frr_vtydir, di->name);
|
||||
frr_runstatedir, di->name);
|
||||
break;
|
||||
case 'o':
|
||||
vrf_set_default_name(optarg);
|
||||
|
|
@ -729,7 +723,7 @@ struct event_loop *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.pid",
|
||||
frr_vtydir, di->name, p_instance);
|
||||
frr_runstatedir, 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);
|
||||
|
|
@ -762,7 +756,7 @@ struct event_loop *frr_init(void)
|
|||
/* don't mkdir these as root... */
|
||||
if (!(di->flags & FRR_NO_PRIVSEP)) {
|
||||
if (!di->pid_file || !di->vty_path)
|
||||
frr_mkdir(frr_vtydir, false);
|
||||
frr_mkdir(frr_runstatedir, false);
|
||||
if (di->pid_file)
|
||||
frr_mkdir(di->pid_file, true);
|
||||
if (di->vty_path)
|
||||
|
|
@ -1049,7 +1043,7 @@ void frr_vty_serv_start(void)
|
|||
const char *dir;
|
||||
char defvtydir[256];
|
||||
|
||||
snprintf(defvtydir, sizeof(defvtydir), "%s", frr_vtydir);
|
||||
snprintf(defvtydir, sizeof(defvtydir), "%s", frr_runstatedir);
|
||||
|
||||
dir = di->vty_sock_path ? di->vty_sock_path : defvtydir;
|
||||
|
||||
|
|
|
|||
|
|
@ -130,7 +130,6 @@ struct frr_daemon_info {
|
|||
.version = FRR_VERSION, ); \
|
||||
MACRO_REQUIRE_SEMICOLON() /* 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);
|
||||
|
|
@ -172,7 +171,7 @@ extern void frr_fini(void);
|
|||
extern char config_default[512];
|
||||
extern char frr_zclientpath[256];
|
||||
extern const char frr_sysconfdir[];
|
||||
extern char frr_vtydir[256];
|
||||
extern char frr_runstatedir[256];
|
||||
extern const char frr_moduledir[];
|
||||
extern const char frr_scriptdir[];
|
||||
|
||||
|
|
|
|||
|
|
@ -364,8 +364,7 @@ int main(int argc, char **argv, char **env)
|
|||
|
||||
strlcpy(sysconfdir, frr_sysconfdir, sizeof(sysconfdir));
|
||||
|
||||
frr_init_vtydir();
|
||||
strlcpy(vtydir, frr_vtydir, sizeof(vtydir));
|
||||
strlcpy(vtydir, frr_runstatedir, sizeof(vtydir));
|
||||
|
||||
/* Option handling. */
|
||||
while (1) {
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ static struct global_state {
|
|||
int numdown; /* # of daemons that are not UP or UNRESPONSIVE */
|
||||
} gs = {
|
||||
.phase = PHASE_INIT,
|
||||
.vtydir = frr_vtydir,
|
||||
.vtydir = frr_runstatedir,
|
||||
.period = 1000 * DEFAULT_PERIOD,
|
||||
.timeout = DEFAULT_TIMEOUT,
|
||||
.restart_timeout = DEFAULT_RESTART_TIMEOUT,
|
||||
|
|
@ -297,11 +297,11 @@ Otherwise, the interval is doubled (but capped at the -M value).\n\n",
|
|||
passing command-line arguments with embedded spaces.\n\
|
||||
-v, --version Print program version\n\
|
||||
-h, --help Display this help and exit\n",
|
||||
frr_vtydir, DEFAULT_LOGLEVEL, LOG_EMERG, LOG_DEBUG, LOG_DEBUG,
|
||||
DEFAULT_MIN_RESTART, DEFAULT_MAX_RESTART,
|
||||
frr_runstatedir, DEFAULT_LOGLEVEL, LOG_EMERG, LOG_DEBUG,
|
||||
LOG_DEBUG, DEFAULT_MIN_RESTART, DEFAULT_MAX_RESTART,
|
||||
DEFAULT_OPERATIONAL_TIMEOUT, DEFAULT_PERIOD, DEFAULT_TIMEOUT,
|
||||
DEFAULT_RESTART_TIMEOUT, DEFAULT_RESTART_CMD, DEFAULT_START_CMD,
|
||||
DEFAULT_STOP_CMD, frr_vtydir);
|
||||
DEFAULT_STOP_CMD, frr_runstatedir);
|
||||
}
|
||||
|
||||
static pid_t run_background(char *shell_cmd)
|
||||
|
|
@ -728,7 +728,7 @@ static void daemon_send_ready(int exitcode)
|
|||
|
||||
frr_detach();
|
||||
|
||||
snprintf(started, sizeof(started), "%s/%s", frr_vtydir,
|
||||
snprintf(started, sizeof(started), "%s/%s", frr_runstatedir,
|
||||
"watchfrr.started");
|
||||
fp = fopen(started, "w");
|
||||
if (fp)
|
||||
|
|
|
|||
Loading…
Reference in a new issue