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

Merge pull request #4955 from sworleys/GW-IFINDEX-Verify-Resolve

Browse Source 
zebra: Don't resolve to diff interface if given
This commit is contained in:
Russ White 2019-09-10 11:06:34 -04:00 committed by GitHub
commit 853ba636ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
zebra/zebra_nhg.c
View File

@ -122,6 +122,33 @@ static void nexthop_set_resolved(afi_t afi, const struct nexthop *newhop,
_nexthop_add(&nexthop->resolved, resolved_hop); _nexthop_add(&nexthop->resolved, resolved_hop);
} }
/* Checks if nexthop we are trying to resolve to is valid */
static bool nexthop_valid_resolve(const struct nexthop *nexthop,
const struct nexthop *resolved)
{
/* Can't resolve to a recursive nexthop */
if (CHECK_FLAG(resolved->flags, NEXTHOP_FLAG_RECURSIVE))
return false;
switch (nexthop->type) {
case NEXTHOP_TYPE_IPV4_IFINDEX:
case NEXTHOP_TYPE_IPV6_IFINDEX:
/* If the nexthop we are resolving to does not match the
* ifindex for the nexthop the route wanted, its not valid.
*/
if (nexthop->ifindex != resolved->ifindex)
return false;
break;
case NEXTHOP_TYPE_IPV4:
case NEXTHOP_TYPE_IPV6:
case NEXTHOP_TYPE_IFINDEX:
case NEXTHOP_TYPE_BLACKHOLE:
break;
}
return true;
}
/* /*
* Given a nexthop we need to properly recursively resolve * Given a nexthop we need to properly recursively resolve
* the route. As such, do a table lookup to find and match * the route. As such, do a table lookup to find and match
@ -287,8 +314,7 @@ static int nexthop_active(afi_t afi, struct route_entry *re,
if (!CHECK_FLAG(match->status, if (!CHECK_FLAG(match->status,
ROUTE_ENTRY_INSTALLED)) ROUTE_ENTRY_INSTALLED))
continue; continue;
if (CHECK_FLAG(newhop->flags, if (!nexthop_valid_resolve(nexthop, newhop))
NEXTHOP_FLAG_RECURSIVE))
continue; continue;
SET_FLAG(nexthop->flags, SET_FLAG(nexthop->flags,
@ -308,8 +334,7 @@ static int nexthop_active(afi_t afi, struct route_entry *re,
if (!CHECK_FLAG(match->status, if (!CHECK_FLAG(match->status,
ROUTE_ENTRY_INSTALLED)) ROUTE_ENTRY_INSTALLED))
continue; continue;
if (CHECK_FLAG(newhop->flags, if (!nexthop_valid_resolve(nexthop, newhop))
NEXTHOP_FLAG_RECURSIVE))
continue; continue;
SET_FLAG(nexthop->flags, SET_FLAG(nexthop->flags,