diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-11-04 10:46:24 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-11-04 10:46:24 +0000 |
| commit | bb54d62056cb3f77d73a95dad724fd095cdcd0b2 (patch) | |
| tree | 9dfdf5120bdc16020bae9082e9ab1c22332d643e /usr.sbin/ospfd | |
| parent | ec401e892fd44ba50870a3927d327ad6d9a9874d (diff) | |
Kill spf_timer in struct ospfd_conf. There is no need for two event structs
just use ev for the spf_timer -- ev is unused in the RDE.
Diffstat (limited to 'usr.sbin/ospfd')
| -rw-r--r-- | usr.sbin/ospfd/ospfd.h | 3 | ||||
| -rw-r--r-- | usr.sbin/ospfd/rde.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ospfd/rde_spf.c | 8 |
3 files changed, 7 insertions, 8 deletions
diff --git a/usr.sbin/ospfd/ospfd.h b/usr.sbin/ospfd/ospfd.h index abc56df36ad..1b84f0573b6 100644 --- a/usr.sbin/ospfd/ospfd.h +++ b/usr.sbin/ospfd/ospfd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfd.h,v 1.38 2005/10/18 09:36:21 claudio Exp $ */ +/* $OpenBSD: ospfd.h,v 1.39 2005/11/04 10:46:23 claudio Exp $ */ /* * Copyright (c) 2004 Esben Norby <norby@openbsd.org> @@ -339,7 +339,6 @@ enum { struct ospfd_conf { struct event ev; - struct event spf_timer; struct in_addr rtr_id; struct lsa_tree lsa_tree; LIST_HEAD(, area) area_list; diff --git a/usr.sbin/ospfd/rde.c b/usr.sbin/ospfd/rde.c index 357720229b5..8d223f92992 100644 --- a/usr.sbin/ospfd/rde.c +++ b/usr.sbin/ospfd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.32 2005/11/04 10:38:03 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.33 2005/11/04 10:46:23 claudio Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -156,7 +156,7 @@ rde(struct ospfd_conf *xconf, int pipe_parent2rde[2], int pipe_ospfe2rde[2], ibuf_main->handler, ibuf_main); event_add(&ibuf_main->ev, NULL); - evtimer_set(&rdeconf->spf_timer, spf_timer, rdeconf); + evtimer_set(&rdeconf->ev, spf_timer, rdeconf); cand_list_init(); rt_init(); diff --git a/usr.sbin/ospfd/rde_spf.c b/usr.sbin/ospfd/rde_spf.c index c961c86a087..53149a97d81 100644 --- a/usr.sbin/ospfd/rde_spf.c +++ b/usr.sbin/ospfd/rde_spf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_spf.c,v 1.33 2005/09/01 19:09:34 claudio Exp $ */ +/* $OpenBSD: rde_spf.c,v 1.34 2005/11/04 10:46:23 claudio Exp $ */ /* * Copyright (c) 2005 Esben Norby <norby@openbsd.org> @@ -581,7 +581,7 @@ start_spf_timer(void) timerclear(&tv); tv.tv_sec = rdeconf->spf_delay; rdeconf->spf_state = SPF_DELAY; - return (evtimer_add(&rdeconf->spf_timer, &tv)); + return (evtimer_add(&rdeconf->ev, &tv)); case SPF_DELAY: /* ignore */ break; @@ -602,7 +602,7 @@ start_spf_timer(void) int stop_spf_timer(struct ospfd_conf *conf) { - return (evtimer_del(&conf->spf_timer)); + return (evtimer_del(&conf->ev)); } int @@ -616,7 +616,7 @@ start_spf_holdtimer(struct ospfd_conf *conf) tv.tv_sec = conf->spf_hold_time; conf->spf_state = SPF_HOLD; log_debug("spf_start_holdtimer: DELAY -> HOLD"); - return (evtimer_add(&conf->spf_timer, &tv)); + return (evtimer_add(&conf->ev, &tv)); case SPF_IDLE: case SPF_HOLD: case SPF_HOLDQUEUE: |