Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

ospfd: do not install blackhole routes for ranges with "not-advertise"

Browse source 
Adding blackhole routes is unnecessary in that case.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2023-03-07 21:13:53 -03:00
parent 4312d66f9f
commit 271588ace0
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
ospfd/ospf_abr.c
View file

@ -76,7 +76,8 @@ static void ospf_area_range_delete(struct ospf_area *area,
{
struct ospf_area_range *range = rn->info;
if (ospf_area_range_active(range))
if (ospf_area_range_active(range) &&
CHECK_FLAG(range->flags, OSPF_AREA_RANGE_ADVERTISE))
ospf_delete_discard_route(area->ospf, area->ospf->new_table,
(struct prefix_ipv4 *)&rn->p);
@ -1933,25 +1934,27 @@ static void ospf_abr_manage_discard_routes(struct ospf *ospf)
struct listnode *node, *nnode;
struct route_node *rn;
struct ospf_area *area;
struct ospf_area_range *range;
for (ALL_LIST_ELEMENTS(ospf->areas, node, nnode, area))
for (rn = route_top(area->ranges); rn; rn = route_next(rn))
if ((range = rn->info) != NULL)
if (CHECK_FLAG(range->flags,
OSPF_AREA_RANGE_ADVERTISE)) {
if (ospf_area_range_active(range))
ospf_add_discard_route(
ospf, ospf->new_table,
area,
(struct prefix_ipv4
*)&rn->p);
else
ospf_delete_discard_route(
ospf, ospf->new_table,
(struct prefix_ipv4
*)&rn->p);
}
for (ALL_LIST_ELEMENTS(ospf->areas, node, nnode, area)) {
for (rn = route_top(area->ranges); rn; rn = route_next(rn)) {
struct ospf_area_range *range;
range = rn->info;
if (!range)
continue;
if (ospf_area_range_active(range)
&& CHECK_FLAG(range->flags,
OSPF_AREA_RANGE_ADVERTISE))
ospf_add_discard_route(
ospf, ospf->new_table, area,
(struct prefix_ipv4 *)&rn->p);
else
ospf_delete_discard_route(
ospf, ospf->new_table,
(struct prefix_ipv4 *)&rn->p);
}
}
}
/* This is the function taking care about ABR NSSA, i.e. NSSA