pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-02 09:46:38 +02:00
Code Activity

More basic config validation, and fix crash when no uplinks are configured. spotted by fgs

Browse Source
This commit is contained in:
Adam
2013-07-21 03:59:59 -04:00
parent e11abdc4f0
commit 604da89813
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/example.conf
+2 -2
View File
@@ -238,13 +238,13 @@ serverinfo
/*
* The filename containing the Services process ID. The path is relative to the
* services root directory. If not given, defaults to "data/services.pid".
* services root directory.
*/
pid = "data/services.pid"
/*
* The filename containing the Message of the Day. The path is relative to the
* services root directory. If not given, defaults to "conf/services.motd".
* services root directory.
*/
motd = "conf/services.motd"
}
src/config.cpp
+13 -2
View File
@@ -106,6 +106,12 @@ static void ValidateNotEmpty(const Anope::string &block, const Anope::string &na
throw ConfigException("The value for <" + block + ":" + name + "> cannot be empty!");
}
static void ValidateNoSpaces(const Anope::string &block, const Anope::string &name, const Anope::string &value)
{
if (value.find(' ') != Anope::string::npos)
throw ConfigException("The value for <" + block + ":" + name + "> may not contain spaces!");
}
template<typename T> static void ValidateNotZero(const Anope::string &block, const Anope::string &name, T value)
{
if (!value)
@@ -158,14 +164,18 @@ Conf::Conf() : Block("")
throw ConfigException("<" + noreload[i].block + ":" + noreload[i].name + "> can not be modified once set");
}
Block *options = this->GetBlock("options"), *mail = this->GetBlock("mail");
Block *serverinfo = this->GetBlock("serverinfo"), *options = this->GetBlock("options"), *mail = this->GetBlock("mail");
ValidateNotEmpty("serverinfo", "name", serverinfo->Get<const Anope::string>("name"));
ValidateNotEmpty("serverinfo", "description", serverinfo->Get<const Anope::string>("description"));
ValidateNotEmpty("serverinfo", "pid", serverinfo->Get<const Anope::string>("pid"));
ValidateNotEmpty("serverinfo", "motd", serverinfo->Get<const Anope::string>("motd"));
ValidateNotZero("options", "releasetimeout", options->Get<time_t>("releasetimeout"));
ValidateNotZero("options", "updatetimeout", options->Get<time_t>("updatetimeout"));
ValidateNotZero("options", "expiretimeout", options->Get<time_t>("expiretimeout"));
ValidateNotZero("options", "readtimeout", options->Get<time_t>("readtimeout"));
ValidateNotZero("options", "warningtimeout", options->Get<time_t>("warningtimeout"));
ValidateNotZero("options", "timeoutcheck", options->Get<time_t>("timeoutcheck"));
ValidateNotEmpty("options", "enforceruser", options->Get<const Anope::string>("enforceruser"));
ValidateNotEmpty("options", "enforcerhost", options->Get<const Anope::string>("enforcerhost"));
@@ -313,6 +323,7 @@ Conf::Conf() : Block("")
ValidateNotEmpty("service", "user", user);
ValidateNotEmpty("service", "host", host);
ValidateNotEmpty("service", "gecos", gecos);
ValidateNoSpaces("service", "channels", channels);
BotInfo *bi = BotInfo::Find(nick, true);
if (!bi)
src/uplink.cpp
+6
View File
@@ -38,6 +38,12 @@ class ReconnectTimer : public Timer
void Uplink::Connect()
{
if (Config->Uplinks.empty())
{
Log() << "Warning: There are no configured uplinks.";
return;
}
if (static_cast<unsigned>(++Anope::CurrentUplink) >= Config->Uplinks.size())
Anope::CurrentUplink = 0;