proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-10 07:11:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospf6: permit route delete without nexthops

Browse Source 
It's possible for ospf6 to decide to delete a route after it's
removed all of the route's nexthops. It's ok to delete a prefix
alone - be a little more forgiving when preparing a route delete.

Signed-off-by: Mark Stapp <mstapp@nvidia.com>
This commit is contained in:
Mark Stapp 2022-06-17 11:47:55 -04:00
parent 71623b304e
commit 0f9e2c918b
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ospf6d/ospf6_zebra.c
View File

@ -432,9 +432,12 @@ static void ospf6_zebra_route_update(int type, struct ospf6_route *request,
} }
/* If removing is the best path and if there's another path, /* If removing is the best path and if there's another path,
treat this request as add the secondary path */ * treat this request as add the secondary path - if there are
if (type == REM && ospf6_route_is_best(request) && request->next * nexthops.
&& ospf6_route_is_same(request, request->next)) { */
if (type == REM && ospf6_route_is_best(request) && request->next &&
ospf6_route_is_same(request, request->next) &&
ospf6_route_num_nexthops(request->next) > 0) {
if (IS_OSPF6_DEBUG_ZEBRA(SEND)) if (IS_OSPF6_DEBUG_ZEBRA(SEND))
zlog_debug( zlog_debug(
" Best-path removal resulted Secondary addition"); " Best-path removal resulted Secondary addition");
@ -452,9 +455,12 @@ static void ospf6_zebra_route_update(int type, struct ospf6_route *request,
nhcount = ospf6_route_num_nexthops(request); nhcount = ospf6_route_num_nexthops(request);
if (nhcount == 0) { if (nhcount == 0) {
if (IS_OSPF6_DEBUG_ZEBRA(SEND)) if (type == ADD) {
zlog_debug(" No nexthop, ignore"); if (IS_OSPF6_DEBUG_ZEBRA(SEND))
return; zlog_debug(" No nexthop, ignore");
return;
} else if (IS_OSPF6_DEBUG_ZEBRA(SEND))
zlog_debug(" No nexthop, rem ok");
} }
dest = &request->prefix; dest = &request->prefix;
@ -464,17 +470,20 @@ static void ospf6_zebra_route_update(int type, struct ospf6_route *request,
api.type = ZEBRA_ROUTE_OSPF6; api.type = ZEBRA_ROUTE_OSPF6;
api.safi = SAFI_UNICAST; api.safi = SAFI_UNICAST;
api.prefix = *dest; api.prefix = *dest;
SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
if (nhcount > ospf6->max_multipath) { if (nhcount > ospf6->max_multipath) {
if (IS_OSPF6_DEBUG_ZEBRA(SEND)) if (IS_OSPF6_DEBUG_ZEBRA(SEND))
zlog_debug( zlog_debug(
" Nexthop count is greater than configured maximum-path, hence ignore the extra nexthops"); " Nexthop count is greater than configured maximum-path, hence ignore the extra nexthops");
} }
api.nexthop_num = MIN(nhcount, ospf6->max_multipath);
ospf6_route_zebra_copy_nexthops(request, api.nexthops, api.nexthop_num, api.nexthop_num = MIN(nhcount, ospf6->max_multipath);
api.vrf_id); if (api.nexthop_num > 0) {
SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
ospf6_route_zebra_copy_nexthops(request, api.nexthops,
api.nexthop_num, api.vrf_id);
}
SET_FLAG(api.message, ZAPI_MESSAGE_METRIC); SET_FLAG(api.message, ZAPI_MESSAGE_METRIC);
api.metric = (request->path.metric_type == 2 ? request->path.u.cost_e2 api.metric = (request->path.metric_type == 2 ? request->path.u.cost_e2
: request->path.cost); : request->path.cost);