summaryrefslogtreecommitdiffstats
path: root/isisd/isis_main.c
diff options
context:
space:
mode:
authorFeng Lu <lu.feng@6wind.com>2015-05-22 11:39:58 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2015-06-02 06:58:12 +0200
commit126215c1238eb42cc92d23aefbe1fac3b204438f (patch)
tree22910b50f39003e297efc6236711581cbf3b2ada /isisd/isis_main.c
parent2fc97f6335dd5d7df2c285b363c6ef56bb98dcf8 (diff)
downloadquagga-126215c1238eb42cc92d23aefbe1fac3b204438f.tar.bz2
quagga-126215c1238eb42cc92d23aefbe1fac3b204438f.tar.xz
*: call if_init()/if_terminate() from vrf_init()/vrf_terminate()
Later, an interface will belong to a specific VRF, and the interface initialization will be a part of the VRF initialization. So now call if_init() from vrf_init(), and if_terminate() from vrf_terminate(). Daemons have the according changes: - if if_init() was called or "iflist" was initialized, now call vrf_init() instead; - if if_terminate() was called or "iflist" was destroyed, now call vrf_terminate() instead. Signed-off-by: Feng Lu <lu.feng@6wind.com> Reviewed-by: Alain Ritoux <alain.ritoux@6wind.com> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Vincent JARDIN <vincent.jardin@6wind.com> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'isisd/isis_main.c')
-rw-r--r--isisd/isis_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 283b7eaa..60ecb754 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -35,6 +35,7 @@
#include "sigevent.h"
#include "filter.h"
#include "zclient.h"
+#include "vrf.h"
#include "isisd/dict.h"
#include "include-netbsd/iso.h"
@@ -330,6 +331,7 @@ main (int argc, char **argv, char **envp)
vty_init (master);
memory_init ();
access_list_init();
+ vrf_init ();
isis_init ();
isis_circuit_init ();
isis_spf_cmds_init ();