1 files changed, 126 insertions, 88 deletions

diff --git a/src/server.cpp b/src/server.cpp
index d05ece8a4..f18c9c86c 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -23,7 +23,6 @@
 #include <signal.h>
 #include "exitcodes.h"
 #include "inspircd.h"
-#include "inspircd_version.h"
 
 void InspIRCd::SignalHandler(int signal)
 {
@@ -32,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);
 	}
 }
 
@@ -46,55 +46,43 @@ void InspIRCd::Exit(int status)
 #ifdef _WIN32
 	SetServiceStopped(status);
 #endif
-	this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
 	this->Cleanup();
-	delete this;
 	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());
-	ServerInstance->RehashUsersAndChans();
-	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 operstring)
+std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
-	char versiondata[MAXBUF];
-	if (operstring)
-	{
-		std::string sename = SE->GetName();
-		snprintf(versiondata,MAXBUF,"%s %s :%s [%s,%s,%s]",VERSION, Config->ServerName.c_str(), SYSTEM,REVISION, sename.c_str(), Config->sid.c_str());
-	}
-	else
-		snprintf(versiondata,MAXBUF,"%s %s :%s",BRANCH,Config->ServerName.c_str(),Config->CustomVersion.c_str());
-	return versiondata;
+	if (getFullVersion)
+		return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
+	return INSPIRCD_BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
 }
 
-const char InspIRCd::LogHeader[] =
-	"Log started for " VERSION " (" REVISION ", " MODULE_INIT_STR ")"
-	" - compiled on " SYSTEM;
-
-void InspIRCd::BuildISupport()
+std::string UIDGenerator::GenerateSID(const std::string& servername, const std::string& serverdesc)
 {
-	// 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=" << Modes->BuildPrefixes(false) << " 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" << " CHANNELLEN=" << Config->Limits.ChanMax;
-	Config->data005 = v.str();
-	FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005));
-	Config->Update005();
+	unsigned int sid = 0;
+
+	for (std::string::const_iterator i = servername.begin(); i != servername.end(); ++i)
+		sid = 5 * sid + *i;
+	for (std::string::const_iterator i = serverdesc.begin(); i != serverdesc.end(); ++i)
+		sid = 5 * sid + *i;
+
+	std::string sidstr = ConvToStr(sid % 1000);
+	sidstr.insert(0, 3 - sidstr.length(), '0');
+	return sidstr;
 }
 
-void InspIRCd::IncrementUID(int pos)
+void UIDGenerator::IncrementUID(unsigned int pos)
 {
 	/*
 	 * Okay. The rules for generating a UID go like this...
@@ -103,85 +91,135 @@ void InspIRCd::IncrementUID(int pos)
 	 * A again, in an iterative fashion.. so..
 	 * AAA9 -> AABA, and so on. -- w00t
 	 */
-	if ((pos == 3) && (current_uid[3] == '9'))
+
+	// If we hit Z, wrap around to 0.
+	if (current_uid[pos] == 'Z')
 	{
-		// At pos 3, if we hit '9', we've run out of available UIDs, and need to reset to AAA..AAA.
-		for (int i = 3; i < UUID_LENGTH-1; i++)
+		current_uid[pos] = '0';
+	}
+	else if (current_uid[pos] == '9')
+	{
+		/*
+		 * Or, if we hit 9, wrap around to pos = 'A' and (pos - 1)++,
+		 * e.g. A9 -> BA -> BB ..
+		 */
+		current_uid[pos] = 'A';
+		if (pos == 3)
 		{
-			current_uid[i] = 'A';
+			// At pos 3, if we hit '9', we've run out of available UIDs, and reset to AAA..AAA.
+			return;
 		}
+		this->IncrementUID(pos - 1);
 	}
 	else
 	{
-		// If we hit Z, wrap around to 0.
-		if (current_uid[pos] == 'Z')
-		{
-			current_uid[pos] = '0';
-		}
-		else if (current_uid[pos] == '9')
-		{
-			/*
-			 * Or, if we hit 9, wrap around to pos = 'A' and (pos - 1)++,
-			 * e.g. A9 -> BA -> BB ..
-			 */
-			current_uid[pos] = 'A';
-			this->IncrementUID(pos - 1);
-		}
-		else
-		{
-			// Anything else, nobody gives a shit. Just increment.
-			current_uid[pos]++;
-		}
+		// Anything else, nobody gives a shit. Just increment.
+		current_uid[pos]++;
 	}
 }
 
