Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-05-01 14:06:27 +02:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

OSPF: Multi instance broken

Browse source 
Multi instance ospf support was broken due to PR #4564.
Adding fix back and extra checks to support multi instance
OSPF.

Fixes issues #5343 & #5741

Signed-off-by: Santosh P K <sapk@vmware.com>
This commit is contained in:
Santosh P K 2020-02-05 09:40:00 -08:00
parent 792465c09f
commit 128f16f90e
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ospfd/ospf_main.c
View file

@ -143,6 +143,7 @@ FRR_DAEMON_INFO(ospfd, OSPF, .vty_port = OSPF_VTY_PORT,
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
unsigned short instance = 0; unsigned short instance = 0;
bool created = false;
#ifdef SUPPORT_OSPF_API #ifdef SUPPORT_OSPF_API
/* OSPF apiserver is disabled by default. */ /* OSPF apiserver is disabled by default. */
@ -219,6 +220,17 @@ int main(int argc, char **argv)
/* OSPF errors init */ /* OSPF errors init */
ospf_error_init(); ospf_error_init();
/*
* Need to initialize the default ospf structure, so the interface mode
* commands can be duly processed if they are received before 'router
* ospf', when ospfd is restarted
*/
if (instance && !ospf_get_instance(instance, &created)) {
flog_err(EC_OSPF_INIT_FAIL, "OSPF instance init failed: %s",
strerror(errno));
exit(1);
}
frr_config_fork(); frr_config_fork();
frr_run(master); frr_run(master);