diff options
author | Feng Lu <lu.feng@6wind.com> | 2015-05-22 11:39:58 +0200 |
---|---|---|
committer | Vipin Kumar <vipin@cumulusnetworks.com> | 2015-10-30 01:00:32 +0100 |
commit | 6a69b354a6656f138a5f11e4542dc84f748f2bea (patch) | |
tree | 8d48ae3adce87147c207aa54132ce9bab6d793c8 /ripngd/ripng_interface.c | |
parent | lib, zebra: add "vrf_id" into the "struct interface" (diff) | |
download | frr-6a69b354a6656f138a5f11e4542dc84f748f2bea.tar.xz frr-6a69b354a6656f138a5f11e4542dc84f748f2bea.zip |
*: 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>
Conflicts:
bgpd/bgp_main.c
pimd/pim_iface.c
pimd/pim_iface.h
pimd/pim_main.c
pimd/pimd.c
Diffstat (limited to 'ripngd/ripng_interface.c')
-rw-r--r-- | ripngd/ripng_interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index 9517c924c..3f9f02597 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -35,6 +35,7 @@ #include "table.h" #include "thread.h" #include "privs.h" +#include "vrf.h" #include "ripngd/ripngd.h" #include "ripngd/ripng_debug.h" @@ -1200,7 +1201,6 @@ void ripng_if_init () { /* Interface initialize. */ - iflist = list_new (); if_add_hook (IF_NEW_HOOK, ripng_if_new_hook); if_add_hook (IF_DELETE_HOOK, ripng_if_delete_hook); |