matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pimd: 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:58:52 +07:00
parent 9cbb96304c
commit a8cdea56f4
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pimd/pim_main.c
View file

@ -52,6 +52,8 @@ extern struct host host;
char config_default[] = SYSCONFDIR PIMD_DEFAULT_CONFIG; char config_default[] = SYSCONFDIR PIMD_DEFAULT_CONFIG;
/* pimd 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'},
@ -59,12 +61,16 @@ 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},
{ "version", no_argument, NULL, 'v'}, { "version", no_argument, NULL, 'v'},
{ "debug_zclient", no_argument, NULL, 'Z'}, { "debug_zclient", no_argument, NULL, 'Z'},
{ "help", no_argument, NULL, 'h'}, { "help", no_argument, NULL, 'h'},
{ 0 } { 0 }
}; };
/* VTY Socket prefix */
char vty_sock_path[MAXPATHLEN] = PIM_VTYSH_PATH;
/* pimd privileges */ /* pimd privileges */
zebra_capabilities_t _caps_p [] = zebra_capabilities_t _caps_p [] =
{ {
@ -104,6 +110,7 @@ Daemon which manages PIM.\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\
-v, --version Print program version\n\ -v, --version Print program version\n\
" "
@ -126,6 +133,7 @@ Report bugs to %s\n", progname, PIMD_BUG_ADDRESS);
int main(int argc, char** argv, char** envp) { int main(int argc, char** argv, char** envp) {
char *p; char *p;
char *vty_addr = NULL; char *vty_addr = NULL;
char *vty_sock_name;
int vty_port = -1; int vty_port = -1;
int daemon_mode = 0; int daemon_mode = 0;
char *config_file = NULL; char *config_file = NULL;
@ -173,6 +181,9 @@ int main(int argc, char** argv, char** envp) {
case 'P': case 'P':
vty_port = atoi (optarg); vty_port = atoi (optarg);
break; break;
case OPTION_VTYSOCK:
set_socket_path(vty_sock_path, PIM_VTYSH_PATH, optarg, sizeof (vty_sock_path));
break;
case 'v': case 'v':
printf(PIMD_PROGNAME " version %s\n", PIMD_VERSION); printf(PIMD_PROGNAME " version %s\n", PIMD_VERSION);
print_version(progname); print_version(progname);
@ -239,7 +250,7 @@ int main(int argc, char** argv, char** envp) {
/* Create pimd VTY socket */ /* Create pimd VTY socket */
if (vty_port < 0) if (vty_port < 0)
vty_port = PIMD_VTY_PORT; vty_port = PIMD_VTY_PORT;
vty_serv_sock(vty_addr, vty_port, PIM_VTYSH_PATH); vty_serv_sock(vty_addr, vty_port, vty_sock_path);
zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting, VTY interface at port TCP %d", zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting, VTY interface at port TCP %d",
FRR_VERSION, PIMD_VERSION, vty_port); FRR_VERSION, PIMD_VERSION, vty_port);