From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 23 Sep 2016 16:11:09 +0000 (-0400)
Subject: Revert "zebra: use link scope for interface routes"
X-Git-Tag: frr-2.0-rc1~246
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=877a0aba09f68977e9d07d7d4162d652844cf800;p=matthieu%2Ffrr.git

Revert "zebra: use link scope for interface routes"

This reverts commit 72f3a8fb09433ee1e4d079522cd70999bb3b8e79.
---

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 79f20259a1..95c8892979 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -2428,7 +2428,7 @@ netlink_route_multipath (int cmd, struct prefix *p, struct rib *rib,
   req.r.rtm_family = family;
   req.r.rtm_dst_len = p->prefixlen;
   req.r.rtm_protocol = RTPROT_ZEBRA;
-  req.r.rtm_scope = RT_SCOPE_LINK;
+  req.r.rtm_scope = RT_SCOPE_UNIVERSE;
 
   if ((rib->flags & ZEBRA_FLAG_BLACKHOLE) || (rib->flags & ZEBRA_FLAG_REJECT))
     discard = 1;
@@ -2508,9 +2508,6 @@ netlink_route_multipath (int cmd, struct prefix *p, struct rib *rib,
       if (cmd == RTM_DELROUTE && !CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_FIB))
         continue;
 
-      if (nexthop->type != NEXTHOP_TYPE_IFINDEX)
-        req.r.rtm_scope = RT_SCOPE_UNIVERSE;
-
       nexthop_num++;
     }
 
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 775619ac2d..f57c0b5d67 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -483,16 +483,27 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop *nexthop, int set,
 			  {
 			    resolved_hop->type = newhop->type;
 			    resolved_hop->gate.ipv4 = newhop->gate.ipv4;
-			    resolved_hop->ifindex = newhop->ifindex;
+
+			    if (newhop->ifindex)
+			      {
+				resolved_hop->type = NEXTHOP_TYPE_IPV4_IFINDEX;
+				resolved_hop->ifindex = newhop->ifindex;
+				if (newhop->flags & NEXTHOP_FLAG_ONLINK)
+				  resolved_hop->flags |= NEXTHOP_FLAG_ONLINK;
+			      }
 			  }
 
-			/* If the resolving route is an interface route, it
-			 * means the gateway we are looking up is connected
-			 * to that interface. Therefore, the resolved route
-			 * should have the original gateway as nexthop as it
-			 * is directly connected. */
+			/* If the resolving route is an interface route,
+			 * it means the gateway we are looking up is connected
+			 * to that interface. (The actual network is _not_ onlink).
+			 * Therefore, the resolved route should have the original
+			 * gateway as nexthop as it is directly connected.
+			 *
+			 * On Linux, we have to set the onlink netlink flag because
+			 * otherwise, the kernel won't accept the route. */
 			if (newhop->type == NEXTHOP_TYPE_IFINDEX)
 			  {
+			    resolved_hop->flags |= NEXTHOP_FLAG_ONLINK;
 			    resolved_hop->type = NEXTHOP_TYPE_IPV4_IFINDEX;
 			    resolved_hop->gate.ipv4 = nexthop->gate.ipv4;
 			    resolved_hop->ifindex = newhop->ifindex;