X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=191a3d30ffd21812a8a0e596ac3399ddd34ea4df;hb=63aa8d0d42f619c52d382bde3e6ba2e5e23b12ac;hp=55c230f9694af47cf289c0bda502cc1520fa85fb;hpb=81fce393e99a940682cf58a1203f4ed03d1887fc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index 55c230f96..191a3d30f 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -31,12 +31,13 @@ void InspIRCd::SignalHandler(int signal)
 #else
 	if (signal == SIGHUP)
 	{
-		Rehash("Caught SIGHUP");
+		ServerInstance->SNO->WriteGlobalSno('a', "Rehashing due to SIGHUP");
+		Rehash();
 	}
 	else if (signal == SIGTERM)
 #endif
 	{
-		Exit(signal);
+		Exit(EXIT_STATUS_SIGTERM);
 	}
 }
 
@@ -45,32 +46,26 @@ void InspIRCd::Exit(int status)
 #ifdef _WIN32
 	SetServiceStopped(status);
 #endif
-	if (this)
-	{
-		this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
-		this->Cleanup();
-		delete this;
-		ServerInstance = NULL;
-	}
+	this->Cleanup();
+	ServerInstance = NULL;
+	delete this;
 	exit (status);
 }
 
-void RehashHandler::Call(const std::string &reason)
+void InspIRCd::Rehash(const std::string& uuid)
 {
-	ServerInstance->SNO->WriteToSnoMask('a', "Rehashing config file %s %s",ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()), reason.c_str());
-	FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
 	if (!ServerInstance->ConfigThread)
 	{
-		ServerInstance->ConfigThread = new ConfigReaderThread("");
-		ServerInstance->Threads->Start(ServerInstance->ConfigThread);
+		ServerInstance->ConfigThread = new ConfigReaderThread(uuid);
+		ServerInstance->Threads.Start(ServerInstance->ConfigThread);
 	}
 }
 
 std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
 	if (getFullVersion)
-		return VERSION " " + Config->ServerName + " :" SYSTEM " [" REVISION "," + SE->GetName() + "," + Config->sid + "]";
-	return BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
+		return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_REVISION "," INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
+	return INSPIRCD_BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
 }
 
 std::string UIDGenerator::GenerateSID(const std::string& servername, const std::string& serverdesc)
@@ -170,10 +165,9 @@ void ISupportManager::Build()
 
 	tokens["AWAYLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxAway);
 	tokens["CASEMAPPING"] = "rfc1459";
-	tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MASK_CHANNEL);
+	tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL);
 	tokens["CHANNELLEN"] = ConvToStr(ServerInstance->Config->Limits.ChanMax);
 	tokens["CHANTYPES"] = "#";
-	tokens["CHARSET"] = "ascii";
 	tokens["ELIST"] = "MU";
 	tokens["KICKLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxKick);
 	tokens["MAXBANS"] = "64"; // TODO: make this a config setting.
@@ -186,25 +180,23 @@ void ISupportManager::Build()
 	tokens["STATUSMSG"] = ServerInstance->Modes->BuildPrefixes(false);
 	tokens["TOPICLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxTopic);
 
-	tokens["FNC"] = tokens["MAP"] = tokens["VBANLIST"] =
-		tokens["WALLCHOPS"] = tokens["WALLVOICES"];
+	tokens["FNC"] = tokens["VBANLIST"];
 
 	// Modules can add new tokens and also edit or remove existing tokens
-	FOREACH_MOD(I_On005Numeric, On005Numeric(tokens));
+	FOREACH_MOD(On005Numeric, (tokens));
 
 	// EXTBAN is a special case as we need to sort it and prepend a comma.
 	std::map<std::string, std::string>::iterator extban = tokens.find("EXTBAN");
 	if (extban != tokens.end())
 	{
-		sort(extban->second.begin(), extban->second.end());
+		std::sort(extban->second.begin(), extban->second.end());
 		extban->second.insert(0, ",");
 	}
 
 	// Transform the map into a list of lines, ready to be sent to clients
-	std::vector<std::string>& lines = this->Lines;
 	std::string line;
 	unsigned int token_count = 0;
-	lines.clear();
+	cachedlines.clear();
 
 	for (std::map<std::string, std::string>::const_iterator it = tokens.begin(); it != tokens.end(); ++it)
 	{
@@ -223,7 +215,7 @@ void ISupportManager::Build()
 			// Reached maximum number of tokens for this line or the current token
 			// is the last one; finalize the line and store it for later use
 			line.append(":are supported by this server");
-			lines.push_back(line);
+			cachedlines.push_back(line);
 			line.clear();
 		}
 	}
@@ -231,6 +223,6 @@ void ISupportManager::Build()
 
 void ISupportManager::SendTo(LocalUser* user)
 {
-	for (std::vector<std::string>::const_iterator i = this->Lines.begin(); i != this->Lines.end(); ++i)
-		user->WriteNumeric(RPL_ISUPPORT, "%s %s", user->nick.c_str(), i->c_str());
+	for (std::vector<std::string>::const_iterator i = cachedlines.begin(); i != cachedlines.end(); ++i)
+		user->WriteNumeric(RPL_ISUPPORT, *i);
 }