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

zebra: Protocol side nhg_hash_entry afi fix

Browse Source 
Default the afi of the nexthop to the route entry using it.
If it turns out to be a group, update the afi to AFI_UNSPEC.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
This commit is contained in:
Stephen Worley 2019-04-01 12:24:16 -04:00
parent 86946a2207
commit ab942eb285
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zebra/zebra_rib.c
View File

@ -2639,6 +2639,8 @@ int rib_add_multipath(afi_t afi, safi_t safi, struct prefix *p,
struct route_entry *same = NULL; struct route_entry *same = NULL;
struct nhg_hash_entry *nhe = NULL; struct nhg_hash_entry *nhe = NULL;
struct list *nhg_depends = NULL; struct list *nhg_depends = NULL;
/* Default to route afi */
afi_t nhg_afi = afi;
int ret = 0; int ret = 0;
if (!re) if (!re)
@ -2671,13 +2673,18 @@ int rib_add_multipath(afi_t afi, safi_t safi, struct prefix *p,
lookup = *nh; lookup = *nh;
/* Clear it, since its a group */ /* Clear it, since its a group */
lookup.next = NULL; lookup.next = NULL;
/* Use the route afi here, since a single nh */
depend = zebra_nhg_find_nexthop(&lookup, afi); depend = zebra_nhg_find_nexthop(&lookup, afi);
nhg_depend_add(nhg_depends, depend); nhg_depend_add(nhg_depends, depend);
} }
/* change the afi for group */
if (listcount(nhg_depends))
nhg_afi = AFI_UNSPEC;
} }
nhe = zebra_nhg_find(re->ng, re->vrf_id, afi, re->nhe_id, nhg_depends, nhe = zebra_nhg_find(re->ng, re->vrf_id, nhg_afi, re->nhe_id,
false); nhg_depends, false);
if (nhe) { if (nhe) {
// TODO: Add interface pointer // TODO: Add interface pointer