diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-12-29 13:58:50 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-12-29 13:58:50 +0000 |
| commit | 84aaee29a4fc74e7fac0287ba7c8154e82765daa (patch) | |
| tree | 8dbcb8e838020daae5c0357e271d9fd58979bae6 /usr.sbin/ospfd | |
| parent | 6d7fe3cf8a828561fe2bde07e0c06d8d9ddf1f10 (diff) | |
More correct cleanup on exit. OK norby@
Diffstat (limited to 'usr.sbin/ospfd')
| -rw-r--r-- | usr.sbin/ospfd/ospfd.c | 11 | ||||
| -rw-r--r-- | usr.sbin/ospfd/rde.c | 35 |
2 files changed, 41 insertions, 5 deletions
diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c index 8a5f938796f..174782bc31a 100644 --- a/usr.sbin/ospfd/ospfd.c +++ b/usr.sbin/ospfd/ospfd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfd.c,v 1.24 2005/10/18 15:40:36 claudio Exp $ */ +/* $OpenBSD: ospfd.c,v 1.25 2005/12/29 13:58:49 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -250,7 +250,8 @@ main(int argc, char *argv[]) void ospfd_shutdown(void) { - pid_t pid; + struct area *a; + pid_t pid; if (ospfe_pid) kill(ospfe_pid, SIGTERM); @@ -258,6 +259,11 @@ ospfd_shutdown(void) if (rde_pid) kill(rde_pid, SIGTERM); + while ((a = LIST_FIRST(&conf->area_list)) != NULL) { + LIST_REMOVE(a, entry); + area_del(a); + } + control_cleanup(); kr_shutdown(); @@ -271,6 +277,7 @@ ospfd_shutdown(void) free(ibuf_ospfe); msgbuf_clear(&ibuf_rde->w); free(ibuf_rde); + free(conf); log_info("terminating"); exit(0); diff --git a/usr.sbin/ospfd/rde.c b/usr.sbin/ospfd/rde.c index b9c12a7850e..63ad1e9a7ff 100644 --- a/usr.sbin/ospfd/rde.c +++ b/usr.sbin/ospfd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.34 2005/12/05 13:18:25 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.35 2005/12/29 13:58:49 claudio Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -46,6 +46,7 @@ void rde_dispatch_parent(int, short, void *); void rde_send_summary(pid_t); void rde_send_summary_area(struct area *, pid_t); void rde_nbr_init(u_int32_t); +void rde_nbr_free(void); struct rde_nbr *rde_nbr_find(u_int32_t); struct rde_nbr *rde_nbr_new(u_int32_t, struct rde_nbr *); void rde_nbr_del(struct rde_nbr *); @@ -59,6 +60,7 @@ int rde_redistribute(struct kroute *); void rde_update_redistribute(int); struct lsa *rde_asext_get(struct kroute *); struct lsa *rde_asext_put(struct kroute *); +void rde_asext_free(void); struct lsa *orig_asext_lsa(struct kroute *, u_int16_t); struct lsa *orig_sum_lsa(struct rt_node *, u_int8_t); @@ -171,16 +173,24 @@ rde(struct ospfd_conf *xconf, int pipe_parent2rde[2], int pipe_ospfe2rde[2], void rde_shutdown(void) { + struct area *a; + stop_spf_timer(rdeconf); cand_list_clr(); rt_clear(); - msgbuf_write(&ibuf_ospfe->w); + while ((a = LIST_FIRST(&rdeconf->area_list)) != NULL) { + LIST_REMOVE(a, entry); + area_del(a); + } + rde_nbr_free(); + rde_asext_free(); + msgbuf_clear(&ibuf_ospfe->w); free(ibuf_ospfe); - msgbuf_write(&ibuf_main->w); msgbuf_clear(&ibuf_main->w); free(ibuf_main); + free(rdeconf); log_info("route decision engine exiting"); _exit(0); @@ -754,6 +764,13 @@ rde_nbr_init(u_int32_t hashsize) LIST_INSERT_HEAD(head, nbrself, hash); } +void +rde_nbr_free(void) +{ + free(nbrself); + free(rdenbrtable.hashtbl); +} + struct rde_nbr * rde_nbr_find(u_int32_t peerid) { @@ -1029,6 +1046,18 @@ rde_asext_put(struct kroute *kr) return (NULL); } +void +rde_asext_free(void) +{ + struct rde_asext *ae; + + while ((ae = LIST_FIRST(&rde_asext_list)) != NULL) { + LIST_REMOVE(ae, entry); + free(ae); + } +} + + /* * summary LSA stuff */ |