mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

mrt: mrt looks working both period and from cli

Browse Source 
mrt: mrt looks working both period and from cli

fixup

fixup
This commit is contained in:
Katerina Kubecova 2024-06-20 11:11:06 +02:00
parent e0fd481b98
commit e87080fd08
7 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -308,7 +308,6 @@ if test "$enable_mpls_kernel" != no ; then
fi fi
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="aggregator bfd babel bgp l3vpn ospf pipe radv rip rpki static mrt"
all_protocols=`echo $all_protocols | sed 's/ /,/g'` all_protocols=`echo $all_protocols | sed 's/ /,/g'`

2
lib/lockfree.c
View File

@ -219,7 +219,6 @@ void lfjour_release(struct lfjour_recipient *r)
void void
lfjour_announce_now(struct lfjour *j) lfjour_announce_now(struct lfjour *j)
{ {
log("announce now %i", j);
ASSERT_DIE(birdloop_inside(j->loop)); ASSERT_DIE(birdloop_inside(j->loop));
settle_cancel(&j->announce_timer); settle_cancel(&j->announce_timer);
ev_postpone(&j->announce_kick_event); ev_postpone(&j->announce_kick_event);
@ -227,7 +226,6 @@ lfjour_announce_now(struct lfjour *j)
if (EMPTY_TLIST(lfjour_recipient, &j->recipients)) if (EMPTY_TLIST(lfjour_recipient, &j->recipients))
return lfjour_schedule_cleanup(j); return lfjour_schedule_cleanup(j);
log("walk recipient list");
WALK_TLIST(lfjour_recipient, r, &j->recipients) WALK_TLIST(lfjour_recipient, r, &j->recipients)
if (r->event) if (r->event)
ev_send(r->target, r->event); ev_send(r->target, r->event);

5
nest/proto.c
View File

@ -1252,7 +1252,6 @@ proto_init(struct proto_config *c, struct proto *after)
PD(p, "Initializing%s", p->disabled ? " [disabled]" : ""); PD(p, "Initializing%s", p->disabled ? " [disabled]" : "");
log("try to change state");
p->id = hmap_first_zero(proto_attributes->proto_id_maker); p->id = hmap_first_zero(proto_attributes->proto_id_maker);
hmap_set(proto_attributes->proto_id_maker, p->id); hmap_set(proto_attributes->proto_id_maker, p->id);
if (p->id >= proto_attributes->length) 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"); proto_pool = rp_new(&root_pool, the_bird_domain.the_bird, "Protocols");
init_proto_journal(); init_proto_journal();
create_dummy_recipient(); //create_dummy_recipient();
protos_build_gen(); protos_build_gen();
} }
@ -2277,7 +2276,6 @@ proto_notify_state(struct proto *p, uint state)
if (state == ps) if (state == ps)
return; return;
log("try to change state");
int old_state = p->proto_state; int old_state = p->proto_state;
p->proto_state = state; p->proto_state = state;
p->last_state_change = current_time(); p->last_state_change = current_time();
@ -2779,7 +2777,6 @@ proto_iterate_named(struct symbol *sym, struct protocol *proto, struct proto *ol
} }
void void
protos_attr_field_init(void) protos_attr_field_init(void)
{ {

3
nest/rt-export.c
View File

@ -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); rt_export_change_state(r, BIT32_ALL(TES_DOWN), TES_FEEDING);
log("subscribe e=%p r=%p", e, r);
ASSERT_DIE(r->pool); ASSERT_DIE(r->pool);
rt_feeder_subscribe(e, &r->feeder); rt_feeder_subscribe(e, &r->feeder);
@ -359,7 +357,6 @@ rtex_export_subscribe(struct rt_exporter *e, struct rt_export_request *r)
void void
rtex_export_unsubscribe(struct rt_export_request *r) rtex_export_unsubscribe(struct rt_export_request *r)
{ {
log("unsubscribe r=%p", r);
rt_feeder_unsubscribe(&r->feeder); rt_feeder_unsubscribe(&r->feeder);
if (r->cur) if (r->cur)

1
proto/bgp/attrs.c
View File

@ -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) static inline const union bgp_attr_desc *bgp_find_attr_desc(eattr *a)
{ {
const struct ea_class *class = ea_class_find(a->id); 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)) if ((class < &bgp_attr_table[0].class) || (class >= &bgp_attr_table[BGP_ATTR_MAX].class))
return NULL; return NULL;

1
proto/bgp/packets.c
View File

@ -3429,7 +3429,6 @@ bgp_rx_packet(struct bgp_conn *conn, byte *pkt, uint len)
conn->bgp->stats.rx_messages++; conn->bgp->stats.rx_messages++;
conn->bgp->stats.rx_bytes += len; 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) if (conn->bgp->p.mrtdump & MD_MESSAGES)
bgp_dump_message(conn, pkt, len); bgp_dump_message(conn, pkt, len);

5
proto/mrt/mrt.c
View File

@ -639,7 +639,7 @@ mrt_table_dump_step(struct mrt_table_dump_state *s)
s->table_open = 1; s->table_open = 1;
step: step: ;
struct rt_export_feeder feeder = (struct rt_export_feeder) { struct rt_export_feeder feeder = (struct rt_export_feeder) {
.name = "cli.feeder", .name = "cli.feeder",
}; };
@ -741,12 +741,11 @@ mrt_dump_cont(struct cli *c)
c->rover = NULL; c->rover = NULL;
} }
static int void
mrt_dump_cleanup(struct cli *c) mrt_dump_cleanup(struct cli *c)
{ {
mrt_table_dump_free(c->rover); mrt_table_dump_free(c->rover);
c->rover = NULL; c->rover = NULL;
return 0;
} }
void void