diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-05-06 16:13:48 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-05-06 16:15:41 +0200 |
| commit | 5cfaa2d92bd4889eb2063946520ad17d3c738d58 (patch) | |
| tree | 4e13fb421eca96caaa7e80e5ede5b10b6efe85de | |
| parent | Merge pull request #6347 from opensourcerouting/llvm-callgraph (diff) | |
| download | frr-5cfaa2d92bd4889eb2063946520ad17d3c738d58.tar.xz frr-5cfaa2d92bd4889eb2063946520ad17d3c738d58.zip | |
zebra: Loosen ONLINK restrictions a tiny bit
Loosen the ONLINK restrictions such that when an upper
level protocol sends us a nexthop with an ONLINK attribute
just ensure that interface is up and usable. ONLINK effectively
means we know what we are doing to the kernel.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| -rw-r--r-- | zebra/zebra_nhg.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c index de044c0ea..fc5128b67 100644 --- a/zebra/zebra_nhg.c +++ b/zebra/zebra_nhg.c @@ -1793,23 +1793,16 @@ static int nexthop_active(afi_t afi, struct route_entry *re, nexthop->vrf_id); return 0; } - if (connected_is_unnumbered(ifp)) { - if (if_is_operative(ifp)) - return 1; + if (if_is_operative(ifp)) + return 1; + else { if (IS_ZEBRA_DEBUG_RIB_DETAILED) zlog_debug( " %s: Onlink and interface %s is not operative", __func__, ifp->name); return 0; } - if (!if_is_operative(ifp)) { - if (IS_ZEBRA_DEBUG_RIB_DETAILED) - zlog_debug( - " %s: Interface %s is not unnumbered", - __func__, ifp->name); - return 0; - } } if ((top->p.family == AF_INET && top->p.prefixlen == 32 |