From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sat, 8 Sep 2018 17:48:48 +0000 (-0400)
Subject: Merge pull request #2875 from opensourcerouting/fabricd
X-Git-Tag: frr-7.1-dev~384
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=714e135429aaca467bd2ed654edfe977b5cd1a9c;p=mirror%2Ffrr.git

Merge pull request #2875 from opensourcerouting/fabricd

OpenFabric support
---

714e135429aaca467bd2ed654edfe977b5cd1a9c
diff --cc zebra/zebra_rib.c
index 0739db1027,1088a97278..2c8fa77c32
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@@ -442,24 -441,14 +445,25 @@@ static int nexthop_active(afi_t afi, st
  	 */
  	if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK)) {
  		ifp = if_lookup_by_index(nexthop->ifindex, nexthop->vrf_id);
- 		if (ifp && connected_is_unnumbered(ifp)) {
+ 		if ((ifp && connected_is_unnumbered(ifp))
+ 		    || CHECK_FLAG(re->flags, ZEBRA_FLAG_ONLINK)) {
  			if (if_is_operative(ifp))
  				return 1;
 -			else
 +			else {
 +				if (IS_ZEBRA_DEBUG_RIB_DETAILED)
 +					zlog_debug(
 +						"\t%s: Onlink and interface %s is not operative",
 +						__PRETTY_FUNCTION__, ifp->name);
  				return 0;
 -		} else
 +			}
 +		} else {
 +			if (IS_ZEBRA_DEBUG_RIB_DETAILED)
 +				zlog_debug(
 +					"\t%s: Interface %s is not unnumbered",
 +					__PRETTY_FUNCTION__,
 +					ifp ? ifp->name : "Unknown");
  			return 0;
 +		}
  	}
  
  	/* Make lookup prefix. */