diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-11-28 17:43:20 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-12-07 13:54:59 +0100 |
| commit | a6f79ca57f0b4b296f67c2d063fd85a627b611b8 (patch) | |
| tree | e8164505077da6b3039d598b6b22b6a893dfccd6 /conf | |
| parent | 574b2324275d3292e98a8e329f791eb5c799f7f2 (diff) | |
Timers: Revert temporary names and remove old timer.h
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/conf.c | 12 | ||||
| -rw-r--r-- | conf/conf.h | 2 | ||||
| -rw-r--r-- | conf/flowspec.Y | 10 |
3 files changed, 7 insertions, 17 deletions
diff --git a/conf/conf.c b/conf/conf.c index c68ded7f..62477331 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -52,7 +52,7 @@ #include "lib/resource.h" #include "lib/string.h" #include "lib/event.h" -#include "sysdep/unix/timer.h" +#include "lib/timer.h" #include "conf/conf.h" #include "filter/filter.h" @@ -341,9 +341,9 @@ config_commit(struct config *c, int type, uint timeout) undo_available = 1; if (timeout) - tm2_start(config_timer, timeout S); + tm_start(config_timer, timeout S); else - tm2_stop(config_timer); + tm_stop(config_timer); if (configuring) { @@ -384,7 +384,7 @@ config_confirm(void) if (config_timer->expires == 0) return CONF_NOTHING; - tm2_stop(config_timer); + tm_stop(config_timer); return CONF_CONFIRM; } @@ -420,7 +420,7 @@ config_undo(void) return CONF_NOTHING; undo_available = 0; - tm2_stop(config_timer); + tm_stop(config_timer); if (configuring) { @@ -468,7 +468,7 @@ config_init(void) config_event = ev_new(&root_pool); config_event->hook = config_done; - config_timer = tm2_new(&root_pool); + config_timer = tm_new(&root_pool); config_timer->hook = config_timeout; } diff --git a/conf/conf.h b/conf/conf.h index 12f51c9d..d6f59eac 100644 --- a/conf/conf.h +++ b/conf/conf.h @@ -13,7 +13,7 @@ #include "lib/ip.h" #include "lib/hash.h" #include "lib/resource.h" -#include "sysdep/unix/timer.h" +#include "lib/timer.h" /* Configuration structure */ diff --git a/conf/flowspec.Y b/conf/flowspec.Y index 8c72854c..4d259763 100644 --- a/conf/flowspec.Y +++ b/conf/flowspec.Y @@ -11,16 +11,6 @@ CF_HDR #define PARSER 1 #include "nest/bird.h" -#include "conf/conf.h" -#include "lib/resource.h" -#include "lib/socket.h" -#include "sysdep/unix/timer.h" -#include "lib/string.h" -#include "nest/protocol.h" -#include "nest/iface.h" -#include "nest/route.h" -#include "nest/cli.h" -#include "filter/filter.h" #include "lib/flowspec.h" |