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

ospfd: Correct invalid SR-MPLS output label

Browse source 
When OSPFd starts, there is 2 possible scenarios for Segment Routing:
1/ Routes associated to Prefixes are not yet available i.e. Segment Routing LSA
are received before LSA Type 1. In this case, the function
ospf_sr_nhlfe_update() is triggered when a new SPF is launch. Thus, neighbors
and output label are always synchronise with the routing table.
2/ Routes are already available i.e. LSA Type 1 are received before Segment
Routing LSA, in particular the Router Information which contains the SRGB.
During nhlfe computation, perfixes are leave with incomplete configuration, in
particular, the SR nexthop is set to NULL. If this scenario is handle through
the function update_out_nhlfe (triggered when SRGB is received or modified from
a neighbor node), the output label is not correctly configured as the nexthop
SR node associated to the prefix has been leave to NULL.

This patch correct this problem by calling the function compute_nhlfe() when
the nexthop SR Node associated to the prefix is NULL within the
update_out_nhlfe() function. Thus, we guarantee that the SR prefix is always
correctly configuration indpedently of the scenario i.e. arrival of the
different LSA.

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
This commit is contained in:
Olivier Dugeon 2024-11-23 18:50:21 +01:00
parent d745f4eae5
commit 1bcccb87cd
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ospfd/ospf_sr.c
View file

@ -1334,6 +1334,12 @@ static void update_out_nhlfe(struct hash_bucket *bucket, void *args)
continue; continue;
for (ALL_LIST_ELEMENTS_RO(srp->route->paths, pnode, path)) { for (ALL_LIST_ELEMENTS_RO(srp->route->paths, pnode, path)) {
/* Compute NHFLE if path has not been initialized */
if (!path->srni.nexthop) {
compute_prefix_nhlfe(srp);
continue;
}
/* Skip path that has not next SR-Node as nexthop */ /* Skip path that has not next SR-Node as nexthop */
if (path->srni.nexthop != srnext) if (path->srni.nexthop != srnext)
continue; continue;