From: Philippe Guibert <philippe.guibert@6wind.com>
Date: Thu, 20 Jun 2019 08:06:48 +0000 (+0200)
Subject: ospfd: do not create default ospf instance
X-Git-Tag: base_7.3~353^2~10
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=44ad6e4127ee50fc2a14804159b062ac1910723f;p=matthieu%2Ffrr.git

ospfd: do not create default ospf instance

when an other name is given to default vrf, then there is case where 2
ospf instances are created, which is not wished. Also, it appears that
interface learning and ospf interface configuration is not lost when not
creating that default ospf instance. So removing it.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
---

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 36bb8d49b5..bee7bbb21d 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -216,16 +216,6 @@ int main(int argc, char **argv)
 	/* OSPF errors 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 quagga(ospfd) is restarted */
-	if (!ospf_get_instance(instance)) {
-		flog_err(EC_OSPF_INIT_FAIL, "OSPF instance init failed: %s",
-			 strerror(errno));
-		exit(1);
-	}
-
 	frr_config_fork();
 	frr_run(master);