mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-10 05:08:42 +00:00
Code Releases Activity

Protocol limit restart/down must be callable from protocol context

Browse Source
This commit is contained in:
Maria Matejka 2022-02-02 15:36:22 +01:00
parent d262695d4e
commit 216bcb7c68
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nest/proto.c
View File

@ -32,7 +32,6 @@ struct protocol *class_to_protocol[PROTOCOL__MAX];
#define CD(c, msg, args...) ({ if (c->debug & D_STATES) log(L_TRACE "%s.%s: " msg, c->proto->name, c->name ?: "?", ## args); })
#define PD(p, msg, args...) ({ if (p->debug & D_STATES) log(L_TRACE "%s: " msg, p->name, ## args); })
static timer *proto_shutdown_timer;
static timer *gr_wait_timer;
#define GRS_NONE 0
@ -49,7 +48,6 @@ static char *c_states[] = { "DOWN", "START", "UP", "STOP", "RESTART" };
extern struct protocol proto_unix_iface;
static void channel_aux_request_refeed(struct channel_aux_table *cat);
static void proto_shutdown_loop(timer *);
static void proto_rethink_goal(struct proto *p);
static char *proto_state_name(struct proto *p);
static void channel_init_limit(struct channel *c, struct limit *l, int dir, struct channel_limit *cf);
@ -2202,8 +2200,6 @@ protos_build(void)
#endif
proto_pool = rp_new(&root_pool, &main_birdloop, "Protocols");
proto_shutdown_timer = tm_new(proto_pool);
proto_shutdown_timer->hook = proto_shutdown_loop;
}
@ -2211,7 +2207,7 @@ protos_build(void)
int proto_restart;
static void
proto_shutdown_loop(timer *t UNUSED)
proto_shutdown_loop(void *data UNUSED)
{
struct proto *p, *p_next;
@ -2230,6 +2226,11 @@ proto_shutdown_loop(timer *t UNUSED)
}
}
static event proto_schedule_down_event = {
.hook = proto_shutdown_loop,
.list = &global_event_list,
};
static inline void
proto_schedule_down(struct proto *p, byte restart, byte code)
{
@ -2242,7 +2243,8 @@ proto_schedule_down(struct proto *p, byte restart, byte code)
p->down_sched = restart ? PDS_RESTART : PDS_DISABLE;
p->down_code = code;
tm_start_max(proto_shutdown_timer, restart ? 250 MS : 0);
ev_send_self(&proto_schedule_down_event);
}
/**

10
proto/bgp/bgp.c
View File

@ -1273,6 +1273,16 @@ bgp_incoming_connection(sock *sk, uint dummy UNUSED)
return 0;
}
if (p->p.loop == &main_birdloop)
{
/* Protocol is down for whatever reason. No need for locking. */
BGP_TRACE(D_EVENTS, "Incoming connection from %I%J (port %d) rejected (protocol is down)",
sk->daddr, ipa_is_link_local(sk->daddr) ? sk->iface : NULL,
sk->dport);
rfree(sk);
return 0;
}
BGP_ENTER(p);
/*