X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=68495623c778b1a03ad9a02fad1f3e7ac3f87e01;hb=f757c2d75bc284211f3b53b2819b88becfd8632f;hp=c4b5c45106f615c98d391669ed2cf7f5d9b063c1;hpb=e3bcf95ee996c058c73879c12ac5a487f8dcdf46;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index c4b5c4510..68495623c 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -29,14 +29,37 @@
 #include "configparser.h"
 #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))
+{
+}
+
+static ConfigTag* CreateEmptyTag()
+{
+	std::vector<KeyVal>* items;
+	return ConfigTag::create("empty", "<auto>", 0, items);
+}
+
 ServerConfig::ServerConfig()
+	: EmptyTag(CreateEmptyTag())
+	, Limits(EmptyTag)
+	, NoSnoticeStack(false)
 {
 	RawLog = HideBans = HideSplits = UndernetMsgPrefix = false;
 	WildcardIPv6 = InvBypassModes = true;
 	dns_timeout = 5;
 	MaxTargets = 20;
 	NetBufferSize = 10240;
-	SoftLimit = SocketEngine::GetMaxFds();
 	MaxConn = SOMAXCONN;
 	MaxChans = 20;
 	OperMaxChans = 30;
@@ -44,6 +67,11 @@ ServerConfig::ServerConfig()
 	c_ipv6_range = 128;
 }
 
+ServerConfig::~ServerConfig()
+{
+	delete EmptyTag;
+}
+
 static void ValidHost(const std::string& p, const std::string& msg)
 {
 	int num_dots = 0;
@@ -70,17 +98,16 @@ bool ServerConfig::ApplyDisabledCommands(const std::string& data)
 	std::string thiscmd;
 
 	/* Enable everything first */
-	for (Commandtable::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
+	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)
 	{
-		Commandtable::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
-		if (cm != ServerInstance->Parser->cmdlist.end())
-		{
-			cm->second->Disable(true);
-		}
+		Command* handler = ServerInstance->Parser.GetHandler(thiscmd);
+		if (handler)
+			handler->Disable(true);
 	}
 	return true;
 }
@@ -176,7 +203,7 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 		for(ClassVector::iterator i = current->Classes.begin(); i != current->Classes.end(); ++i)
 		{
 			ConnectClass* c = *i;
-			if (c->name.substr(0, 8) != "unnamed-")
+			if (c->name.compare(0, 8, "unnamed-", 8))
 			{
 				oldBlocksByMask["n" + c->name] = c;
 			}
@@ -366,7 +393,7 @@ void ServerConfig::Fill()
 		if (!nsid.empty() && nsid != sid)
 			throw CoreException("You must restart to change the server id");
 	}
-	SoftLimit = ConfValue("performance")->getInt("softlimit", SocketEngine::GetMaxFds(), 10, SocketEngine::GetMaxFds());
+	SoftLimit = ConfValue("performance")->getInt("softlimit", (SocketEngine::GetMaxFds() > 0 ? SocketEngine::GetMaxFds() : LONG_MAX), 10);
 	CCOnConnect = ConfValue("performance")->getBool("clonesonconnect", true);
 	MaxConn = ConfValue("performance")->getInt("somaxconn", SOMAXCONN);
 	XLineMessage = options->getString("xlinemessage", options->getString("moronbanner", "You're banned!"));
@@ -395,17 +422,7 @@ void ServerConfig::Fill()
 	OperMaxChans = ConfValue("channels")->getInt("opers");
 	c_ipv4_range = ConfValue("cidr")->getInt("ipv4clone", 32);
 	c_ipv6_range = ConfValue("cidr")->getInt("ipv6clone", 128);
-	Limits.NickMax = ConfValue("limits")->getInt("maxnick", 32);
-	Limits.ChanMax = ConfValue("limits")->getInt("maxchan", 64);
-	Limits.MaxModes = ConfValue("limits")->getInt("maxmodes", 20);
-	Limits.IdentMax = ConfValue("limits")->getInt("maxident", 11);
-	Limits.MaxHost = ConfValue("limits")->getInt("maxhost", 64);
-	Limits.MaxQuit = ConfValue("limits")->getInt("maxquit", 255);
-	Limits.MaxTopic = ConfValue("limits")->getInt("maxtopic", 307);
-	Limits.MaxKick = ConfValue("limits")->getInt("maxkick", 255);
-	Limits.MaxGecos = ConfValue("limits")->getInt("maxgecos", 128);
-	Limits.MaxAway = ConfValue("limits")->getInt("maxaway", 200);
-	Limits.MaxLine = ConfValue("limits")->getInt("maxline", 512);
+	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);
@@ -459,11 +476,6 @@ void ServerConfig::Fill()
 		DisabledCModes[*p - 'A'] = 1;
 	}
 
-	memset(HideModeLists, 0, sizeof(HideModeLists));
-	modes = ConfValue("security")->getString("hidemodes");
-	for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
-		HideModeLists[(unsigned char) *p] = true;
-
 	std::string v = security->getString("announceinvites");
 
 	if (v == "ops")
@@ -564,7 +576,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 		 errstr << "Possible configuration error: you have not defined any <bind> blocks." << std::endl
 			 << "You will need to do this if you want clients to be able to connect!" << std::endl;
 
-	if (old)
+	if (old && valid)
 	{
 		// On first run, ports are bound later on
 		FailedPortList pl;
@@ -714,7 +726,7 @@ ConfigTag* ServerConfig::ConfValue(const std::string &tag)
 {
 	ConfigTagList found = config_data.equal_range(tag);
 	if (found.first == found.second)
-		return NULL;
+		return EmptyTag;
 	ConfigTag* rv = found.first->second;
 	found.first++;
 	if (found.first != found.second)
@@ -773,6 +785,7 @@ void ConfigReaderThread::Finish()
 		 * XXX: The order of these is IMPORTANT, do not reorder them without testing
 		 * thoroughly!!!
 		 */
+		ServerInstance->Users.RehashCloneCounts();
 		ServerInstance->XLines->CheckELines();
 		ServerInstance->XLines->ApplyLines();
 		ChanModeReference ban(NULL, "ban");
@@ -785,6 +798,9 @@ void ConfigReaderThread::Finish()
 		for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
 			i->second->ReadConfig(status);
 
+		// The description of this server may have changed - update it for WHOIS etc.
+		ServerInstance->FakeClient->server->description = Config->ServerDesc;
+
 		ServerInstance->ISupport.Build();
 
 		ServerInstance->Logs->CloseLogs();