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

Merge pull request #14589 from FRRouting/mergify/bp/dev/9.1/pr-13340

Browse Source 
zebra: Fix connected route deletion when multiple entry exists (backport #13340)
This commit is contained in:
Donald Sharp 2023-10-13 11:52:19 -04:00 committed by GitHub
commit e811461651
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zebra/zebra_rib.c
View File

@ -2948,8 +2948,8 @@ static void process_subq_early_route_delete(struct zebra_early_route *ere)
struct nexthop *nh = NULL; struct nexthop *nh = NULL;
if (ere->re->nhe) if (ere->re_nhe)
nh = ere->re->nhe->nhg.nexthop; nh = ere->re_nhe->nhg.nexthop;
/* Lookup same type route. */ /* Lookup same type route. */
RNODE_FOREACH_RE (rn, re) { RNODE_FOREACH_RE (rn, re) {
@ -2967,7 +2967,8 @@ static void process_subq_early_route_delete(struct zebra_early_route *ere)
if (re->type == ZEBRA_ROUTE_KERNEL && if (re->type == ZEBRA_ROUTE_KERNEL &&
re->metric != ere->re->metric) re->metric != ere->re->metric)
continue; continue;
if (re->type == ZEBRA_ROUTE_CONNECT && (rtnh = nh) && if (re->type == ZEBRA_ROUTE_CONNECT &&
(rtnh = re->nhe->nhg.nexthop) &&
rtnh->type == NEXTHOP_TYPE_IFINDEX && nh) { rtnh->type == NEXTHOP_TYPE_IFINDEX && nh) {
if (rtnh->ifindex != nh->ifindex) if (rtnh->ifindex != nh->ifindex)
continue; continue;