X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=a81a1b646f8ea81cc911eae6f2ad2835e21b911f;hb=a71f34e4b17420cacc4a50c5af64fe15811a8148;hp=945600e6c06f14eb4eb7f1b1aa1b13d4030a89cc;hpb=085a8a34cb0b1bd97bba76fff15820fb57aa50e4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 945600e6c..a81a1b646 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -29,10 +29,34 @@
 #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;
+	WildcardIPv6 = true;
 	dns_timeout = 5;
 	MaxTargets = 20;
 	NetBufferSize = 10240;
@@ -43,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;
@@ -69,14 +98,14 @@ bool ServerConfig::ApplyDisabledCommands(const std::string& data)
 	std::string thiscmd;
 
 	/* Enable everything first */
-	const CommandParser::CommandMap& commands = ServerInstance->Parser->GetCommands();
+	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);
+		Command* handler = ServerInstance->Parser.GetHandler(thiscmd);
 		if (handler)
 			handler->Disable(true);
 	}
@@ -393,22 +422,11 @@ 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);
 	Paths.Module = ConfValue("path")->getString("moduledir", INSPIRCD_MODULE_PATH);
-	InvBypassModes = options->getBool("invitebypassmodes", true);
 	NoSnoticeStack = options->getBool("nosnoticestack", false);
 
 	if (Network.find(' ') != std::string::npos)
@@ -457,11 +475,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")
@@ -562,7 +575,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;
@@ -657,6 +670,7 @@ void ServerConfig::ApplyModules(User* user)
 		std::string name;
 		if (tag->readString("name", name))
 		{
+			name = ModuleManager::ExpandModName(name);
 			// if this module is already loaded, the erase will succeed, so we need do nothing
 			// otherwise, we need to add the module (which will be done later)
 			if (removed_modules.erase(name) == 0)
@@ -712,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)
@@ -771,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");
@@ -783,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();