diff options
| author | Mark Stapp <mjs@voltanet.io> | 2020-05-08 16:22:54 -0400 |
|---|---|---|
| committer | Mark Stapp <mjs@voltanet.io> | 2020-07-07 13:14:01 -0400 |
| commit | 6b193087ca10e128614ea5dacc72c4462e6db0ce (patch) | |
| tree | e131f048c21d6d2fc09983c486b7678127a86959 /zebra/zebra_nhg.c | |
| parent | 5b76e76515f5b0bab1748fd90b7eaf1642a061df (diff) | |
staticd,zebra: use ALLOW_RECURSION for static routes
Remove a special-case clause for static routes - it was the same
as the clause for other recursive routes. Have staticd just tell
zebra that recursion is allowed. Update topotest that was aware
of this 'internal' flag.
Signed-off-by: Mark Stapp <mjs@voltanet.io>
Diffstat (limited to 'zebra/zebra_nhg.c')
| -rw-r--r-- | zebra/zebra_nhg.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c index 02ba69bd4d..ce5e6a54d7 100644 --- a/zebra/zebra_nhg.c +++ b/zebra/zebra_nhg.c @@ -1953,33 +1953,6 @@ static int nexthop_active(afi_t afi, struct route_entry *re, __func__); return resolved; - } else if (re->type == ZEBRA_ROUTE_STATIC) { - resolved = 0; - for (ALL_NEXTHOPS(match->nhe->nhg, newhop)) { - if (!CHECK_FLAG(match->status, - ROUTE_ENTRY_INSTALLED)) - continue; - if (!nexthop_valid_resolve(nexthop, newhop)) - continue; - - if (IS_ZEBRA_DEBUG_RIB_DETAILED) - zlog_debug("%s: STATIC match %p (%u), newhop %pNHv", - __func__, match, - match->nhe->id, newhop); - - SET_FLAG(nexthop->flags, - NEXTHOP_FLAG_RECURSIVE); - nexthop_set_resolved(afi, newhop, nexthop); - resolved = 1; - } - if (resolved) - re->nexthop_mtu = match->mtu; - - if (!resolved && IS_ZEBRA_DEBUG_RIB_DETAILED) - zlog_debug( - " %s: Static route unable to resolve", - __func__); - return resolved; } else { if (IS_ZEBRA_DEBUG_RIB_DETAILED) { zlog_debug( |