X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver.cpp;h=e5546654eec6372a180f3f74e34c7d73296b27ce;hb=26cd5393c9308fabe73c41870f06f73a5b001cd7;hp=3e607e032097f0d4d65849a16fd763a7d356441b;hpb=7b6eae36661bc798f69b22393b85a4f06d533cf6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index 3e607e032..e5546654e 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -16,6 +16,7 @@
 #include <signal.h>
 #include "exitcodes.h"
 #include "inspircd.h"
+#include "inspircd_version.h"
 
 
 void InspIRCd::SignalHandler(int signal)
@@ -42,25 +43,21 @@ void InspIRCd::Exit(int status)
 	{
 		this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
 		this->Cleanup();
+		delete this;
 	}
 	exit (status);
 }
 
 void RehashHandler::Call(const std::string &reason)
 {
-	Server->RehashFinishMutex->Lock();
-	Server->SNO->WriteToSnoMask('A', "Rehashing config file %s %s",ServerConfig::CleanFilename(Server->ConfigFileName), reason.c_str());
-	Server->RehashUsersAndChans();
-	FOREACH_MOD_I(Server, I_OnGarbageCollect, OnGarbageCollect());
-	if (!Server->ConfigThread)
+	ServerInstance->SNO->WriteToSnoMask('a', "Rehashing config file %s %s",ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()), reason.c_str());
+	ServerInstance->RehashUsersAndChans();
+	FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
+	if (!ServerInstance->ConfigThread)
 	{
-		Server->Config->RehashUserUID = "";
-		Server->Config->RehashParameter = "";
-
-		Server->ConfigThread = new ConfigReaderThread(Server, false, "");
-		Server->Threads->Start(Server->ConfigThread);
+		ServerInstance->ConfigThread = new ConfigReaderThread("");
+		ServerInstance->Threads->Start(ServerInstance->ConfigThread);
 	}
-	Server->RehashFinishMutex->Unlock();
 }
 
 void InspIRCd::RehashServer()
@@ -71,13 +68,13 @@ void InspIRCd::RehashServer()
 std::string InspIRCd::GetVersionString()
 {
 	char versiondata[MAXBUF];
-	if (*Config->CustomVersion)
+	if (!Config->CustomVersion.empty())
 	{
-		snprintf(versiondata,MAXBUF,"InspIRCd-1.2 %s :%s",Config->ServerName,Config->CustomVersion);
+		snprintf(versiondata,MAXBUF,"InspIRCd-2.0 %s :%s",Config->ServerName.c_str(),Config->CustomVersion.c_str());
 	}
 	else
 	{
-		snprintf(versiondata,MAXBUF,"InspIRCd-1.2 %s :%s (%s) [FLAGS=%s,%s,%s]",Config->ServerName,SYSTEM,VERSION,REVISION,SE->GetName().c_str(),Config->sid);
+		snprintf(versiondata,MAXBUF,"InspIRCd-2.0 %s :%s (%s) [FLAGS=%s,%s,%s]",Config->ServerName.c_str(),SYSTEM,VERSION,REVISION,SE->GetName().c_str(),Config->sid.c_str());
 	}
 	return versiondata;
 }
@@ -86,11 +83,11 @@ void InspIRCd::BuildISupport()
 {
 	// the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
 	std::stringstream v;
-	v << "WALLCHOPS WALLVOICES MODES=" << Config->Limits.MaxModes << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax;
-	v << " CASEMAPPING=rfc1459 STATUSMSG=@" << (this->Config->AllowHalfop ? "%" : "") << "+ CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic << " KICKLEN=" << Config->Limits.MaxKick << " MAXTARGETS=" << Config->MaxTargets;
-	v << " AWAYLEN=" << Config->Limits.MaxAway << " CHANMODES=" << this->Modes->GiveModeList(MASK_CHANNEL) << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
+	v << "WALLCHOPS WALLVOICES MODES=" << Config->Limits.MaxModes - 1 << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax - 1;
+	v << " CASEMAPPING=rfc1459 STATUSMSG=@" << (this->Config->AllowHalfop ? "%" : "") << "+ CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic - 1 << " KICKLEN=" << Config->Limits.MaxKick - 1 << " MAXTARGETS=" << Config->MaxTargets - 1;
+	v << " AWAYLEN=" << Config->Limits.MaxAway - 1 << " CHANMODES=" << this->Modes->GiveModeList(MASK_CHANNEL) << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
 	Config->data005 = v.str();
-	FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
+	FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005));
 	Config->Update005();
 }
 
@@ -99,38 +96,6 @@ std::string InspIRCd::GetRevision()
 	return REVISION;
 }
 
-void InspIRCd::AddServerName(const std::string &servername)
-{
-	servernamelist::iterator itr = servernames.begin();
-	for(; itr != servernames.end(); ++itr)
-		if(**itr == servername)
-			return;
-
-	std::string * ns = new std::string(servername);
-	servernames.push_back(ns);
-}
-
-const char* InspIRCd::FindServerNamePtr(const std::string &servername)
-{
-	servernamelist::iterator itr = servernames.begin();
-	for(; itr != servernames.end(); ++itr)
-		if(**itr == servername)
-			return (*itr)->c_str();
-
-	servernames.push_back(new std::string(servername));
-	itr = --servernames.end();
-	return (*itr)->c_str();
-}
-
-bool InspIRCd::FindServerName(const std::string &servername)
-{
-	servernamelist::iterator itr = servernames.begin();
-	for(; itr != servernames.end(); ++itr)
-		if(**itr == servername)
-			return true;
-	return false;
-}
-
 void InspIRCd::IncrementUID(int pos)
 {
 	/*