From e87080fd08979fb477b94b2d7cceb275bbb1f503 Mon Sep 17 00:00:00 2001
From: Katerina Kubecova <katerina.kubecova@nic.cz>
Date: Thu, 20 Jun 2024 11:11:06 +0200
Subject: [PATCH] mrt: mrt looks working both period and from cli

mrt: mrt looks working both period and from cli

fixup

fixup
---
 configure.ac        | 1 -
 lib/lockfree.c      | 2 --
 nest/proto.c        | 5 +----
 nest/rt-export.c    | 3 ---
 proto/bgp/attrs.c   | 1 -
 proto/bgp/packets.c | 1 -
 proto/mrt/mrt.c     | 5 ++---
 7 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index c58418cd..9153d575 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,7 +308,6 @@ if test "$enable_mpls_kernel" != no ; then
   fi
 fi
 
-# temporarily removed "mrt" from all_protocols to speed up 3.0-alpha1 release
 all_protocols="aggregator bfd babel bgp l3vpn ospf pipe radv rip rpki static mrt"
 all_protocols=`echo $all_protocols | sed 's/ /,/g'`
 
diff --git a/lib/lockfree.c b/lib/lockfree.c
index e45f7185..6f8e66b9 100644
--- a/lib/lockfree.c
+++ b/lib/lockfree.c
@@ -219,7 +219,6 @@ void lfjour_release(struct lfjour_recipient *r)
 void
 lfjour_announce_now(struct lfjour *j)
 {
-  log("announce now %i", j);
   ASSERT_DIE(birdloop_inside(j->loop));
   settle_cancel(&j->announce_timer);
   ev_postpone(&j->announce_kick_event);
@@ -227,7 +226,6 @@ lfjour_announce_now(struct lfjour *j)
   if (EMPTY_TLIST(lfjour_recipient, &j->recipients))
     return lfjour_schedule_cleanup(j);
 
-  log("walk recipient list");
   WALK_TLIST(lfjour_recipient, r, &j->recipients)
     if (r->event)
       ev_send(r->target, r->event);
diff --git a/nest/proto.c b/nest/proto.c
index cb4ccc42..0cf27952 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1252,7 +1252,6 @@ proto_init(struct proto_config *c, struct proto *after)
 
   PD(p, "Initializing%s", p->disabled ? " [disabled]" : "");
 
-  log("try to change state");
   p->id = hmap_first_zero(proto_attributes->proto_id_maker);
   hmap_set(proto_attributes->proto_id_maker, p->id);
   if (p->id >= proto_attributes->length)
@@ -1977,7 +1976,7 @@ protos_build(void)
   proto_pool = rp_new(&root_pool, the_bird_domain.the_bird, "Protocols");
 
   init_proto_journal();
-  create_dummy_recipient();
+  //create_dummy_recipient();
   protos_build_gen();
 }
 
@@ -2277,7 +2276,6 @@ proto_notify_state(struct proto *p, uint state)
   if (state == ps)
     return;
 
-  log("try to change state");
   int old_state = p->proto_state;
   p->proto_state = state;
   p->last_state_change = current_time();
@@ -2779,7 +2777,6 @@ proto_iterate_named(struct symbol *sym, struct protocol *proto, struct proto *ol
 }
 
 
-
 void
 protos_attr_field_init(void)
 {
diff --git a/nest/rt-export.c b/nest/rt-export.c
index a237c666..252c3d73 100644
--- a/nest/rt-export.c
+++ b/nest/rt-export.c
@@ -340,8 +340,6 @@ rtex_export_subscribe(struct rt_exporter *e, struct rt_export_request *r)
 {
   rt_export_change_state(r, BIT32_ALL(TES_DOWN), TES_FEEDING);
 
-  log("subscribe e=%p r=%p", e, r);
-
   ASSERT_DIE(r->pool);
 
   rt_feeder_subscribe(e, &r->feeder);
@@ -359,7 +357,6 @@ rtex_export_subscribe(struct rt_exporter *e, struct rt_export_request *r)
 void
 rtex_export_unsubscribe(struct rt_export_request *r)
 {
-  log("unsubscribe r=%p", r);
   rt_feeder_unsubscribe(&r->feeder);
 
   if (r->cur)
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 230fb8ed..5413f00b 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -80,7 +80,6 @@ static union bgp_attr_desc bgp_attr_table[];
 static inline const union bgp_attr_desc *bgp_find_attr_desc(eattr *a)
 {
   const struct ea_class *class = ea_class_find(a->id);
-  log("eattr %i %i, class %i %s, class min = %i, class max = %i", a, a->id, class, class->name, &bgp_attr_table[0].class, &bgp_attr_table[BGP_ATTR_MAX].class );
 
   if ((class < &bgp_attr_table[0].class) || (class >= &bgp_attr_table[BGP_ATTR_MAX].class))
     return NULL;
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index d5d29516..35e59e1a 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -3429,7 +3429,6 @@ bgp_rx_packet(struct bgp_conn *conn, byte *pkt, uint len)
   conn->bgp->stats.rx_messages++;
   conn->bgp->stats.rx_bytes += len;
 
-  log("conn->bgp->p.mrtdump %i, MD_MESSAGES %i", conn->bgp->p.mrtdump, MD_MESSAGES);
   if (conn->bgp->p.mrtdump & MD_MESSAGES)
     bgp_dump_message(conn, pkt, len);
 
diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c
index fc1914d5..d8645910 100644
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@ -639,7 +639,7 @@ mrt_table_dump_step(struct mrt_table_dump_state *s)
 
     s->table_open = 1;
 
-  step:
+  step: ;
     struct rt_export_feeder feeder = (struct rt_export_feeder) {
       .name = "cli.feeder",
     };
@@ -741,12 +741,11 @@ mrt_dump_cont(struct cli *c)
   c->rover = NULL;
 }
 
-static int
+void
 mrt_dump_cleanup(struct cli *c)
 {
   mrt_table_dump_free(c->rover);
   c->rover = NULL;
-  return 0;
 }
 
 void