zebra: add hooks upon enabling / disabling a VRF

zebra_vrf_enable() is the callback for VRF_ENABLE_HOOK.
It presently needs do nothing.

zebra_vrf_disable() is the callback for VRF_DISABLE_HOOK.
It presently withdraws routes, shuts down interfaces, and
clears the router-id candidates in that VRF.

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>
This commit is contained in:
Feng Lu 2015-05-22 11:40:09 +02:00 committed by Vipin Kumar
parent e5bf3e1ed7
commit a31c5886dd
4 changed files with 79 additions and 1 deletions

View File

@ -230,11 +230,51 @@ zebra_vrf_new (vrf_id_t vrf_id, void **info)
return 0;
}
/* Callback upon enabling a VRF. */
static int
zebra_vrf_enable (vrf_id_t vrf_id, void **info)
{
struct zebra_vrf *zvrf = (struct zebra_vrf *) (*info);
assert (zvrf);
return 0;
}
/* Callback upon disabling a VRF. */
static int
zebra_vrf_disable (vrf_id_t vrf_id, void **info)
{
struct zebra_vrf *zvrf = (struct zebra_vrf *) (*info);
struct listnode *list_node;
struct interface *ifp;
assert (zvrf);
rib_close_table (zvrf->table[AFI_IP][SAFI_UNICAST]);
rib_close_table (zvrf->table[AFI_IP6][SAFI_UNICAST]);
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (vrf_id), list_node, ifp))
{
int operative = if_is_operative (ifp);
UNSET_FLAG (ifp->flags, IFF_UP);
if (operative)
if_down (ifp);
}
list_delete_all_node (zvrf->rid_all_sorted_list);
list_delete_all_node (zvrf->rid_lo_sorted_list);
return 0;
}
/* Zebra VRF initialization. */
static void
zebra_vrf_init (void)
{
vrf_add_hook (VRF_NEW_HOOK, zebra_vrf_new);
vrf_add_hook (VRF_ENABLE_HOOK, zebra_vrf_enable);
vrf_add_hook (VRF_DISABLE_HOOK, zebra_vrf_disable);
vrf_init ();
}

View File

@ -438,6 +438,7 @@ extern void rib_update (vrf_id_t);
extern void rib_update_static (vrf_id_t);
extern void rib_weed_tables (void);
extern void rib_sweep_route (void);
extern void rib_close_table (struct route_table *);
extern void rib_close (void);
extern void rib_init (void);
extern unsigned long rib_score_proto (u_char proto, u_short instance);

View File

@ -217,11 +217,48 @@ zebra_vrf_new (vrf_id_t vrf_id, void **info)
return 0;
}
/* Callback upon enabling a VRF. */
static int
zebra_vrf_enable (vrf_id_t vrf_id, void **info)
{
struct zebra_vrf *zvrf = (struct zebra_vrf *) (*info);
assert (zvrf);
return 0;
}
/* Callback upon disabling a VRF. */
static int
zebra_vrf_disable (vrf_id_t vrf_id, void **info)
{
struct zebra_vrf *zvrf = (struct zebra_vrf *) (*info);
struct listnode *list_node;
struct interface *ifp;
assert (zvrf);
rib_close_table (zvrf->table[AFI_IP][SAFI_UNICAST]);
rib_close_table (zvrf->table[AFI_IP6][SAFI_UNICAST]);
for (ALL_LIST_ELEMENTS_RO (vrf_iflist (vrf_id), list_node, ifp))
{
int operative = if_is_operative (ifp);
UNSET_FLAG (ifp->flags, IFF_UP);
if (operative)
if_down (ifp);
}
return 0;
}
/* Zebra VRF initialization. */
static void
zebra_vrf_init (void)
{
vrf_add_hook (VRF_NEW_HOOK, zebra_vrf_new);
vrf_add_hook (VRF_ENABLE_HOOK, zebra_vrf_enable);
vrf_add_hook (VRF_DISABLE_HOOK, zebra_vrf_disable);
vrf_init ();
}

View File

@ -3954,7 +3954,7 @@ rib_score_proto (u_char proto, u_short instance)
}
/* Close RIB and clean up kernel routes. */
static void
void
rib_close_table (struct route_table *table)
{
struct route_node *rn;