matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

ospfd: Assure OSPF AS External routes are installed after link flap

Browse source 
OSPF intra/inter area routes were previously marked to assure they
are re-installed after a fast link flap in the commit:

commit effee18744
Author: Donald Sharp <sharpd@nvidia.com>
Date:   Mon May 24 13:45:29 2021 -0400

    ospfd: Fix quick interface down up event handling in ospf

This commit extends this fix to OSPF AS External routes as well.

Signed-off-by: Acee <aceelindem@gmail.com>
This commit is contained in:
Acee 2024-03-19 23:34:09 -04:00
parent eae228c52d
commit 7ac19946b5
2 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ospfd/ospf_ase.c
View file

@ -480,7 +480,7 @@ static int ospf_ase_route_match_same(struct route_table *rt,
assert(or); assert(or);
if (or->path_type != newor->path_type) if (or->changed || (or->path_type != newor->path_type))
return 0; return 0;
switch (or->path_type) { switch (or->path_type) {

51
ospfd/ospf_interface.c
View file

@ -821,14 +821,41 @@ int ospf_if_up(struct ospf_interface *oi)
return 1; return 1;
} }
int ospf_if_down(struct ospf_interface *oi) /* This function will mark routes with next-hops matching the down
* OSPF interface as changed. It is used to assure routes that get
* removed from the zebra RIB when an interface goes down are
* reinstalled if the interface comes back up prior to an intervening
* SPF calculation.
*/
static void ospf_if_down_mark_routes_changed(struct route_table *table,
struct ospf_interface *oi)
{ {
struct ospf *ospf;
struct route_node *rn; struct route_node *rn;
struct ospf_route *or; struct ospf_route *or;
struct listnode *nh; struct listnode *nh;
struct ospf_path *op; struct ospf_path *op;
for (rn = route_top(table); rn; rn = route_next(rn)) {
or = rn->info;
if (or == NULL)
continue;
for (nh = listhead(or->paths); nh;
nh = listnextnode_unchecked(nh)) {
op = listgetdata(nh);
if (op->ifindex == oi->ifp->ifindex) {
or->changed = true;
break;
}
}
}
}
int ospf_if_down(struct ospf_interface *oi)
{
struct ospf *ospf;
if (oi == NULL) if (oi == NULL)
return 0; return 0;
@ -864,23 +891,11 @@ int ospf_if_down(struct ospf_interface *oi)
/* Shutdown packet reception and sending */ /* Shutdown packet reception and sending */
ospf_if_stream_unset(oi); ospf_if_stream_unset(oi);
if (!ospf->new_table) if (ospf->new_table)
return 1; ospf_if_down_mark_routes_changed(ospf->new_table, oi);
for (rn = route_top(ospf->new_table); rn; rn = route_next(rn)) {
or = rn->info;
if (!or) if (ospf->new_external_route)
continue; ospf_if_down_mark_routes_changed(ospf->new_external_route, oi);
for (nh = listhead(or->paths); nh;
nh = listnextnode_unchecked(nh)) {
op = listgetdata(nh);
if (op->ifindex == oi->ifp->ifindex) {
or->changed = true;
break;
}
}
}
return 1; return 1;
} }