diff options
| -rw-r--r-- | data/example_new.conf | 6 | ||||
| -rw-r--r-- | include/extern.h | 2 | ||||
| -rw-r--r-- | src/config.c | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/data/example_new.conf b/data/example_new.conf index 0b016e4a7..7eba325ee 100644 --- a/data/example_new.conf +++ b/data/example_new.conf @@ -313,6 +313,12 @@ options { * Sets the timout period for reading from the uplink. */ readtimeout = 5s + + /* + * Sets the interval between sending warning messages for program errors via + * WALLOPS/GLOBOPS. + */ + warningtimeout = 4h } /* diff --git a/include/extern.h b/include/extern.h index c8627b7bc..ce6dbb15e 100644 --- a/include/extern.h +++ b/include/extern.h @@ -290,7 +290,7 @@ E time_t BadPassTimeout; E time_t UpdateTimeout; E time_t ExpireTimeout; E time_t ReadTimeout; -E int WarningTimeout; +E time_t WarningTimeout; E int TimeoutCheck; E int KeepLogs; E int KeepBackups; diff --git a/src/config.c b/src/config.c index a3bbe92b4..ad58682b2 100644 --- a/src/config.c +++ b/src/config.c @@ -92,7 +92,7 @@ time_t BadPassTimeout; time_t UpdateTimeout; time_t ExpireTimeout; time_t ReadTimeout; -int WarningTimeout; +time_t WarningTimeout; int TimeoutCheck; int KeepLogs; int KeepBackups; @@ -645,6 +645,7 @@ int ServerConfig::Read(bool bail) {"options", "updatetimeout", "0", new ValueContainerTime(&UpdateTimeout), DT_TIME, ValidateNotZero}, {"options", "expiretimeout", "0", new ValueContainerTime(&ExpireTimeout), DT_TIME, ValidateNotZero}, {"options", "readtimeout", "0", new ValueContainerTime(&ReadTimeout), DT_TIME, ValidateNotZero}, + {"options", "warningtimeout", "0", new ValueContainerTime(&WarningTimeout), DT_TIME, ValidateNotZero}, {"nickserv", "nick", "NickServ", new ValueContainerChar(&s_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"nickserv", "description", "Nickname Registration Service", new ValueContainerChar(&desc_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"nickserv", "database", "nick.db", new ValueContainerChar(&NickDBName), DT_CHARPTR, ValidateNotEmpty}, @@ -1394,7 +1395,6 @@ Directive directives[] = { {"UseSVSHOLD", {{PARAM_SET, PARAM_RELOAD, &UseSVSHOLD}}}, {"UseTS6", {{PARAM_SET, 0, &UseTS6}}}, {"UnRestrictSAdmin", {{PARAM_SET, PARAM_RELOAD, &UnRestrictSAdmin}}}, - {"WarningTimeout", {{PARAM_TIME, PARAM_RELOAD, &WarningTimeout}}}, {"UlineServers", {{PARAM_STRING, PARAM_RELOAD, &UlineServers}}}, }; @@ -1701,7 +1701,6 @@ int read_config(int reload) } } - CHECK(WarningTimeout); CHECK(TimeoutCheck); if (temp_nsuserhost) { |