pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-27 11:36:38 +02:00
Code Activity

Added exceptionexpiry directive to operserv block in new config.

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1484 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Naram Qashat cyberbotx@cyberbotx.com
2008-10-26 20:08:06 +00:00
parent 474f30a8bf
commit bb22925ccf
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/example_new.conf
+6
View File
@@ -813,4 +813,10 @@ operserv
* required if session limiting is enabled.
*/
maxsessionlimit = 100
/*
* Sets the default expiry time for session exceptions. This directive is only required if session
* limiting is enabled.
*/
exceptionexpiry = 1d
}
include/extern.h
+1 -1
View File
@@ -444,7 +444,7 @@ E int ChanServCoreNumber;
E bool LimitSessions;
E int DefSessionLimit;
E int ExceptionExpiry;
E time_t ExceptionExpiry;
E int MaxSessionKill;
E int MaxSessionLimit;
E int SessionAutoKillExpiry;
src/config.c
+3 -5
View File
@@ -219,7 +219,7 @@ int AddAkiller;
bool LimitSessions;
int DefSessionLimit;
int ExceptionExpiry;
time_t ExceptionExpiry;
int MaxSessionKill;
int MaxSessionLimit;
int SessionAutoKillExpiry;
@@ -506,7 +506,7 @@ bool ValidateHostServ(ServerConfig *, const char *tag, const char *value, ValueI
bool ValidateLimitSessions(ServerConfig *, const char *tag, const char *value, ValueItem &data)
{
if (LimitSessions) {
if (static_cast<std::string>(value) == "maxsessionlimit") {
if (static_cast<std::string>(value) == "maxsessionlimit" || static_cast<std::string>(value) == "exceptionexpiry") {
if (!data.GetInteger()) throw ConfigException(static_cast<std::string>("The value for <") + tag + ":" + value + "> must be non-zero when session limiting is enabled!");
}
}
@@ -671,6 +671,7 @@ int ServerConfig::Read(bool bail)
{"operserv", "limitsessions", "no", new ValueContainerBool(&LimitSessions), DT_BOOLEAN, NoValidation},
{"operserv", "defaultsessionlimit", "0", new ValueContainerInt(&DefSessionLimit), DT_INTEGER, NoValidation},
{"operserv", "maxsessionlimit", "0", new ValueContainerInt(&MaxSessionLimit), DT_INTEGER, ValidateLimitSessions},
{"operserv", "exceptionexpiry", "0", new ValueContainerTime(&ExceptionExpiry), DT_TIME, ValidateLimitSessions},
{NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation}
};
/* These tags can occur multiple times, and therefore they have special code to read them
@@ -1266,7 +1267,6 @@ Directive directives[] = {
{"DefConOffMessage",
{{PARAM_STRING, PARAM_RELOAD, &DefConOffMessage}}},
{"EncModule", {{PARAM_STRING, 0, &EncModule}}},
{"ExceptionExpiry", {{PARAM_TIME, PARAM_RELOAD, &ExceptionExpiry}}},
{"ExpireTimeout", {{PARAM_TIME, PARAM_RELOAD, &ExpireTimeout}}},
{"ForceForbidReason", {{PARAM_SET, PARAM_RELOAD, &ForceForbidReason}}},
{"HelpCoreModules", {{PARAM_STRING, PARAM_RELOAD, &HelpCoreModules}}},
@@ -1891,8 +1891,6 @@ int read_config(int reload)
if (LimitSessions) {
CHECK(ExceptionExpiry);
if (MaxSessionKill && !SessionAutoKillExpiry)
SessionAutoKillExpiry = 30 * 60; /* 30 minutes */
}