Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

protocol->startup_counter no longer exists.

Browse source
This commit is contained in:
Martin Mares 2000-01-18 10:42:45 +00:00
parent aa8761de94
commit 54aaa89ada
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nest/proto.c
View file

@ -199,15 +199,6 @@ proto_init(struct proto_config *c)
q->core_state = FS_HUNGRY; q->core_state = FS_HUNGRY;
proto_enqueue(&initial_proto_list, q); proto_enqueue(&initial_proto_list, q);
add_tail(&proto_list, &q->glob_node); 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; return q;
} }
@ -310,8 +301,6 @@ proto_rethink_goal(struct proto *p)
if (p->core_state == FS_HUNGRY && p->proto_state == PS_DOWN) if (p->core_state == FS_HUNGRY && p->proto_state == PS_DOWN)
{ {
DBG("Kicking %s up\n", p->name); 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_init_instance(p);
proto_notify_state(p, (q->start ? q->start(p) : PS_UP)); proto_notify_state(p, (q->start ? q->start(p) : PS_UP));
} }

1
nest/protocol.h
View file

@ -37,7 +37,6 @@ struct protocol {
unsigned debug; /* Default debugging flags */ unsigned debug; /* Default debugging flags */
int priority; /* Protocol priority (usually 0) */ int priority; /* Protocol priority (usually 0) */
int name_counter; /* Counter for automatic name generation */ 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 (*preconfig)(struct protocol *, struct config *); /* Just before configuring */
void (*postconfig)(struct proto_config *); /* After configuring each instance */ void (*postconfig)(struct proto_config *); /* After configuring each instance */