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

Partially fixup to protocol announce state -> announce later

Browse Source
This commit is contained in:
Maria Matejka 2024-10-16 15:44:21 +02:00
parent 56cd93b4ff
commit 951ab450ef
3 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
nest/proto.c
View File

@ -3023,9 +3023,18 @@ proto_announce_state_locked(struct proto_state_table_private* ts, struct proto *
ASSERT_DIE(p->id < ts->length_states); ASSERT_DIE(p->id < ts->length_states);
ea_list *old_attr = ts->states[p->id]; ea_list *old_attr = ts->states[p->id];
if (attr == old_attr)
{
/* Nothing has changed */
ea_free_later(attr);
return;
}
ts->states[p->id] = attr; ts->states[p->id] = attr;
p->ea_state = attr; ea_free_later(p->ea_state);
p->ea_state = attr ? ea_ref(attr) : NULL;
struct proto_pending_update *pupdate = SKIP_BACK(struct proto_pending_update, li, lfjour_push_prepare(&proto_state_table_pub.journal)); struct proto_pending_update *pupdate = SKIP_BACK(struct proto_pending_update, li, lfjour_push_prepare(&proto_state_table_pub.journal));
@ -3052,6 +3061,30 @@ proto_announce_state(struct proto *p, ea_list *attr)
proto_announce_state_locked(ts, p, attr); proto_announce_state_locked(ts, p, attr);
} }
struct proto_announce_state_deferred {
struct deferred_call dc;
struct proto *p;
};
static void proto_announce_state_deferred(struct deferred_call *dc)
{
SKIP_BACK_DECLARE(struct proto_announce_state_deferred, pasd, dc, dc);
proto_announce_state(pasd->p, pasd->p->ea_state);
}
void
proto_announce_state_later(struct proto *p, ea_list *attr)
{
ea_free_later(p->ea_state);
p->ea_state = ea_lookup(attr, 0, EALS_CUSTOM);
struct proto_announce_state_deferred pasd = {
.dc.hook = proto_announce_state_deferred,
.p = p,
};
defer_call(&pasd.dc, sizeof pasd);
}
ea_list * ea_list *
channel_get_state(int id) channel_get_state(int id)

1
nest/protocol.h
View File

@ -445,6 +445,7 @@ struct proto_pending_update {
void proto_announce_state_locked(struct proto_state_table_private *ts, struct proto *p, ea_list *attr); void proto_announce_state_locked(struct proto_state_table_private *ts, struct proto *p, ea_list *attr);
void proto_announce_state(struct proto *p, ea_list *attr); void proto_announce_state(struct proto *p, ea_list *attr);
void proto_announce_state_later(struct proto *p, ea_list *attr);
ea_list *channel_get_state(int id); ea_list *channel_get_state(int id);
ea_list *proto_get_state(int id); ea_list *proto_get_state(int id);
void proto_states_subscribe(struct lfjour_recipient *r); void proto_states_subscribe(struct lfjour_recipient *r);

5
proto/bgp/bgp.c
View File

@ -800,14 +800,13 @@ bgp_conn_enter_established_state(struct bgp_conn *conn)
#ifdef CONFIG_BMP #ifdef CONFIG_BMP
ea_list *ea_l = proto_get_state(p->p.id); ea_list *ea_l = p->p.ea_state;
ea_set_attr(&ea_l, EA_LITERAL_STORE_ADATA(&ea_bgp_local_open_msg, 0, conn->local_open_msg, conn->local_open_length)); ea_set_attr(&ea_l, EA_LITERAL_STORE_ADATA(&ea_bgp_local_open_msg, 0, conn->local_open_msg, conn->local_open_length));
ea_set_attr(&ea_l, EA_LITERAL_STORE_ADATA(&ea_bgp_remote_open_msg, 0, conn->remote_open_msg, conn->remote_open_length)); ea_set_attr(&ea_l, EA_LITERAL_STORE_ADATA(&ea_bgp_remote_open_msg, 0, conn->remote_open_msg, conn->remote_open_length));
ea_set_attr(&ea_l, EA_LITERAL_EMBEDDED(&ea_bgp_local_open_msg_len, 0, conn->local_open_length)); ea_set_attr(&ea_l, EA_LITERAL_EMBEDDED(&ea_bgp_local_open_msg_len, 0, conn->local_open_length));
ea_set_attr(&ea_l, EA_LITERAL_EMBEDDED(&ea_bgp_remote_open_msg_len, 0, conn->remote_open_length)); ea_set_attr(&ea_l, EA_LITERAL_EMBEDDED(&ea_bgp_remote_open_msg_len, 0, conn->remote_open_length));
ea_l = ea_lookup(ea_l, 0, EALS_CUSTOM);
proto_announce_state(&p->p, ea_l); proto_announce_state_later(&p->p, ea_l);
#endif #endif
} }