diff options
Diffstat (limited to 'nest')
| -rw-r--r-- | nest/bird.h | 2 | ||||
| -rw-r--r-- | nest/proto.c | 28 | ||||
| -rw-r--r-- | nest/protocol.h | 7 |
3 files changed, 35 insertions, 2 deletions
diff --git a/nest/bird.h b/nest/bird.h index 597e205..b35cd31 100644 --- a/nest/bird.h +++ b/nest/bird.h @@ -13,4 +13,6 @@ #include "lib/birdlib.h" #include "lib/ip.h" +extern int shutting_down; /* The daemon is shutting down */ + #endif diff --git a/nest/proto.c b/nest/proto.c index 76422e3..f96d37d 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -28,6 +28,8 @@ static list inactive_proto_list; static list initial_proto_list; static list flush_proto_list; +static int proto_shutdown_counter; + static event *proto_flush_event; static char *p_states[] = { "DOWN", "START", "UP", "STOP" }; @@ -178,7 +180,7 @@ proto_rethink_goal(struct proto *p) static void proto_set_goal(struct proto *p, unsigned goal) { - if (p->disabled) + if (p->disabled || shutting_down) goal = FS_HUNGRY; p->core_goal = goal; proto_rethink_goal(p); @@ -195,6 +197,25 @@ protos_start(void) } void +protos_shutdown(void) +{ + struct proto *p, *n; + + debug("Protocol shutdown\n"); + WALK_LIST_DELSAFE(p, n, inactive_proto_list) + if (p->core_state != FS_HUNGRY || p->proto_state != PS_DOWN) + { + proto_shutdown_counter++; + proto_set_goal(p, FS_HUNGRY); + } + WALK_LIST_DELSAFE(p, n, proto_list) + { + proto_shutdown_counter++; + proto_set_goal(p, FS_HUNGRY); + } +} + +void protos_dump_all(void) { struct proto *p; @@ -235,6 +256,8 @@ static void proto_fell_down(struct proto *p) { DBG("Protocol %s down\n", p->name); + if (!--proto_shutdown_counter) + protos_shutdown_notify(); proto_rethink_goal(p); } @@ -291,6 +314,7 @@ proto_notify_state(struct proto *p, unsigned ps) cs = FS_FLUSHING; ev_schedule(proto_flush_event); } + break; default: error: bug("Invalid state transition for %s from %s/%s to */%s", p->name, c_states[cs], p_states[ops], p_states[ps]); @@ -313,6 +337,6 @@ proto_flush_all(void *unused) p->pool = NULL; p->core_state = FS_HUNGRY; proto_relink(p); - proto_rethink_goal(p); + proto_fell_down(p); } } diff --git a/nest/protocol.h b/nest/protocol.h index f6facea..8a27350 100644 --- a/nest/protocol.h +++ b/nest/protocol.h @@ -46,6 +46,7 @@ void protos_postconfig(struct config *); void protos_commit(struct config *); void protos_start(void); void protos_dump_all(void); +void protos_shutdown(void); extern list protocol_list; @@ -188,4 +189,10 @@ void proto_notify_state(struct proto *p, unsigned state); extern struct proto_config *cf_dev_proto; +/* + * Callback to sysdep code when shutdown is finished + */ + +void protos_shutdown_notify(void); + #endif |