mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-12-22 01:31:55 +00:00
protocol->startup_counter no longer exists.
This commit is contained in:
parent
aa8761de94
commit
54aaa89ada
11
nest/proto.c
11
nest/proto.c
@ -199,15 +199,6 @@ proto_init(struct proto_config *c)
|
||||
q->core_state = FS_HUNGRY;
|
||||
proto_enqueue(&initial_proto_list, q);
|
||||
add_tail(&proto_list, &q->glob_node);
|
||||
/*
|
||||
* HACK ALERT! In case of multiple kernel routing tables,
|
||||
* the kernel syncer acts as multiple protocols which cooperate
|
||||
* with each other. In order to speed up their initialization,
|
||||
* we need to know when we're initializing the last one, hence
|
||||
* the startup counter.
|
||||
*/
|
||||
if (!q->disabled)
|
||||
p->startup_counter++;
|
||||
return q;
|
||||
}
|
||||
|
||||
@ -310,8 +301,6 @@ proto_rethink_goal(struct proto *p)
|
||||
if (p->core_state == FS_HUNGRY && p->proto_state == PS_DOWN)
|
||||
{
|
||||
DBG("Kicking %s up\n", p->name);
|
||||
if (q->startup_counter > 0) /* FIXME: Kill the startup counter hack! */
|
||||
q->startup_counter--;
|
||||
proto_init_instance(p);
|
||||
proto_notify_state(p, (q->start ? q->start(p) : PS_UP));
|
||||
}
|
||||
|
@ -37,7 +37,6 @@ struct protocol {
|
||||
unsigned debug; /* Default debugging flags */
|
||||
int priority; /* Protocol priority (usually 0) */
|
||||
int name_counter; /* Counter for automatic name generation */
|
||||
int startup_counter; /* Number of instances waiting for initialization */
|
||||
|
||||
void (*preconfig)(struct protocol *, struct config *); /* Just before configuring */
|
||||
void (*postconfig)(struct proto_config *); /* After configuring each instance */
|
||||
|
Loading…
Reference in New Issue
Block a user