zebra: cleanup blackhole support

blackhole support was horribly broken. cleanup by removing blackhole
stuff from ZEBRA_FLAG_*, instead add a "zflags" field inside struct rib.

introduces support for "prohibit" routes (Linux/netlink only)
also clean up blackhole options on "ip route" vty commands.

1 files changed, 23 insertions, 9 deletions

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 7374f73d..28ca3b12 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -299,7 +299,6 @@ nexthop_blackhole_add (struct rib *rib)
 
   nexthop = XCALLOC (MTYPE_NEXTHOP, sizeof (struct nexthop));
   nexthop->type = NEXTHOP_TYPE_BLACKHOLE;
-  SET_FLAG (rib->flags, ZEBRA_FLAG_BLACKHOLE);
 
   nexthop_add (rib, nexthop);
 
@@ -1556,6 +1555,7 @@ rib_add_ipv4 (int type, int flags, struct prefix_ipv4 *p,
   rib->type = type;
   rib->distance = distance;
   rib->flags = flags;
+  rib->zflags = flags >> 8;
   rib->metric = metric;
   rib->table = vrf_id;
   rib->nexthop_num = 0;
@@ -2016,7 +2016,7 @@ static_install_ipv4 (struct prefix *p, struct static_ipv4 *si)
         }
 
       /* Save the flags of this static routes (reject, blackhole) */
-      rib->flags = si->flags;
+      rib->zflags = si->zflags;
 
       /* Link this rib to the tree. */
       rib_addnode (rn, rib);
@@ -2104,7 +2104,7 @@ static_uninstall_ipv4 (struct prefix *p, struct static_ipv4 *si)
 /* Add static route into static route configuration. */
 int
 static_add_ipv4 (struct prefix *p, struct in_addr *gate, const char *ifname,
-		 u_char flags, u_char distance, u_int32_t vrf_id)
+		 unsigned zflags, u_char distance, u_int32_t vrf_id)
 {
   u_char type = 0;
   struct route_node *rn;
@@ -2123,12 +2123,14 @@ static_add_ipv4 (struct prefix *p, struct in_addr *gate, const char *ifname,
   rn = route_node_get (stable, p);
 
   /* Make flags. */
-  if (gate)
+  if (RIB_ZF_BLACKHOLE_FLAGS (zflags))
+    type = STATIC_IPV4_BLACKHOLE;
+  else if (gate)
     type = STATIC_IPV4_GATEWAY;
   else if (ifname)
     type = STATIC_IPV4_IFNAME;
   else
-    type = STATIC_IPV4_BLACKHOLE;
+    return -1;
 
   /* Do nothing if there is a same static route.  */
   for (si = rn->info; si; si = si->next)
@@ -2156,7 +2158,7 @@ static_add_ipv4 (struct prefix *p, struct in_addr *gate, const char *ifname,
 
   si->type = type;
   si->distance = distance;
-  si->flags = flags;
+  si->zflags = zflags;
 
   if (gate)
     si->gate.ipv4 = *gate;
@@ -2345,6 +2347,7 @@ rib_add_ipv6 (int type, int flags, struct prefix_ipv6 *p,
   rib->type = type;
   rib->distance = distance;
   rib->flags = flags;
+  rib->zflags = flags >> 8;
   rib->metric = metric;
   rib->table = vrf_id;
   rib->nexthop_num = 0;
@@ -2538,6 +2541,9 @@ static_install_ipv6 (struct prefix *p, struct static_ipv6 *si)
 	case STATIC_IPV6_GATEWAY_IFNAME:
 	  nexthop_ipv6_ifname_add (rib, &si->ipv6, si->ifname);
 	  break;
+	case STATIC_IPV6_BLACKHOLE:
+	  nexthop_blackhole_add (rib);
+	  break;
 	}
       rib_queue_add (&zebrad, rn);
     }
@@ -2562,10 +2568,13 @@ static_install_ipv6 (struct prefix *p, struct static_ipv6 *si)
 	case STATIC_IPV6_GATEWAY_IFNAME:
 	  nexthop_ipv6_ifname_add (rib, &si->ipv6, si->ifname);
 	  break;
+	case STATIC_IPV6_BLACKHOLE:
+	  nexthop_blackhole_add (rib);
+	  break;
 	}
 
       /* Save the flags of this static routes (reject, blackhole) */
-      rib->flags = si->flags;
+      rib->zflags = si->zflags;
 
       /* Link this rib to the tree. */
       rib_addnode (rn, rib);
@@ -2588,6 +2597,9 @@ static_ipv6_nexthop_same (struct nexthop *nexthop, struct static_ipv6 *si)
       && IPV6_ADDR_SAME (&nexthop->gate.ipv6, &si->ipv6)
       && strcmp (nexthop->ifname, si->ifname) == 0)
     return 1;
+  if (nexthop->type == NEXTHOP_TYPE_BLACKHOLE
+      && si->type == STATIC_IPV6_BLACKHOLE)
+    return 1;
   return 0;
 }
 
@@ -2656,7 +2668,7 @@ static_uninstall_ipv6 (struct prefix *p, struct static_ipv6 *si)
 /* Add static route into static route configuration. */
 int
 static_add_ipv6 (struct prefix *p, u_char type, struct in6_addr *gate,
-		 const char *ifname, u_char flags, u_char distance,
+		 const char *ifname, unsigned zflags, u_char distance,
 		 u_int32_t vrf_id)
 {
   struct route_node *rn;
@@ -2699,7 +2711,7 @@ static_add_ipv6 (struct prefix *p, u_char type, struct in6_addr *gate,
 
   si->type = type;
   si->distance = distance;
-  si->flags = flags;
+  si->zflags = zflags;
 
   switch (type)
     {
@@ -2713,6 +2725,8 @@ static_add_ipv6 (struct prefix *p, u_char type, struct in6_addr *gate,
       si->ipv6 = *gate;
       si->ifname = XSTRDUP (0, ifname);
       break;
+    case STATIC_IPV6_BLACKHOLE:
+      break;
     }
 
   /* Add new static route information to the tree with sort by