Dropping the RTS_DUMMY temporary route storage.

Kernel route sync is done by other ways now and this code is not used
currently.

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 1c60e619c6864f5f7ebe873b32a7b6f6211b6b68..031cc7e1bc02c2bd1babd30fb567bf7aba0e15c5 100644 (file)
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -1640,7 +1640,7 @@ Common route attributes are:
 
        <tag><label id="rta-source"><m/enum/ source</tag>
        what protocol has told me about this route. Possible values:
-       <cf/RTS_DUMMY/, <cf/RTS_STATIC/, <cf/RTS_INHERIT/, <cf/RTS_DEVICE/,
+       <cf/RTS_STATIC/, <cf/RTS_INHERIT/, <cf/RTS_DEVICE/,
        <cf/RTS_STATIC_DEVICE/, <cf/RTS_REDIRECT/, <cf/RTS_RIP/, <cf/RTS_OSPF/,
        <cf/RTS_OSPF_IA/, <cf/RTS_OSPF_EXT1/, <cf/RTS_OSPF_EXT2/, <cf/RTS_BGP/,
        <cf/RTS_PIPE/, <cf/RTS_BABEL/.

diff --git a/filter/test.conf b/filter/test.conf
index 634816fd90471c6afd336612ee021e796de28cb1..714d6519b97378e8179f19e353f4714adf7f248b 100644 (file)
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -378,7 +378,6 @@ bt_test_suite(t_ip_set, "Testing sets of ip address");
 
 function t_enum()
 {
-       bt_assert(format(RTS_DUMMY)  = "(enum 30)0");
        bt_assert(format(RTS_STATIC) = "(enum 30)1");
        bt_assert(format(NET_IP4) = "(enum 36)1");
        bt_assert(format(NET_VPN6) = "(enum 36)4");

diff --git a/nest/config.Y b/nest/config.Y
index bd1157c640c83dd94fe94e8157c430d15191aebd..7074efc6113cacebf7751ed8a7fd0a2435222aa4 100644 (file)
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -80,7 +80,7 @@ CF_KEYWORDS(CHECK, LINK)
 /* For r_args_channel */
 CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4, VPN4_MC, VPN4_MPLS, VPN6, VPN6_MC, VPN6_MPLS, ROA4, ROA6, FLOW4, FLOW6, MPLS, PRI, SEC)
 
-CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,
+CF_ENUM(T_ENUM_RTS, RTS_, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,
        RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE, BABEL)
 CF_ENUM(T_ENUM_SCOPE, SCOPE_, HOST, LINK, SITE, ORGANIZATION, UNIVERSE, UNDEFINED)
 CF_ENUM(T_ENUM_RTD, RTD_, UNICAST, BLACKHOLE, UNREACHABLE, PROHIBIT)

diff --git a/nest/route.h b/nest/route.h
index a891779ff06eddfa4f3d94379f267f3cf7a7ab05..28980c7cbcdc3d8353fc66517a90812678e87cf0 100644 (file)
--- a/nest/route.h
+++ b/nest/route.h
@@ -443,7 +443,6 @@ typedef struct rta {
   struct nexthop nh;                   /* Next hop */
 } rta;
 
-#define RTS_DUMMY 0                    /* Dummy route to be removed soon */
 #define RTS_STATIC 1                   /* Normal static route */
 #define RTS_INHERIT 2                  /* Route inherited from kernel */
 #define RTS_DEVICE 3                   /* Device route */

diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 7cab13ea2b10daa844052690795b7579fb153281..e1a07c91247f7176c859086caeffbacd84d575b5 100644 (file)
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -61,7 +61,6 @@
 const adata null_adata;                /* adata of length 0 */
 
 const char * const rta_src_names[RTS_MAX] = {
-  [RTS_DUMMY]          = "",
   [RTS_STATIC]         = "static",
   [RTS_INHERIT]                = "inherit",
   [RTS_DEVICE]         = "device",
@@ -1259,7 +1258,7 @@ rta_do_cow(rta *o, linpool *lp)
 void
 rta_dump(rta *a)
 {
-  static char *rts[] = { "RTS_DUMMY", "RTS_STATIC", "RTS_INHERIT", "RTS_DEVICE",
+  static char *rts[] = { "", "RTS_STATIC", "RTS_INHERIT", "RTS_DEVICE",
                         "RTS_STAT_DEV", "RTS_REDIR", "RTS_RIP",
                         "RTS_OSPF", "RTS_OSPF_IA", "RTS_OSPF_EXT1",
                         "RTS_OSPF_EXT2", "RTS_BGP", "RTS_PIPE", "RTS_BABEL" };

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 5d1932c55e8affebd348571a29c13d37ad35fe3d..4da8aa783a525929c089b22c29b583cce402dfb0 100644 (file)
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -1360,33 +1360,12 @@ rte_update_unlock(void)
     lp_flush(rte_update_pool);
 }
 
-static inline void
-rte_hide_dummy_routes(net *net, rte **dummy)
-{
-  if (net->routes && net->routes->attrs->source == RTS_DUMMY)
-  {
-    *dummy = net->routes;
-    net->routes = (*dummy)->next;
-  }
-}
-
-static inline void
-rte_unhide_dummy_routes(net *net, rte **dummy)
-{
-  if (*dummy)
-  {
-    (*dummy)->next = net->routes;
-    net->routes = *dummy;
-  }
-}
-
 static void
 rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 {
   struct proto *p = c->proto;
   struct proto_stats *stats = &c->stats;
   const struct filter *filter = c->in_filter;
-  rte *dummy = NULL;
   net *nn;
 
   ASSERT(c->channel_state == CS_UP);
@@ -1465,9 +1444,7 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 
  recalc:
   /* And recalculate the best route */
-  rte_hide_dummy_routes(nn, &dummy);
   rte_recalculate(c, nn, new, src);
-  rte_unhide_dummy_routes(nn, &dummy);
 
   rte_update_unlock();
   return;

diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index 521a6633200a54abce635924f2e91eac02042cb4..66fb37414a14eb485f68817398ebce8479631c0b 100644 (file)
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -144,7 +144,7 @@ orta_compare(const struct ospf_proto *p, const orta *new, const orta *old)
 {
   int r;
 
-  if (old->type == RTS_DUMMY)
+  if (!old->type)
     return 1;
 
   /* Prefer intra-area to inter-area to externals */
@@ -195,7 +195,7 @@ orta_compare_asbr(const struct ospf_proto *p, const orta *new, const orta *old)
 {
   int r;
 
-  if (old->type == RTS_DUMMY)
+  if (!old->type)
     return 1;
 
   if (!p->rfc1583)
@@ -225,7 +225,7 @@ orta_compare_ext(const struct ospf_proto *p, const orta *new, const orta *old)
 {
   int r;
 
-  if (old->type == RTS_DUMMY)
+  if (!old->type)
     return 1;
 
   /* 16.4 (6a) - prefer routes with lower type */

diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index 235e2dd7a023ab9f603360512003e96cba86fdb5..c8eeda7dd2624d0e0a9a96ea625d935d95f9d0ab 100644 (file)
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -1272,8 +1272,6 @@ nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
 
   if (p->af == AF_MPLS)
     priority = 0;
-  else if (a->source == RTS_DUMMY)
-    priority = e->u.krt.metric;
   else if (KRT_CF->sys.metric)
     priority = KRT_CF->sys.metric;
   else if ((op != NL_OP_DELETE) && (ea = ea_find(eattrs, EA_KRT_METRIC)))