proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-06 05:47:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: include resolving nexthops in nhg hash

Browse Source 
Ensure that the nhg hash comparison function includes all
nexthops, including recursive-resolving nexthops.

Signed-off-by: Mark Stapp <mjs@cisco.com>
This commit is contained in:
Mark Stapp 2025-01-27 14:17:24 -05:00
parent 9890d3acce
commit cb7cf73992
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra/zebra_nhg.c
View File

@ -572,8 +572,7 @@ bool zebra_nhg_hash_equal(const void *arg1, const void *arg2)
/* Nexthops should be in-order, so we simply compare them in-place */ /* Nexthops should be in-order, so we simply compare them in-place */
for (nexthop1 = nhe1->nhg.nexthop, nexthop2 = nhe2->nhg.nexthop; for (nexthop1 = nhe1->nhg.nexthop, nexthop2 = nhe2->nhg.nexthop;
nexthop1 && nexthop2; nexthop1 && nexthop2;
nexthop1 = nexthop1->next, nexthop2 = nexthop2->next) { nexthop1 = nexthop_next(nexthop1), nexthop2 = nexthop_next(nexthop2)) {
if (!nhg_compare_nexthops(nexthop1, nexthop2)) if (!nhg_compare_nexthops(nexthop1, nexthop2))
return false; return false;
} }
@ -608,8 +607,7 @@ bool zebra_nhg_hash_equal(const void *arg1, const void *arg2)
for (nexthop1 = nhe1->backup_info->nhe->nhg.nexthop, for (nexthop1 = nhe1->backup_info->nhe->nhg.nexthop,
nexthop2 = nhe2->backup_info->nhe->nhg.nexthop; nexthop2 = nhe2->backup_info->nhe->nhg.nexthop;
nexthop1 && nexthop2; nexthop1 && nexthop2;
nexthop1 = nexthop1->next, nexthop2 = nexthop2->next) { nexthop1 = nexthop_next(nexthop1), nexthop2 = nexthop_next(nexthop2)) {
if (!nhg_compare_nexthops(nexthop1, nexthop2)) if (!nhg_compare_nexthops(nexthop1, nexthop2))
return false; return false;
} }