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

zebra: fix nexthop_group conversion in fpm code

Browse Source 
Recent commit that embedded the nhg_hash_entry's group
missed a couple of fpm modules.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-02-28 08:45:56 -05:00
parent 890b3450ea
commit 97cd9bfc07
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebra/zebra_fpm_dt.c
View File

@ -90,7 +90,7 @@ static int zfpm_dt_find_route(rib_dest_t **dest_p, struct route_entry **re_p)
if (!re) if (!re)
continue; continue;
if (nexthop_group_active_nexthop_num(re->nhe->nhg) == 0) if (nexthop_group_active_nexthop_num(&(re->nhe->nhg)) == 0)
continue; continue;
*dest_p = dest; *dest_p = dest;

2
zebra/zebra_fpm_protobuf.c
View File

@ -173,7 +173,7 @@ static Fpm__AddRoute *create_add_route_message(qpb_allocator_t *allocator,
* Figure out the set of nexthops to be added to the message. * Figure out the set of nexthops to be added to the message.
*/ */
num_nhs = 0; num_nhs = 0;
for (ALL_NEXTHOPS_PTR(re->nhe->nhg, nexthop)) { for (ALL_NEXTHOPS(re->nhe->nhg, nexthop)) {
if (num_nhs >= zrouter.multipath_num) if (num_nhs >= zrouter.multipath_num)
break; break;