diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2018-05-01 03:02:27 +0200 |
|---|---|---|
| committer | Martin Winter <mwinter@opensourcerouting.org> | 2018-05-01 03:02:27 +0200 |
| commit | f714218ee30c1c6a0f20ab8644039a290926c0b5 (patch) | |
| tree | 448bc6ef99bcd8fcb5dba34f900b23b5df45e3e4 /babeld | |
| parent | snapcraft: Fix missing runtime lib dependencies (diff) | |
| download | frr-f714218ee30c1c6a0f20ab8644039a290926c0b5.tar.xz frr-f714218ee30c1c6a0f20ab8644039a290926c0b5.zip | |
babeld: fix cli option to override config file (-f)
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Diffstat (limited to 'babeld')
| -rw-r--r-- | babeld/babel_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/babeld/babel_main.c b/babeld/babel_main.c index 48f6994d8..9ea123c8f 100644 --- a/babeld/babel_main.c +++ b/babeld/babel_main.c @@ -73,7 +73,6 @@ int protocol_port; /* babel's port */ int protocol_socket = -1; /* socket: communicate with others babeld */ static char babel_config_default[] = SYSCONFDIR BABEL_DEFAULT_CONFIG; -static char *babel_config_file = NULL; static char *babel_vty_addr = NULL; static int babel_vty_port = BABEL_VTY_PORT; @@ -198,7 +197,7 @@ main(int argc, char **argv) babelz_zebra_init (); /* 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 */ rc = resize_receive_buffer(1500); @@ -389,7 +388,7 @@ show_babel_main_configuration (struct vty *vty) "id = %s\n" "kernel_metric = %d\n", 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), protocol_port, babel_vty_addr ? babel_vty_addr : "None", |