diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-06-21 14:43:49 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-12-07 13:53:42 +0100 |
| commit | 3e405fb188bee0bb8fcf91f574126771c8661afb (patch) | |
| tree | 8b97fcbc1f5e9ff2e3f712f03185872bd72e949d /conf | |
| parent | cc881bd15561224f507ed7162016114ed2b15a1e (diff) | |
Nest: Update to new timers
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/conf.c | 10 | ||||
| -rw-r--r-- | conf/conf.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/conf/conf.c b/conf/conf.c index a570fad5..2b5e9c71 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -307,7 +307,7 @@ config_done(void *unused UNUSED) * config_commit - commit a configuration * @c: new configuration * @type: type of reconfiguration (RECONFIG_SOFT or RECONFIG_HARD) - * @timeout: timeout for undo (or 0 for no timeout) + * @timeout: timeout for undo (in seconds; or 0 for no timeout) * * When a configuration is parsed and prepared for use, the * config_commit() function starts the process of reconfiguration. @@ -331,7 +331,7 @@ config_done(void *unused UNUSED) * are accepted. */ int -config_commit(struct config *c, int type, int timeout) +config_commit(struct config *c, int type, uint timeout) { if (shutting_down) { @@ -340,10 +340,10 @@ config_commit(struct config *c, int type, int timeout) } undo_available = 1; - if (timeout > 0) - tm_start(config_timer, timeout); + if (timeout) + tm2_start(config_timer, timeout S); else - tm_stop(config_timer); + tm2_stop(config_timer); if (configuring) { diff --git a/conf/conf.h b/conf/conf.h index 552d0120..12f51c9d 100644 --- a/conf/conf.h +++ b/conf/conf.h @@ -41,7 +41,7 @@ struct config { struct timeformat tf_proto; /* Time format for 'show protocol' */ struct timeformat tf_log; /* Time format for the logfile */ struct timeformat tf_base; /* Time format for other purposes */ - u32 gr_wait; /* Graceful restart wait timeout */ + u32 gr_wait; /* Graceful restart wait timeout (sec) */ int cli_debug; /* Tracing of CLI connections and commands */ int latency_debug; /* I/O loop tracks duration of each event */ @@ -68,7 +68,7 @@ struct config *config_alloc(const char *name); int config_parse(struct config *); int cli_parse(struct config *); void config_free(struct config *); -int config_commit(struct config *, int type, int timeout); +int config_commit(struct config *, int type, uint timeout); int config_confirm(void); int config_undo(void); void config_init(void); |