#include <iostream>
ServerLimits::ServerLimits(ConfigTag* tag)
- : NickMax(tag->getInt("maxnick", 30))
- , ChanMax(tag->getInt("maxchan", 64))
- , MaxModes(tag->getInt("maxmodes", 20))
- , IdentMax(tag->getInt("maxident", 10))
- , MaxQuit(tag->getInt("maxquit", 255))
- , MaxTopic(tag->getInt("maxtopic", 307))
- , MaxKick(tag->getInt("maxkick", 255))
- , MaxGecos(tag->getInt("maxgecos", 128))
- , MaxAway(tag->getInt("maxaway", 200))
- , MaxLine(tag->getInt("maxline", 512))
- , MaxHost(tag->getInt("maxhost", 64))
+ : NickMax(tag->getUInt("maxnick", 30))
+ , ChanMax(tag->getUInt("maxchan", 64))
+ , MaxModes(tag->getUInt("maxmodes", 20))
+ , IdentMax(tag->getUInt("maxident", 10))
+ , MaxQuit(tag->getUInt("maxquit", 255))
+ , MaxTopic(tag->getUInt("maxtopic", 307))
+ , MaxKick(tag->getUInt("maxkick", 255))
+ , MaxReal(tag->getUInt("maxreal", tag->getUInt("maxgecos", 128)))
+ , MaxAway(tag->getUInt("maxaway", 200))
+ , MaxLine(tag->getUInt("maxline", 512))
+ , MaxHost(tag->getUInt("maxhost", 64))
{
}
delete EmptyTag;
}
-static void ValidHost(const std::string& p, const std::string& msg)
-{
- int num_dots = 0;
- if (p.empty() || p[0] == '.')
- throw CoreException("The value of "+msg+" is not a valid hostname");
- for (unsigned int i=0;i < p.length();i++)
- {
- switch (p[i])
- {
- case ' ':
- throw CoreException("The value of "+msg+" is not a valid hostname");
- case '.':
- num_dots++;
- break;
- }
- }
- if (num_dots == 0)
- throw CoreException("The value of "+msg+" is not a valid hostname");
-}
-
bool ServerConfig::ApplyDisabledCommands()
{
// Enable everything first.
throw CoreException("<"+tag+":"+key+"> missing at " + ctag->getTagLocation());
std::string reason = ctag->getString("reason", "<Config>");
XLine* xl = make->Generate(ServerInstance->Time(), 0, "<Config>", reason, mask);
+ xl->from_config = true;
if (!ServerInstance->XLines->AddLine(xl, NULL))
delete xl;
}
}
}
- int blk_count = config_data.count("connect");
+ size_t blk_count = config_data.count("connect");
if (blk_count == 0)
{
// No connect blocks found; make a trivial default block
}
Classes.resize(blk_count);
- std::map<std::string, int> names;
+ std::map<std::string, size_t> names;
bool try_again = true;
- for(int tries=0; try_again; tries++)
+ for(size_t tries = 0; try_again; tries++)
{
try_again = false;
ConfigTagList tags = ConfTags("connect");
- int i=0;
+ size_t i = 0;
for(ConfigIter it = tags.first; it != tags.second; ++it, ++i)
{
ConfigTag* tag = it->second;
std::string parentName = tag->getString("parent");
if (!parentName.empty())
{
- std::map<std::string,int>::iterator parentIter = names.find(parentName);
+ std::map<std::string, size_t>::const_iterator parentIter = names.find(parentName);
if (parentIter == names.end())
{
try_again = true;
if (tag->readString("sendq", sendq))
{
// attempt to guess a good hard/soft sendq from a single value
- long value = atol(sendq.c_str());
+ unsigned long value = strtoul(sendq.c_str(), NULL, 10);
if (value > 16384)
me->softsendqmax = value / 16;
else
me->softsendqmax = value;
me->hardsendqmax = value * 8;
}
- me->softsendqmax = tag->getInt("softsendq", me->softsendqmax);
- me->hardsendqmax = tag->getInt("hardsendq", me->hardsendqmax);
- me->recvqmax = tag->getInt("recvq", me->recvqmax);
- me->penaltythreshold = tag->getInt("threshold", me->penaltythreshold);
- me->commandrate = tag->getInt("commandrate", me->commandrate);
+ me->softsendqmax = tag->getUInt("softsendq", me->softsendqmax);
+ me->hardsendqmax = tag->getUInt("hardsendq", me->hardsendqmax);
+ me->recvqmax = tag->getUInt("recvq", me->recvqmax);
+ me->penaltythreshold = tag->getUInt("threshold", me->penaltythreshold);
+ me->commandrate = tag->getUInt("commandrate", me->commandrate);
me->fakelag = tag->getBool("fakelag", me->fakelag);
- me->maxlocal = tag->getInt("localmax", me->maxlocal);
- me->maxglobal = tag->getInt("globalmax", me->maxglobal);
- me->maxchans = tag->getInt("maxchans", me->maxchans);
+ me->maxlocal = tag->getUInt("localmax", me->maxlocal);
+ me->maxglobal = tag->getUInt("globalmax", me->maxglobal);
+ me->maxchans = tag->getUInt("maxchans", me->maxchans);
me->maxconnwarn = tag->getBool("maxconnwarn", me->maxconnwarn);
- me->limit = tag->getInt("limit", me->limit);
+ me->limit = tag->getUInt("limit", me->limit);
me->resolvehostnames = tag->getBool("resolvehostnames", me->resolvehostnames);
std::string ports = tag->getString("port");
}
}
-/** Represents a deprecated configuration tag.
- */
-struct DeprecatedConfig
-{
- /** Tag name. */
- std::string tag;
-
- /** Attribute key. */
- std::string key;
-
- /** Attribute value. */
- std::string value;
-
- /** Reason for deprecation. */
- std::string reason;
-};
-
-static const DeprecatedConfig ChangedConfig[] = {
- { "bind", "transport", "", "has been moved to <bind:ssl> as of 2.0" },
- { "die", "value", "", "you need to reread your config" },
- { "gnutls", "starttls", "", "has been replaced with m_starttls as of 3.0" },
- { "link", "autoconnect", "", "2.0+ does not use this attribute - define <autoconnect> tags instead" },
- { "link", "transport", "", "has been moved to <link:ssl> as of 2.0" },
- { "module", "name", "m_chanprotect.so", "has been replaced with m_customprefix as of 3.0" },
- { "module", "name", "m_halfop.so", "has been replaced with m_customprefix as of 3.0" },
- { "options", "cyclehosts", "", "has been replaced with m_hostcycle as of 3.0" },
- { "performance", "nouserdns", "", "has been moved to <connect:resolvehostnames> as of 3.0" }
-};
-
void ServerConfig::Fill()
{
ConfigTag* options = ConfValue("options");
ConfigTag* server = ConfValue("server");
if (sid.empty())
{
- ServerName = server->getString("name", "irc.example.com");
- ValidHost(ServerName, "<server:name>");
+ ServerName = server->getString("name", "irc.example.com", InspIRCd::IsHost);
sid = server->getString("id");
if (!sid.empty() && !InspIRCd::IsSID(sid))
throw CoreException("You must restart to change the server casemapping");
}
- SoftLimit = ConfValue("performance")->getInt("softlimit", (SocketEngine::GetMaxFds() > 0 ? SocketEngine::GetMaxFds() : LONG_MAX), 10);
+ SoftLimit = ConfValue("performance")->getUInt("softlimit", (SocketEngine::GetMaxFds() > 0 ? SocketEngine::GetMaxFds() : LONG_MAX), 10);
CCOnConnect = ConfValue("performance")->getBool("clonesonconnect", true);
- MaxConn = ConfValue("performance")->getInt("somaxconn", SOMAXCONN);
+ MaxConn = ConfValue("performance")->getUInt("somaxconn", SOMAXCONN);
XLineMessage = options->getString("xlinemessage", options->getString("moronbanner", "You're banned!"));
ServerDesc = server->getString("description", "Configure Me");
Network = server->getString("network", "Network");
NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240, 1024, 65534);
DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant");
- UserStats = security->getString("userstats");
CustomVersion = security->getString("customversion");
- HideSplits = security->getBool("hidesplits");
HideBans = security->getBool("hidebans");
- HideWhoisServer = security->getString("hidewhois");
- HideKillsServer = security->getString("hidekills");
- HideULineKills = security->getBool("hideulinekills");
- RestrictBannedUsers = security->getBool("restrictbannedusers", true);
- GenericOper = security->getBool("genericoper");
+ HideServer = security->getString("hideserver", security->getString("hidewhois"));
SyntaxHints = options->getBool("syntaxhints");
- CycleHostsFromUser = options->getBool("cyclehostsfromuser");
FullHostInTopic = options->getBool("hostintopic");
- MaxTargets = security->getInt("maxtargets", 20, 1, 31);
+ MaxTargets = security->getUInt("maxtargets", 20, 1, 31);
DefaultModes = options->getString("defaultmodes", "not");
PID = ConfValue("pid")->getString("file");
- MaxChans = ConfValue("channels")->getInt("users", 20);
- OperMaxChans = ConfValue("channels")->getInt("opers");
- c_ipv4_range = ConfValue("cidr")->getInt("ipv4clone", 32);
- c_ipv6_range = ConfValue("cidr")->getInt("ipv6clone", 128);
+ MaxChans = ConfValue("channels")->getUInt("users", 20);
+ OperMaxChans = ConfValue("channels")->getUInt("opers", 0);
+ c_ipv4_range = ConfValue("cidr")->getUInt("ipv4clone", 32, 1, 32);
+ c_ipv6_range = ConfValue("cidr")->getUInt("ipv6clone", 128, 1, 128);
Limits = ServerLimits(ConfValue("limits"));
Paths = ServerPaths(ConfValue("path"));
NoSnoticeStack = options->getBool("nosnoticestack", false);
SocketEngine::Close(socktest);
}
+ ServerInstance->XLines->ClearConfigLines();
ReadXLine(this, "badip", "ipmask", ServerInstance->XLines->GetFactory("Z"));
ReadXLine(this, "badnick", "nick", ServerInstance->XLines->GetFactory("Q"));
ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K"));
ReadXLine(this, "exception", "host", ServerInstance->XLines->GetFactory("E"));
+ const std::string restrictbannedusers = options->getString("restrictbannedusers", "yes");
+ if (stdalgo::string::equalsci(restrictbannedusers, "no"))
+ RestrictBannedUsers = ServerConfig::BUT_NORMAL;
+ else if (stdalgo::string::equalsci(restrictbannedusers, "silent"))
+ RestrictBannedUsers = ServerConfig::BUT_RESTRICT_SILENT;
+ else if (stdalgo::string::equalsci(restrictbannedusers, "yes"))
+ RestrictBannedUsers = ServerConfig::BUT_RESTRICT_NOTIFY;
+ else
+ throw CoreException(restrictbannedusers + " is an invalid <options:restrictbannedusers> value, at " + options->getTagLocation());
+
DisabledUModes.reset();
std::string modes = ConfValue("disabled")->getString("usermodes");
for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
throw CoreException("Invalid chanmode " + std::string(1, *p) + " was found.");
DisabledCModes.set(*p - 'A');
}
-
- std::string v = security->getString("announceinvites");
-
- if (v == "ops")
- AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_OPS;
- else if (v == "all")
- AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_ALL;
- else if (v == "dynamic")
- AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_DYNAMIC;
- else
- AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE;
-
- v = security->getString("operspywhois");
- if (v == "splitmsg")
- OperSpyWhois = SPYWHOIS_SPLITMSG;
- else if (v == "on" || v == "yes")
- OperSpyWhois = SPYWHOIS_SINGLEMSG;
- else
- OperSpyWhois = SPYWHOIS_NONE;
}
// WARNING: it is not safe to use most of the codebase in this function, as it
/* The stuff in here may throw CoreException, be sure we're in a position to catch it. */
try
{
- for (int index = 0; index * sizeof(DeprecatedConfig) < sizeof(ChangedConfig); index++)
+ // Ensure the user has actually edited ther config.
+ ConfigTagList dietags = ConfTags("die");
+ if (dietags.first != dietags.second)
{
- std::string value;
- ConfigTagList tags = ConfTags(ChangedConfig[index].tag);
- for(ConfigIter i = tags.first; i != tags.second; ++i)
+ errstr << "Your configuration has not been edited correctly!" << std::endl;
+ for (ConfigIter iter = dietags.first; iter != dietags.second; ++iter)
{
- if (i->second->readString(ChangedConfig[index].key, value, true)
- && (ChangedConfig[index].value.empty() || value == ChangedConfig[index].value))
- {
- errstr << "Your configuration contains a deprecated value: <" << ChangedConfig[index].tag;
- if (ChangedConfig[index].value.empty())
- {
- errstr << ':' << ChangedConfig[index].key;
- }
- else
- {
- errstr << ' ' << ChangedConfig[index].key << "=\"" << ChangedConfig[index].value << "\"";
- }
- errstr << "> - " << ChangedConfig[index].reason << " (at " << i->second->getTagLocation() << ")" << std::endl;
- }
+ ConfigTag* tag = iter->second;
+ const std::string reason = tag->getString("reason", "You left a <die> tag in your config", 1);
+ errstr << reason << " (at " << tag->getTagLocation() << ")" << std::endl;
}
}
for (ClassVector::const_iterator it = this->Classes.begin(), it_end = this->Classes.end(); it != it_end; ++it)
{
ConfigTag *tag = (*it)->config;
- // Make sure our connection class allows motd colors
- if(!tag->getBool("allowmotdcolors"))
- continue;
ConfigFileCache::iterator file = this->Files.find(tag->getString("motd", "motd"));
if (file != this->Files.end())
ServerInstance->Users.RehashCloneCounts();
ServerInstance->XLines->CheckELines();
ServerInstance->XLines->ApplyLines();
- ChanModeReference ban(NULL, "ban");
- static_cast<ListModeBase*>(*ban)->DoRehash();
Config->ApplyDisabledCommands();
User* user = ServerInstance->FindNick(TheUserUID);
catch (CoreException& modex)
{
ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Exception caught: " + modex.GetReason());
+ if (user)
+ user->WriteNotice(i->first + ": " + modex.GetReason());
}
}