diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2020-05-06 15:25:48 -0500 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-06 15:25:48 -0500 | 
| commit | a9b763e381188e6761fc09d0bbddea94595387c3 (patch) | |
| tree | 4de2fbd0d176896720872cc819f133e5c9ad74dc | |
| parent | 03ab61c48844bec35660efeb7575fde5b96a8048 (diff) | |
| parent | 5cfaa2d92bd4889eb2063946520ad17d3c738d58 (diff) | |
Merge pull request #6358 from donaldsharp/zebra_onlink
zebra: Loosen ONLINK restrictions a tiny bit
| -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 de044c0ea0..fc5128b678 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  | 
