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

isisd: Add vty_socket cli option to override the compiled-in location for the VTY Socket

Browse Source 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
This commit is contained in:
Martin Winter 2017-01-24 22:52:49 +07:00
parent 98bd8260b6
commit bcaefc1f4d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
isisd/isis_main.c
View File

@ -81,6 +81,7 @@ struct zebra_privs_t isisd_privs = {
}; };
/* isisd options */ /* isisd options */
#define OPTION_VTYSOCK 1000
struct option longopts[] = { struct option longopts[] = {
{"daemon", no_argument, NULL, 'd'}, {"daemon", no_argument, NULL, 'd'},
{"config_file", required_argument, NULL, 'f'}, {"config_file", required_argument, NULL, 'f'},
@ -88,6 +89,7 @@ struct option longopts[] = {
{"socket", required_argument, NULL, 'z'}, {"socket", required_argument, NULL, 'z'},
{"vty_addr", required_argument, NULL, 'A'}, {"vty_addr", required_argument, NULL, 'A'},
{"vty_port", required_argument, NULL, 'P'}, {"vty_port", required_argument, NULL, 'P'},
{"vty_socket", required_argument, NULL, OPTION_VTYSOCK},
{"user", required_argument, NULL, 'u'}, {"user", required_argument, NULL, 'u'},
{"group", required_argument, NULL, 'g'}, {"group", required_argument, NULL, 'g'},
{"version", no_argument, NULL, 'v'}, {"version", no_argument, NULL, 'v'},
@ -103,6 +105,9 @@ char *config_file = NULL;
/* isisd program name. */ /* isisd program name. */
char *progname; char *progname;
/* VTY Socket prefix */
char vty_sock_path[MAXPATHLEN] = ISIS_VTYSH_PATH;
int daemon_mode = 0; int daemon_mode = 0;
/* Master of threads. */ /* Master of threads. */
@ -144,6 +149,7 @@ Daemon which manages IS-IS routing\n\n\
-z, --socket Set path of zebra socket\n\ -z, --socket Set path of zebra socket\n\
-A, --vty_addr Set vty's bind address\n\ -A, --vty_addr Set vty's bind address\n\
-P, --vty_port Set vty's port number\n\ -P, --vty_port Set vty's port number\n\
--vty_socket Override vty socket path\n\
-u, --user User to run as\n\ -u, --user User to run as\n\
-g, --group Group to run as\n\ -g, --group Group to run as\n\
-v, --version Print program version\n\ -v, --version Print program version\n\
@ -240,6 +246,7 @@ main (int argc, char **argv, char **envp)
struct thread thread; struct thread thread;
char *config_file = NULL; char *config_file = NULL;
char *vty_addr = NULL; char *vty_addr = NULL;
char *vty_sock_name;
int dryrun = 0; int dryrun = 0;
/* Get the programname without the preceding path. */ /* Get the programname without the preceding path. */
@ -305,6 +312,9 @@ main (int argc, char **argv, char **envp)
vty_port = atoi (optarg); vty_port = atoi (optarg);
vty_port = (vty_port ? vty_port : ISISD_VTY_PORT); vty_port = (vty_port ? vty_port : ISISD_VTY_PORT);
break; break;
case OPTION_VTYSOCK:
set_socket_path(vty_sock_path, ISIS_VTYSH_PATH, optarg, sizeof (vty_sock_path));
break;
case 'u': case 'u':
isisd_privs.user = optarg; isisd_privs.user = optarg;
break; break;
@ -379,7 +389,7 @@ main (int argc, char **argv, char **envp)
pid_output (pid_file); pid_output (pid_file);
/* Make isis vty socket. */ /* Make isis vty socket. */
vty_serv_sock (vty_addr, vty_port, ISIS_VTYSH_PATH); vty_serv_sock (vty_addr, vty_port, vty_sock_path);
/* Print banner. */ /* Print banner. */
zlog_notice ("Quagga-ISISd %s starting: vty@%d", FRR_VERSION, vty_port); zlog_notice ("Quagga-ISISd %s starting: vty@%d", FRR_VERSION, vty_port);