]> git.puffer.fish Git - matthieu/frr.git/commit
*: call if_init()/if_terminate() from vrf_init()/vrf_terminate()
authorFeng Lu <lu.feng@6wind.com>
Fri, 22 May 2015 09:39:58 +0000 (11:39 +0200)
committerVipin Kumar <vipin@cumulusnetworks.com>
Fri, 30 Oct 2015 00:00:32 +0000 (17:00 -0700)
commit6a69b354a6656f138a5f11e4542dc84f748f2bea
tree8d48ae3adce87147c207aa54132ce9bab6d793c8
parent3968dbf8ef4966fb3f9d38640ea9c5a9f13419cf
*: 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
14 files changed:
bgpd/bgp_main.c
bgpd/bgp_zebra.c
isisd/isis_circuit.c
isisd/isis_main.c
lib/vrf.c
ospf6d/ospf6_main.c
ospfd/ospf_interface.c
ospfd/ospf_main.c
ripd/rip_interface.c
ripd/rip_main.c
ripngd/ripng_interface.c
ripngd/ripng_main.c
zebra/interface.c
zebra/test_main.c