diff options
author | Feng Lu <lu.feng@6wind.com> | 2015-05-22 11:39:58 +0200 |
---|---|---|
committer | David Lamparter <equinox@opensourcerouting.org> | 2015-06-02 06:58:12 +0200 |
commit | 126215c1238eb42cc92d23aefbe1fac3b204438f (patch) | |
tree | 22910b50f39003e297efc6236711581cbf3b2ada /pimd/pim_main.c | |
parent | 2fc97f6335dd5d7df2c285b363c6ef56bb98dcf8 (diff) | |
download | quagga-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 'pimd/pim_main.c')
-rw-r--r-- | pimd/pim_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pimd/pim_main.c b/pimd/pim_main.c index b57f8811..63dd6364 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -31,6 +31,7 @@ #include <signal.h> #include "memory.h" +#include "vrf.h" #include "filter.h" #include "vty.h" #include "sigevent.h" @@ -203,6 +204,7 @@ int main(int argc, char** argv, char** envp) { cmd_init(1); vty_init(master); memory_init(); + vrf_init(); access_list_init(); pim_init(); |