diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-07-10 20:41:21 +0200 |
|---|---|---|
| committer | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-07-10 20:41:21 +0200 |
| commit | 96d1200e3eb9d95da6607d40398630ac45b97812 (patch) | |
| tree | 9439e25c8e8995cae302c3ab47e5ac71f44eef82 /isisd/isis_route.c | |
| parent | Revert "isisd: allow nexthop lookup on interface only" (diff) | |
| download | frr-96d1200e3eb9d95da6607d40398630ac45b97812.tar.xz frr-96d1200e3eb9d95da6607d40398630ac45b97812.zip | |
Revert "isisd: remove previous labels before fast-reroute"
This reverts commit a254fa54e3d5c31befb40164fc70deab3cf639ad.
Diffstat (limited to 'isisd/isis_route.c')
| -rw-r--r-- | isisd/isis_route.c | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/isisd/isis_route.c b/isisd/isis_route.c index a91ce7eea..b04e8e455 100644 --- a/isisd/isis_route.c +++ b/isisd/isis_route.c @@ -459,21 +459,6 @@ void isis_route_delete(struct isis_area *area, struct route_node *rode, route_unlock_node(rode); } -static void isis_route_remove_previous_sid(struct isis_area *area, - struct prefix *prefix, - struct isis_route_info *route_info) -{ - /* - * Explicitly uninstall previous Prefix-SID label if it has - * changed or was removed. - */ - if (route_info->sr_previous.present && - (!route_info->sr.present || - route_info->sr_previous.label != route_info->sr.label)) - isis_zebra_prefix_sid_uninstall(area, prefix, route_info, - &route_info->sr_previous); -} - static void isis_route_update(struct isis_area *area, struct prefix *prefix, struct prefix_ipv6 *src_p, struct isis_route_info *route_info) @@ -482,7 +467,17 @@ static void isis_route_update(struct isis_area *area, struct prefix *prefix, if (CHECK_FLAG(route_info->flag, ISIS_ROUTE_FLAG_ZEBRA_SYNCED)) return; - isis_route_remove_previous_sid(area, prefix, route_info); + /* + * Explicitly uninstall previous Prefix-SID label if it has + * changed or was removed. + */ + if (route_info->sr_previous.present + && (!route_info->sr.present + || route_info->sr_previous.label + != route_info->sr.label)) + isis_zebra_prefix_sid_uninstall( + area, prefix, route_info, + &route_info->sr_previous); /* Install route. */ isis_zebra_route_add_route(area->isis, prefix, src_p, @@ -770,7 +765,6 @@ void isis_route_switchover_nexthop(struct isis_area *area, (const struct prefix **)&src_p); /* Switchover route. */ - isis_route_remove_previous_sid(area, prefix, rinfo); UNSET_FLAG(rinfo->flag, ISIS_ROUTE_FLAG_ZEBRA_SYNCED); isis_route_update(area, prefix, src_p, rinfo->backup); |