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

zebra: fix ifp pointer for groups/recursives

Browse Source 
At some point we broke the ifp pointer for nhe->ifp such
that it was pointing to an interface even in groups/recurisve
instances.

Add checks here to make it again so that we only set the ifp
pointer if it is a fully resolved singleton NHE.

Signed-off-by: Stephen Worley <sworley@nvidia.com>
This commit is contained in:
Stephen Worley 2021-06-21 12:53:25 -04:00
parent 5f179a1a61
commit bf157b9263
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zebra/zebra_nhg.c
View File

@ -453,8 +453,13 @@ static void *zebra_nhg_hash_alloc(void *arg)
/* Mark duplicate nexthops in a group at creation time. */ /* Mark duplicate nexthops in a group at creation time. */
nexthop_group_mark_duplicates(&(nhe->nhg)); nexthop_group_mark_duplicates(&(nhe->nhg));
/* Add the ifp now if it's not a group or recursive and has ifindex */ /*
if (nhe->nhg.nexthop && nhe->nhg.nexthop->ifindex) { * Add the ifp now if it's not a group or recursive and has ifindex.
*
* A proto-owned ID is always a group.
*/
if (!PROTO_OWNED(nhe) && nhe->nhg.nexthop && !nhe->nhg.nexthop->next
&& !nhe->nhg.nexthop->resolved && nhe->nhg.nexthop->ifindex) {
struct interface *ifp = NULL; struct interface *ifp = NULL;
ifp = if_lookup_by_index(nhe->nhg.nexthop->ifindex, ifp = if_lookup_by_index(nhe->nhg.nexthop->ifindex,