X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=df7721e826adfe0d4bc5ac327fc3c318d8b49c0e;hb=92eda175245c3d3da6b41af5c52d1540a23a0dc3;hp=83b7e14d9bfbe34789da418f14e1f49f87759299;hpb=743c10e4ca5acd45e670b335a07b5bf3ab754ab6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 83b7e14d9..df7721e82 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -47,7 +47,7 @@ ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
 	dns_timeout = DieDelay = 5;
 	MaxTargets = 20;
 	NetBufferSize = 10240;
-	SoftLimit = MAXCLIENTS;
+	SoftLimit = Instance->SE->GetMaxFds();
 	MaxConn = SOMAXCONN;
 	MaxWhoResults = 0;
 	debugging = 0;
@@ -63,32 +63,12 @@ void ServerConfig::ClearStack()
 	include_stack.clear();
 }
 
-Module* ServerConfig::GetIOHook(int port)
-{
-	std::map<int,Module*>::iterator x = IOHookModule.find(port);
-	return (x != IOHookModule.end() ? x->second : NULL);
-}
-
 Module* ServerConfig::GetIOHook(BufferedSocket* is)
 {
 	std::map<BufferedSocket*,Module*>::iterator x = SocketIOHookModule.find(is);
 	return (x != SocketIOHookModule.end() ? x->second : NULL);
 }
 
-bool ServerConfig::AddIOHook(int port, Module* iomod)
-{
-	if (!GetIOHook(port))
-	{
-		IOHookModule[port] = iomod;
-		return true;
-	}
-	else
-	{
-		throw ModuleException("Port already hooked by another module");
-		return false;
-	}
-}
-
 bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is)
 {
 	if (!GetIOHook(is))
@@ -104,17 +84,6 @@ bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is)
 	}
 }
 
-bool ServerConfig::DelIOHook(int port)
-{
-	std::map<int,Module*>::iterator x = IOHookModule.find(port);
-	if (x != IOHookModule.end())
-	{
-		IOHookModule.erase(x);
-		return true;
-	}
-	return false;
-}
-
 bool ServerConfig::DelIOHook(BufferedSocket* is)
 {
 	std::map<BufferedSocket*,Module*>::iterator x = SocketIOHookModule.find(is);
@@ -292,10 +261,10 @@ bool ValidateMaxTargets(ServerConfig* conf, const char*, const char*, ValueItem
 
 bool ValidateSoftLimit(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-	if ((data.GetInteger() < 1) || (data.GetInteger() > MAXCLIENTS))
+	if ((data.GetInteger() < 1) || (data.GetInteger() > conf->GetInstance()->SE->GetMaxFds()))
 	{
-		conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
-		data.Set(MAXCLIENTS);
+		conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",conf->GetInstance()->SE->GetMaxFds(),conf->GetInstance()->SE->GetMaxFds());
+		data.Set(conf->GetInstance()->SE->GetMaxFds());
 	}
 	return true;
 }
@@ -772,7 +741,7 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail,
 			ServerInstance->SNO->WriteToSnoMask('A', "There were errors in the configuration file:");
 			while (start < errors.length())
 			{
-				ServerInstance->SNO->WriteToSnoMask('A', errors.substr(start, 360).c_str());
+				ServerInstance->SNO->WriteToSnoMask('A', errors.substr(start, 360));
 				start += 360;
 			}
 		}
@@ -798,7 +767,7 @@ void ServerConfig::Read(bool bail, User* user)
 
 	/* These tags can occur ONCE or not at all */
 	InitialConfig Values[] = {
-		{"options",	"softlimit",	MAXCLIENTS_S,		new ValueContainerUInt (&this->SoftLimit),		DT_INTEGER,  ValidateSoftLimit},
+		{"options",	"softlimit",	"0",			new ValueContainerUInt (&this->SoftLimit),		DT_INTEGER,  ValidateSoftLimit},
 		{"options",	"somaxconn",	SOMAXCONN_S,		new ValueContainerInt  (&this->MaxConn),		DT_INTEGER,  ValidateMaxConn},
 		{"options",	"moronbanner",	"Youre banned!",	new ValueContainerChar (this->MoronBanner),		DT_CHARPTR,  NoValidation},
 		{"server",	"name",		"",			new ValueContainerChar (this->ServerName),		DT_HOSTNAME|DT_BOOTONLY, ValidateServerName},
@@ -1176,12 +1145,12 @@ void ServerConfig::Read(bool bail, User* user)
 	// write once here, to try it out and make sure its ok
 	ServerInstance->WritePID(this->PID);
 
-	ServerInstance->Log(DEFAULT,"Done reading configuration file.");
-
 	/* Switch over logfiles */
 	ServerInstance->Logs->CloseLogs();
 	ServerInstance->Logs->OpenFileLogs();
 
+	ServerInstance->Logs->Log("CONFIG", DEFAULT, "Done reading configuration file.");
+
 	/* If we're rehashing, let's load any new modules, and unload old ones
 	 */
 	if (!bail)
@@ -1246,7 +1215,7 @@ void ServerConfig::Read(bool bail, User* user)
 			}
 		}
 
-		ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
+		ServerInstance->Logs->Log("CONFIG", DEFAULT, "Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
 
 		ServerInstance->Threads->Mutex(false);