WIP mrtload: loading routes and destroing data when state of peer changed to Idle

diff --git a/nest/protocol.h b/nest/protocol.h
index 5e276b5fc285b8636c324984e7de399ae81e6d2c..241e908967bd8e754cae350102a5962dc404e0ca 100644 (file)
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -661,6 +661,7 @@ static inline void rte_update(struct proto *p, const net_addr *n, rte *new) { rt
 static inline void
 rte_update3(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
 {
+  log("rte_update3 src %x", src);
   if (c->in_table && !rte_update_in(c, n, new, src))
     return;
 

diff --git a/proto/mrt/mrt_load.c b/proto/mrt/mrt_load.c
index 7a36a611aa2645278eb68821359928e8b505a721..fae9ead0b341e0c9224f1ecf6d4dcc3817a73867 100644 (file)
--- a/proto/mrt/mrt_load.c
+++ b/proto/mrt/mrt_load.c
@@ -41,10 +41,13 @@ void
 mrtload_ip(FILE *fp, u64 *remains, ip_addr *addr, bool is_ip6)
 {
   if (is_ip6)
+  {
     for (int i = 0; i < 4; i++)
       addr->addr[i] = mrtload_four_octet(fp, remains);
+  }
   else
   {
+    log("is 4");
     addr->addr[0] = addr->addr[1] = addr->addr[2] = 0;
     addr->addr[3] = mrtload_four_octet(fp, remains);
   }
@@ -81,10 +84,12 @@ mrt_parse_error(struct bgp_parse_state * ps UNUSED, uint e UNUSED)
                      Figure 12: BGP4MP_MESSAGE Subtype
 */
 struct mrtload_route_ctx *
-mrt_parse_bgp_message(FILE *fp, u64 *remains, bool as4, struct mrtload_proto *p)
+mrt_parse_bgp_message(FILE *fp, u64 *remains, bool as4, bool insert_hash, struct mrtload_proto *p)
 {
-  u64 peer_as, local_as;
-  ip_addr remote_ip, local_ip;
+  u64 peer_as;
+  u64 local_as;
+  ip_addr remote_ip;
+  ip_addr local_ip;
 
   if (as4)
   {
@@ -95,23 +100,32 @@ mrt_parse_bgp_message(FILE *fp, u64 *remains, bool as4, struct mrtload_proto *p)
     peer_as = mrtload_two_octet(fp, remains);
     local_as = mrtload_two_octet(fp, remains);
   }
-  int is_internal = peer_as == local_as;
+  int is_internal = (peer_as == local_as);
 
   int interface_id = mrtload_two_octet(fp, remains);
   int addr_fam = mrtload_two_octet(fp, remains);
 
-  log("peer as %i", peer_as);
+  log("interface id %i, addr_fam %i", interface_id, addr_fam);
 
   mrtload_ip(fp, remains, &remote_ip, addr_fam == 2);
   mrtload_ip(fp, remains, &local_ip, addr_fam == 2);
 
+  log("remote_ip %I, local_ip %I", remote_ip, local_ip);
+  log("as; %x %x",peer_as, local_as );
   struct mrtload_route_ctx *route_attrs = HASH_FIND(p->ctx_hash, MRTLOAD_CTX, peer_as, local_as, remote_ip, local_ip);
-  if (!route_attrs)
+  log("log found? %x", route_attrs);
+  if (!route_attrs && insert_hash)
   {
+    log("inserting");
     route_attrs = (struct mrtload_route_ctx *) mb_allocz(p->ctx_pool, sizeof(struct mrtload_route_ctx));
+ 
+    route_attrs->src = rt_get_source(&p->p, p->source_cnt);
+    rt_lock_source(route_attrs->src);
+    p->source_cnt++;
+ 
     route_attrs->addr_fam = addr_fam;
     route_attrs->ctx.local_as = local_as;
-    route_attrs->ctx.local_as = peer_as;
+    route_attrs->ctx.remote_as = peer_as;
     route_attrs->ctx.local_ip = local_ip;
     route_attrs->ctx.remote_ip = remote_ip;
     route_attrs->ctx.is_internal = is_internal;
@@ -130,7 +144,6 @@ mrt_parse_bgp_message(FILE *fp, u64 *remains, bool as4, struct mrtload_proto *p)
 
     HASH_INSERT(p->ctx_hash, MRTLOAD_CTX, route_attrs);
   }
-  log("peer as %lx local as %lx interface %x add fam %i peer %I loc %I", peer_as, local_as, interface_id, addr_fam, route_attrs->ctx.remote_ip, route_attrs->ctx.local_ip);
   return route_attrs;
 }
 
@@ -138,13 +151,13 @@ void
 mrt_parse_bgp4mp_change_state(FILE *fp, u64 *remains, bool as4, struct proto *P)
 {
   struct mrtload_proto *p = SKIP_BACK(struct mrtload_proto, p, P);
-  struct mrtload_route_ctx *ra = mrt_parse_bgp_message(fp, remains, as4, p);
+  struct mrtload_route_ctx *ra = mrt_parse_bgp_message(fp, remains, as4, false, p);
   int old_state = mrtload_two_octet(fp, remains);
   int new_state = mrtload_two_octet(fp, remains);
   log("old state %i new state %i", old_state, new_state);
 
-  log("new_state %i == BS_CLOSE && ra->addr_fam %i == p->channel->afi >> 16  %i", new_state, ra->addr_fam, p->channel->afi >> 16);
-  if (new_state == BS_CLOSE && ra->addr_fam == (int)(p->channel->afi >> 16))
+  log("new_state %i == BS_CLOSE && ra->addr_fam == p->channel->afi >> 16  %i", new_state, p->channel->afi >> 16);
+  if (new_state == 1 && ra && ra->addr_fam == (int)(p->channel->afi >> 16)) // state 1 - Idle (rfc 1771)
   {
     FIB_WALK(&p->channel->c.table->fib, net, n)
     {
@@ -152,9 +165,11 @@ mrt_parse_bgp4mp_change_state(FILE *fp, u64 *remains, bool as4, struct proto *P)
       while(e)
       {
         rte *next = e->next;
-        if (e->sender == &p->channel->c && e->src == P->main_source)
+        log("ra src %x e src %x", ra->src, e->src);
+        if (e->sender == &p->channel->c && e->src == ra->src)
         {
           rte_update2(&p->channel->c, e->net->n.addr, NULL, P->main_source);
+          log("removed");
         }
         e = next;
       }
@@ -178,7 +193,6 @@ mrt_get_channel_to_parse(struct bgp_parse_state *s UNUSED, u32 afi UNUSED)
   struct mrtload_proto *p = SKIP_BACK(struct mrtload_proto, p, s->p);
   s->channel = &p->channel->c;
   s->last_id = 0;
-  s->last_src = s->p->main_source;
   s->desc = p->channel->desc;
   s->channel->proto = s->p;
   channel_set_state(s->channel, CS_START);
@@ -196,7 +210,7 @@ static void
 mrt_parse_bgp4mp_message(FILE *fp, u64 *remains, bool as4, struct proto *P)
 {
   struct mrtload_proto *p = (void *) P;
-  struct mrtload_route_ctx *proto_attrs = mrt_parse_bgp_message(fp, remains, as4, p);
+  struct mrtload_route_ctx *proto_attrs = mrt_parse_bgp_message(fp, remains, true, as4, p);
   log("addr fam %x", proto_attrs->addr_fam);
 
   if (*remains < 19)
@@ -219,10 +233,6 @@ mrt_parse_bgp4mp_message(FILE *fp, u64 *remains, bool as4, struct proto *P)
   if (type != PKT_UPDATE)
     return;
 
-  /* This is usually done in proto_do_up, but the protocol will be used immediately */
-  P->main_source = rt_get_source(P, 0);
-  rt_lock_source(P->main_source);
-
   struct bgp_parse_state s = {
     .proto_name = P->name,
     .pool = lp_new(P->pool),
@@ -233,6 +243,7 @@ mrt_parse_bgp4mp_message(FILE *fp, u64 *remains, bool as4, struct proto *P)
     .is_mrt_parse = 1,
     .p = P,
     .as4_session = as4,
+    .last_src = proto_attrs->src,
     .desc = p->channel->desc, // desc is set later in bgp, but we need afi to compare
   };
 
@@ -274,7 +285,7 @@ mrt_parse_general_header(FILE *fp, struct proto *P)
   u64 remains = length;
 
   /* We do not load MRT_TABLE_DUMP_V2 type and MRT_BGP4MP_STATE_CHANGE_AS4. */
-  log("type %i subtype %i", type, subtype);
+  log("type %i subtype %i, timestamp %li", type, subtype, timestamp);
   if (type == MRT_BGP4MP)
   {
     switch (subtype)
@@ -372,6 +383,7 @@ mrtload_start(struct proto *P)
   p->channel->c.table = cf->table_cf->table;
   p->addr_fam = cf->table_cf->table->addr_type;
   p->ctx_pool = rp_new(P->pool, "Mrtload route ctx");
+  p->source_cnt = 0;
   HASH_INIT(p->ctx_hash, p->ctx_pool, 10);
 
   ASSERT_DIE(cf->table_cf->table);
@@ -400,6 +412,19 @@ static int
 mrtload_shutdown(struct proto *P)
 {
   struct mrtload_proto *p = (void *) P;
+
+  FIB_WALK(&p->channel->c.table->fib, net, n)
+  {
+    rte *e = n->routes;
+    while(e)
+    {
+      rte *next = e->next;
+      rte_update2(&p->channel->c, e->net->n.addr, NULL, P->main_source);
+      e = next;
+    }
+  }
+  FIB_WALK_END;
+
   proto_notify_state(&p->p, PS_DOWN);
   return PS_DOWN;
 }

diff --git a/proto/mrt/mrt_load.h b/proto/mrt/mrt_load.h
index dfa6f2ab4140fbe43196784f5f865d6c631db61a..53ebabb250c1fccc75c6b7d7ddcbf4d949976ee2 100644 (file)
--- a/proto/mrt/mrt_load.h
+++ b/proto/mrt/mrt_load.h
@@ -12,7 +12,7 @@
 #define MRTLOAD_CTX_KEY(n)             n->ctx.remote_as, n->ctx.local_as, \
   n->ctx.remote_ip, n->ctx.local_ip
 #define MRTLOAD_CTX_NEXT(n)            n->next
-#define MRTLOAD_CTX_EQ(p1, n1, r_ip, l_ip, p2, n2, r_ip1, l_ip1)       p1 == p2 && n1 == n2 && ipa_equal(r_ip, r_ip1) + ipa_equal(l_ip, l_ip1)
+#define MRTLOAD_CTX_EQ(p1, n1, r_ip, l_ip, p2, n2, r_ip1, l_ip1)       ipa_equal(l_ip, l_ip1) && ipa_equal(r_ip, r_ip1) && n1 == n2 && p1 == p2
 #define MRTLOAD_CTX_FN(pas, las, r_ip, l_ip)    u64_hash(pas) + u64_hash(las) + ipa_hash(r_ip) + ipa_hash(l_ip)
 #define MRTLOAD_CTX_REHASH             mrtload_ctx_rehash
 #define MRTLOAD_CTX_PARAMS             /2, *2, 1, 1, 8, 20
@@ -40,6 +40,7 @@ struct mrtload_config {
 struct mrtload_route_ctx {
   struct bgp_route_ctx ctx;
   int addr_fam;
+  struct rte_src *src;
   struct mrtload_route_ctx *next;
 };
 
@@ -51,6 +52,7 @@ struct mrtload_proto {
   };
 
   int addr_fam;
+  u64 source_cnt;
   struct mrt_table_dump_state *table_dump;
   struct bgp_channel *channel;
   pool *ctx_pool;