/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- * Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
- * Copyright (C) 2006-2009 Dennis Friis <peavey@inspircd.org>
- * Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ * Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2013-2014, 2016-2021 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ * Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2012 Justin Crawford <Justasic@Gmail.com>
+ * Copyright (C) 2012 DjSlash <djslash@djslash.org>
+ * Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ * Copyright (C) 2009-2011 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
* Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
- * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ * Copyright (C) 2007-2010 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2008 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2006 Oliver Lupton <om@inspircd.org>
*
* This file is part of InspIRCd. InspIRCd is free software: you can
* redistribute it and/or modify it under the terms of the GNU General Public
#include <iostream>
ServerLimits::ServerLimits(ConfigTag* tag)
- : NickMax(tag->getInt("maxnick", 32))
- , ChanMax(tag->getInt("maxchan", 64))
- , MaxModes(tag->getInt("maxmodes", 20))
- , IdentMax(tag->getInt("maxident", 11))
- , 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))
+ : MaxLine(tag->getUInt("maxline", 512, 512))
+ , NickMax(tag->getUInt("maxnick", 30, 1, MaxLine))
+ , ChanMax(tag->getUInt("maxchan", 64, 1, MaxLine))
+ , MaxModes(tag->getUInt("maxmodes", 20, 1))
+ , IdentMax(tag->getUInt("maxident", 10, 1))
+ , MaxQuit(tag->getUInt("maxquit", 255, 0, MaxLine))
+ , MaxTopic(tag->getUInt("maxtopic", 307, 1, MaxLine))
+ , MaxKick(tag->getUInt("maxkick", 255, 1, MaxLine))
+ , MaxReal(tag->getUInt("maxreal", tag->getUInt("maxgecos", 128), 1, MaxLine))
+ , MaxAway(tag->getUInt("maxaway", 200, 1, MaxLine))
+ , MaxHost(tag->getUInt("maxhost", 64, 1, MaxLine))
+{
+}
+
+ServerConfig::ServerPaths::ServerPaths(ConfigTag* tag)
+ : Config(tag->getString("configdir", INSPIRCD_CONFIG_PATH, 1))
+ , Data(tag->getString("datadir", INSPIRCD_DATA_PATH, 1))
+ , Log(tag->getString("logdir", INSPIRCD_LOG_PATH, 1))
+ , Module(tag->getString("moduledir", INSPIRCD_MODULE_PATH, 1))
+ , Runtime(tag->getString("runtimedir", INSPIRCD_RUNTIME_PATH, 1))
{
}
static ConfigTag* CreateEmptyTag()
{
- std::vector<KeyVal>* items;
+ ConfigItems* items;
return ConfigTag::create("empty", "<auto>", 0, items);
}
ServerConfig::ServerConfig()
: EmptyTag(CreateEmptyTag())
, Limits(EmptyTag)
+ , Paths(EmptyTag)
+ , RawLog(false)
, NoSnoticeStack(false)
{
- RawLog = HideBans = HideSplits = false;
- WildcardIPv6 = true;
- dns_timeout = 5;
- MaxTargets = 20;
- NetBufferSize = 10240;
- MaxConn = SOMAXCONN;
- MaxChans = 20;
- OperMaxChans = 30;
- c_ipv4_range = 32;
- c_ipv6_range = 128;
}
ServerConfig::~ServerConfig()
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(const std::string& data)
-{
- std::stringstream dcmds(data);
- std::string thiscmd;
-
- /* Enable everything first */
- const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands();
- for (CommandParser::CommandMap::const_iterator x = commands.begin(); x != commands.end(); ++x)
- x->second->Disable(false);
-
- /* Now disable all the ones which the user wants disabled */
- while (dcmds >> thiscmd)
- {
- Command* handler = ServerInstance->Parser.GetHandler(thiscmd);
- if (handler)
- handler->Disable(true);
- }
- return true;
-}
-
static void ReadXLine(ServerConfig* conf, const std::string& tag, const std::string& key, XLineFactory* make)
{
+ insp::flat_set<std::string> configlines;
+
ConfigTagList tags = conf->ConfTags(tag);
for(ConfigIter i = tags.first; i != tags.second; ++i)
{
ConfigTag* ctag = i->second;
- std::string mask;
- if (!ctag->readString(key, mask))
- 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);
+
+ const std::string mask = ctag->getString(key);
+ if (mask.empty())
+ throw CoreException("<" + tag + ":" + key + "> missing at " + ctag->getTagLocation());
+
+ const std::string reason = ctag->getString("reason");
+ if (reason.empty())
+ throw CoreException("<" + tag + ":reason> missing at " + ctag->getTagLocation());
+
+ XLine* xl = make->Generate(ServerInstance->Time(), 0, ServerInstance->Config->ServerName, reason, mask);
+ xl->from_config = true;
+ configlines.insert(xl->Displayable());
if (!ServerInstance->XLines->AddLine(xl, NULL))
delete xl;
}
+
+ ServerInstance->XLines->ExpireRemovedConfigLines(make->GetType(), configlines);
}
typedef std::map<std::string, ConfigTag*> LocalIndex;
if (OperTypes.find(name) != OperTypes.end())
throw CoreException("Duplicate type block with name " + name + " at " + tag->getTagLocation());
- OperInfo* ifo = new OperInfo;
+ OperInfo* ifo = new OperInfo(name);
OperTypes[name] = ifo;
- ifo->name = name;
ifo->type_block = tag;
std::string classname;
if (oper_blocks.find(name) != oper_blocks.end())
throw CoreException("Duplicate oper block with name " + name + " at " + tag->getTagLocation());
- OperInfo* ifo = new OperInfo;
- ifo->name = type;
+ OperInfo* ifo = new OperInfo(type);
ifo->oper_block = tag;
ifo->type_block = tblk->second->type_block;
ifo->class_blocks.assign(tblk->second->class_blocks.begin(), tblk->second->class_blocks.end());
void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
{
- typedef std::map<std::string, ConnectClass*> ClassMap;
+ typedef std::map<std::pair<std::string, char>, ConnectClass*> ClassMap;
ClassMap oldBlocksByMask;
if (current)
{
for(ClassVector::iterator i = current->Classes.begin(); i != current->Classes.end(); ++i)
{
ConnectClass* c = *i;
- if (c->name.compare(0, 8, "unnamed-", 8))
- {
- oldBlocksByMask["n" + c->name] = c;
- }
- else if (c->type == CC_ALLOW || c->type == CC_DENY)
+ switch (c->type)
{
- std::string typeMask = (c->type == CC_ALLOW) ? "a" : "d";
- typeMask += c->host;
- oldBlocksByMask[typeMask] = c;
+ case CC_ALLOW:
+ case CC_DENY:
+ oldBlocksByMask[std::make_pair(c->host, c->type)] = c;
+ break;
+
+ case CC_NAMED:
+ oldBlocksByMask[std::make_pair(c->name, c->type)] = c;
+ break;
}
}
}
- 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
- std::vector<KeyVal>* items;
+ ConfigItems* items;
ConfigTag* tag = ConfigTag::create("connect", "<auto>", 0, items);
- items->push_back(std::make_pair("allow", "*"));
+ (*items)["allow"] = "*";
config_data.insert(std::make_pair("connect", tag));
blk_count = 1;
}
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;
}
std::string name = tag->getString("name");
- std::string mask, typeMask;
+ std::string mask;
char type;
if (tag->readString("allow", mask, false))
- {
type = CC_ALLOW;
- typeMask = 'a' + mask;
- }
else if (tag->readString("deny", mask, false))
- {
type = CC_DENY;
- typeMask = 'd' + mask;
- }
else if (!name.empty())
{
type = CC_NAMED;
mask = name;
- typeMask = 'n' + mask;
}
else
{
}
if (name.empty())
- {
name = "unnamed-" + ConvToStr(i);
- }
- else
- {
- typeMask = 'n' + name;
- }
if (names.find(name) != names.end())
throw CoreException("Two connect classes with name \"" + name + "\" defined!");
me->name = name;
- me->registration_timeout = tag->getInt("timeout", me->registration_timeout);
- me->pingtime = tag->getInt("pingfreq", me->pingtime);
+ me->registration_timeout = tag->getDuration("timeout", me->registration_timeout);
+ me->pingtime = tag->getDuration("pingfreq", me->pingtime);
std::string sendq;
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);
+ me->password = tag->getString("password", me->password);
+
+ me->passwordhash = tag->getString("hash", me->passwordhash);
+ if (!me->password.empty() && (me->passwordhash.empty() || stdalgo::string::equalsci(me->passwordhash, "plaintext")))
+ {
+ ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEFAULT, "<connect> tag '%s' at %s contains an plain text password, this is insecure!",
+ name.c_str(), tag->getTagLocation().c_str());
+ }
+
+ std::string ports = tag->getString("port");
+ if (!ports.empty())
+ {
+ irc::portparser portrange(ports, false);
+ while (int port = portrange.GetToken())
+ me->ports.insert(port);
+ }
- ClassMap::iterator oldMask = oldBlocksByMask.find(typeMask);
+ ClassMap::iterator oldMask = oldBlocksByMask.find(std::make_pair(me->name, me->type));
if (oldMask != oldBlocksByMask.end())
{
ConnectClass* old = oldMask->second;
}
}
-/** Represents a deprecated configuration tag.
- */
-struct DeprecatedConfig
+static std::string GetServerHost()
{
- /** 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" }
-};
+#ifndef _WIN32
+ char hostname[256];
+ if (gethostname(hostname, sizeof(hostname)) == 0)
+ {
+ std::string name(hostname);
+ if (name.find('.') == std::string::npos)
+ name.push_back('.');
+
+ if (name.length() <= ServerInstance->Config->Limits.MaxHost && InspIRCd::IsHost(name))
+ return name;
+ }
+#endif
+ return "irc.example.com";
+}
void ServerConfig::Fill()
{
ConfigTag* options = ConfValue("options");
ConfigTag* security = ConfValue("security");
+ ConfigTag* server = ConfValue("server");
if (sid.empty())
{
- ServerName = ConfValue("server")->getString("name", "irc.example.com");
- ValidHost(ServerName, "<server:name>");
+ ServerName = server->getString("name", GetServerHost(), InspIRCd::IsHost);
- sid = ConfValue("server")->getString("id");
+ sid = server->getString("id");
if (!sid.empty() && !InspIRCd::IsSID(sid))
throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
+
+ CaseMapping = options->getString("casemapping", "rfc1459", 1);
+ if (CaseMapping == "ascii")
+ national_case_insensitive_map = ascii_case_insensitive_map;
+ else if (CaseMapping == "rfc1459")
+ national_case_insensitive_map = rfc_case_insensitive_map;
+ else
+ throw CoreException("<options:casemapping> must be set to 'ascii', or 'rfc1459'");
}
else
{
- if (ServerName != ConfValue("server")->getString("name"))
+ std::string name = server->getString("name");
+ if (!name.empty() && name != ServerName)
throw CoreException("You must restart to change the server name");
- std::string nsid = ConfValue("server")->getString("id");
+ std::string nsid = server->getString("id");
if (!nsid.empty() && nsid != sid)
throw CoreException("You must restart to change the server id");
+
+ std::string casemapping = options->getString("casemapping");
+ // Ignore this value if CaseMapping is set to something the core doesn't provide (i.e., m_nationalchars).
+ if (!casemapping.empty() && casemapping != CaseMapping && (CaseMapping == "ascii" || CaseMapping == "rfc1459"))
+ 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);
+ TimeSkipWarn = ConfValue("performance")->getDuration("timeskipwarn", 2, 0, 30);
XLineMessage = options->getString("xlinemessage", options->getString("moronbanner", "You're banned!"));
- ServerDesc = ConfValue("server")->getString("description", "Configure Me");
- Network = ConfValue("server")->getString("network", "Network");
+ ServerDesc = server->getString("description", "Configure Me", 1);
+ Network = server->getString("network", "Network", 1);
NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240, 1024, 65534);
- dns_timeout = ConfValue("dns")->getInt("timeout", 5);
- DisabledCommands = ConfValue("disabled")->getString("commands", "");
- 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.Config = ConfValue("path")->getString("configdir", INSPIRCD_CONFIG_PATH);
- Paths.Data = ConfValue("path")->getString("datadir", INSPIRCD_DATA_PATH);
- Paths.Log = ConfValue("path")->getString("logdir", INSPIRCD_LOG_PATH);
- Paths.Module = ConfValue("path")->getString("moduledir", INSPIRCD_MODULE_PATH);
+ Paths = ServerPaths(ConfValue("path"));
NoSnoticeStack = options->getBool("nosnoticestack", false);
- if (Network.find(' ') != std::string::npos)
- throw CoreException(Network + " is not a valid network name. A network name must not contain spaces.");
-
std::string defbind = options->getString("defaultbind");
if (stdalgo::string::equalsci(defbind, "ipv4"))
{
ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K"));
ReadXLine(this, "exception", "host", ServerInstance->XLines->GetFactory("E"));
- memset(DisabledUModes, 0, sizeof(DisabledUModes));
- std::string modes = ConfValue("disabled")->getString("usermodes");
- for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
- {
- // Complain when the character is not a-z or A-Z
- if ((*p < 'A') || (*p > 'z') || ((*p < 'a') && (*p > 'Z')))
- throw CoreException("Invalid usermode " + std::string(1, *p) + " was found.");
- DisabledUModes[*p - 'A'] = 1;
- }
-
- memset(DisabledCModes, 0, sizeof(DisabledCModes));
- modes = ConfValue("disabled")->getString("chanmodes");
- for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
- {
- if ((*p < 'A') || (*p > 'z') || ((*p < 'a') && (*p > 'Z')))
- throw CoreException("Invalid chanmode " + std::string(1, *p) + " was found.");
- DisabledCModes[*p - 'A'] = 1;
- }
-
- 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;
+ const std::string restrictbannedusers = options->getString("restrictbannedusers", "yes", 1);
+ 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
- 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;
+ throw CoreException(restrictbannedusers + " is an invalid <options:restrictbannedusers> value, at " + options->getTagLocation());
}
// WARNING: it is not safe to use most of the codebase in this function, as it
/*
* These values can only be set on boot. Keep their old values. Do it before we send messages so we actually have a servername.
*/
+ this->CaseMapping = old->CaseMapping;
this->ServerName = old->ServerName;
this->sid = old->sid;
this->cmdline = old->cmdline;
/* 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;
}
}
}
catch (CoreException &ce)
{
- errstr << ce.GetReason();
+ errstr << ce.GetReason() << std::endl;
}
// Check errors before dealing with failed binds, since continuing on failed bind is wanted in some circumstances.
// On first run, ports are bound later on
FailedPortList pl;
ServerInstance->BindPorts(pl);
- if (pl.size())
+ if (!pl.empty())
{
- errstr << "Not all your client ports could be bound." << std::endl
- << "The following port(s) failed to bind:" << std::endl;
-
- int j = 1;
- for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
+ errstr << "Warning! Some of your listener" << (pl.size() == 1 ? "s" : "") << " failed to bind:" << std::endl;
+ for (FailedPortList::const_iterator iter = pl.begin(); iter != pl.end(); ++iter)
{
- errstr << j << ".\tAddress: " << (i->first.empty() ? "<all>" : i->first.c_str()) << "\tReason: "
- << i->second << std::endl;
+ const FailedPort& fp = *iter;
+ errstr << " " << fp.sa.str() << ": " << strerror(fp.error) << std::endl
+ << " " << "Created from <bind> tag at " << fp.tag->getTagLocation() << std::endl;
}
}
}
- User* user = useruid.empty() ? NULL : ServerInstance->FindNick(useruid);
+ User* user = useruid.empty() ? NULL : ServerInstance->FindUUID(useruid);
if (!valid)
{
errstr.clear();
errstr.str(std::string());
- // Re-parse our MOTD and RULES files for colors -- Justasic
- 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())
- InspIRCd::ProcessColors(file->second);
- }
-
/* No old configuration -> initial boot, nothing more to do here */
if (!old)
{
{
const std::string& modname = i->first;
// Don't remove core_*.so, just remove m_*.so
- if (modname.c_str()[0] == 'c')
+ if (InspIRCd::Match(modname, "core_*.so", ascii_case_insensitive_map))
continue;
if (ServerInstance->Modules->Unload(i->second))
{
for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
{
+ // Skip modules which are already loaded.
+ if (ServerInstance->Modules->Find(*adding))
+ continue;
+
if (ServerInstance->Modules->Load(*adding))
{
ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH LOADED MODULE: %s",adding->c_str());
ServerInstance->Users.RehashCloneCounts();
ServerInstance->XLines->CheckELines();
ServerInstance->XLines->ApplyLines();
- ChanModeReference ban(NULL, "ban");
- static_cast<ListModeBase*>(*ban)->DoRehash();
- Config->ApplyDisabledCommands(Config->DisabledCommands);
- User* user = ServerInstance->FindNick(TheUserUID);
+ User* user = ServerInstance->FindUUID(TheUserUID);
ConfigStatus status(user);
const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();
for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
- i->second->ReadConfig(status);
+ {
+ try
+ {
+ ServerInstance->Logs->Log("MODULE", LOG_DEBUG, "Rehashing " + i->first);
+ i->second->ReadConfig(status);
+ }
+ catch (CoreException& modex)
+ {
+ ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Exception caught: " + modex.GetReason());
+ if (user)
+ user->WriteNotice(i->first + ": " + modex.GetReason());
+ }
+ }
// The description of this server may have changed - update it for WHOIS etc.
ServerInstance->FakeClient->server->description = Config->ServerDesc;
projects / user / henk / code / inspircd.git / blobdiff