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

babeld: fix cli option to override config file (-f)

Browse Source 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
This commit is contained in:
Martin Winter 2018-04-30 18:02:27 -07:00
parent 83697e0367
commit f714218ee3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
babeld/babel_main.c
View File

@ -73,7 +73,6 @@ int protocol_port; /* babel's port */
int protocol_socket = -1; /* socket: communicate with others babeld */ int protocol_socket = -1; /* socket: communicate with others babeld */
static char babel_config_default[] = SYSCONFDIR BABEL_DEFAULT_CONFIG; static char babel_config_default[] = SYSCONFDIR BABEL_DEFAULT_CONFIG;
static char *babel_config_file = NULL;
static char *babel_vty_addr = NULL; static char *babel_vty_addr = NULL;
static int babel_vty_port = BABEL_VTY_PORT; static int babel_vty_port = BABEL_VTY_PORT;
@ -198,7 +197,7 @@ main(int argc, char **argv)
babelz_zebra_init (); babelz_zebra_init ();
/* Get zebra configuration file. */ /* Get zebra configuration file. */
vty_read_config (babel_config_file, babel_config_default); vty_read_config (babeld_di.config_file, babel_config_default);
/* init buffer */ /* init buffer */
rc = resize_receive_buffer(1500); rc = resize_receive_buffer(1500);
@ -389,7 +388,7 @@ show_babel_main_configuration (struct vty *vty)
"id = %s\n" "id = %s\n"
"kernel_metric = %d\n", "kernel_metric = %d\n",
state_file, state_file,
babel_config_file ? babel_config_file : babel_config_default, babeld_di.config_file ? babeld_di.config_file : babel_config_default,
format_address(protocol_group), format_address(protocol_group),
protocol_port, protocol_port,
babel_vty_addr ? babel_vty_addr : "None", babel_vty_addr ? babel_vty_addr : "None",