-/*
- * Retrieve the next valid UUID that is free for this server.
- */
-std::string InspIRCd::GetUID()
+void UIDGenerator::init(const std::string& sid)
 {
-	static bool inited = false;
-
 	/*
-	 * If we're setting up, copy SID into the first three digits, 9's to the rest, null term at the end
+	 * Copy SID into the first three digits, 9's to the rest, null term at the end
 	 * Why 9? Well, we increment before we find, otherwise we have an unnecessary copy, and I want UID to start at AAA..AA
 	 * and not AA..AB. So by initialising to 99999, we force it to rollover to AAAAA on the first IncrementUID call.
 	 * Kind of silly, but I like how it looks.
 	 *		-- w
 	 */
-	if (!inited)
-	{
-		inited = true;
-		current_uid[0] = Config->sid[0];
-		current_uid[1] = Config->sid[1];
-		current_uid[2] = Config->sid[2];
-
-		for (int i = 3; i < (UUID_LENGTH - 1); i++)
-			current_uid[i] = '9';
 
-		// Null terminator. Important.
-		current_uid[UUID_LENGTH - 1] = '\0';
-	}
+	current_uid.resize(UUID_LENGTH, '9');
+	current_uid[0] = sid[0];
+	current_uid[1] = sid[1];
+	current_uid[2] = sid[2];
+}
 
+/*
+ * Retrieve the next valid UUID that is free for this server.
+ */
+std::string UIDGenerator::GetUID()
+{
 	while (1)
 	{
 		// Add one to the last UID
-		this->IncrementUID(UUID_LENGTH - 2);
+		this->IncrementUID(UUID_LENGTH - 1);
 
-		if (this->FindUUID(current_uid))
-		{
-			/*
-			 * It's in use. We need to try the loop again.
-			 */
-			continue;
-		}
+		if (!ServerInstance->FindUUID(current_uid))
+			break;
 
-		return current_uid;
+		/*
+		 * It's in use. We need to try the loop again.
+		 */
 	}
 
-	/* not reached. */
-	return "";
+	return current_uid;
 }
 
+void ISupportManager::Build()
+{
+	/**
+	 * This is currently the neatest way we can build the initial ISUPPORT map. In
+	 * the future we can use an initializer list here.
+	 */
+	std::map<std::string, std::string> tokens;
+
+	tokens["AWAYLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxAway);
+	tokens["CASEMAPPING"] = ServerInstance->Config->CaseMapping;
+	tokens["CHANLIMIT"] = InspIRCd::Format("#:%u", ServerInstance->Config->MaxChans);
+	tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL);
+	tokens["CHANNELLEN"] = ConvToStr(ServerInstance->Config->Limits.ChanMax);
+	tokens["CHANTYPES"] = "#";
+	tokens["ELIST"] = "MU";
+	tokens["KICKLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxKick);
+	tokens["MAXTARGETS"] = ConvToStr(ServerInstance->Config->MaxTargets);
+	tokens["MODES"] = ConvToStr(ServerInstance->Config->Limits.MaxModes);
+	tokens["NETWORK"] = ServerInstance->Config->Network;
+	tokens["NICKLEN"] = ConvToStr(ServerInstance->Config->Limits.NickMax);
+	tokens["PREFIX"] = ServerInstance->Modes->BuildPrefixes();
+	tokens["STATUSMSG"] = ServerInstance->Modes->BuildPrefixes(false);
+	tokens["TOPICLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxTopic);
+	tokens["VBANLIST"];
+
+	// Modules can add new tokens and also edit or remove existing 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())
+	{
+		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
+	Numeric::Numeric numeric(RPL_ISUPPORT);
+	unsigned int token_count = 0;
+	cachedlines.clear();
 
+	for (std::map<std::string, std::string>::const_iterator it = tokens.begin(); it != tokens.end(); ++it)
+	{
+		numeric.push(it->first);
+		std::string& token = numeric.GetParams().back();
+
+		// If this token has a value then append a '=' char after the name and then the value itself
+		if (!it->second.empty())
+			token.append(1, '=').append(it->second);
+
+		token_count++;
+
+		if (token_count % 13 == 12 || it == --tokens.end())
+		{
+			// 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
+			numeric.push("are supported by this server");
+			cachedlines.push_back(numeric);
+			numeric.GetParams().clear();
+		}
+	}
+}
+
+void ISupportManager::SendTo(LocalUser* user)
+{
+	for (std::vector<Numeric::Numeric>::const_iterator i = cachedlines.begin(); i != cachedlines.end(); ++i)
+		user->WriteNumeric(*i);
+}