Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #15593 from LabNConsulting/acee/ospf-link-flap-ase-route-change 

ospfd: Assure OSPF AS External routes are installed after link flap
This commit is contained in:
Mark Stapp 2024-03-22 08:35:42 -04:00 committed by GitHub
parent 2313916a9e 7ac19946b5
commit 3249853709
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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);
if (or->path_type != newor->path_type)
if (or->changed || (or->path_type != newor->path_type))
return 0;
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;
}
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 ospf_route *or;
struct listnode *nh;
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)
return 0;
@ -864,23 +891,11 @@ int ospf_if_down(struct ospf_interface *oi)
/* Shutdown packet reception and sending */
ospf_if_stream_unset(oi);
if (!ospf->new_table)
return 1;
for (rn = route_top(ospf->new_table); rn; rn = route_next(rn)) {
or = rn->info;
if (ospf->new_table)
ospf_if_down_mark_routes_changed(ospf->new_table, oi);
if (!or)
continue;
for (nh = listhead(or->paths); nh;
nh = listnextnode_unchecked(nh)) {
op = listgetdata(nh);
if (op->ifindex == oi->ifp->ifindex) {
or->changed = true;
break;
}
}
}
if (ospf->new_external_route)
ospf_if_down_mark_routes_changed(ospf->new_external_route, oi);
return 1;
}