X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=d0023edd453e838b9bce5b54932a78077d24abdc;hb=7dadb07a19280936147b91144f27d8528ba35c7c;hp=102fb35d3c80b99e01e8ee4ffb21b427df06d535;hpb=11f1f2126c3e1f1cb91f5d6e273eba2850ca61a8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index 102fb35d3..d0023edd4 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -6,7 +6,7 @@
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -49,20 +49,28 @@ void InspIRCd::Rehash()
 	this->SNO->WriteToSnoMask('A', "Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(this->ConfigFileName));
 	this->RehashUsersAndChans();
 	FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
-	/*this->Config->Read(false,NULL);*/
-	this->ResetMaxBans();
-	this->Res->Rehash();
-	FOREACH_MOD_I(this,I_OnRehash,OnRehash(NULL,""));
-	this->BuildISupport();
+	if (!this->ConfigThread)
+	{
+		Config->RehashUser = NULL;
+		Config->RehashParameter = "";
+
+		ConfigThread = new ConfigReaderThread(this, false, NULL);
+		Threads->Create(ConfigThread);
+	}
 }
 
 void InspIRCd::RehashServer()
 {
 	this->SNO->WriteToSnoMask('A', "Rehashing config file");
 	this->RehashUsersAndChans();
-	/*this->Config->Read(false,NULL);*/
-	this->ResetMaxBans();
-	this->Res->Rehash();
+	if (!this->ConfigThread)
+	{
+		Config->RehashUser = NULL;
+		Config->RehashParameter = "";
+
+		ConfigThread = new ConfigReaderThread(this, false, NULL);
+		Threads->Create(ConfigThread);
+	}
 }
 
 std::string InspIRCd::GetVersionString()
@@ -128,74 +136,99 @@ bool InspIRCd::FindServerName(const std::string &servername)
 	return false;
 }
 
+void InspIRCd::IncrementUID(int pos)
+{
+	/*
+	 * Okay. The rules for generating a UID go like this...
+	 * -- > ABCDEFGHIJKLMNOPQRSTUVWXYZ --> 012345679 --> WRAP
+	 * That is, we start at A. When we reach Z, we go to 0. At 9, we go to
+	 * A again, in an iterative fashion.. so..
+	 * AAA9 -> AABA, and so on. -- w00t
+	 */
+	if (pos == 3)
+	{
+		// At pos 3, if we hit '9', we've run out of available UIDs, and need to reset to AAA..AAA.
+		if (current_uid[pos] == '9')
+		{
+			for (int i = 3; i < UUID_LENGTH; i++)
+			{
+				current_uid[i] = 'A';
+				pos  = UUID_LENGTH - 1;	
+			}
+		}
+		else
+		{
+			// Buf if we haven't, just keep incrementing merrily.
+			current_uid[pos]++;
+		}
+	}
+	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]++;
+		}
+	}
+}
+
 /*
  * Retrieve the next valid UUID that is free for this server.
  */
 std::string InspIRCd::GetUID()
 {
-	int i;
+	static int curindex = -1;
 
 	/*
-	 * This will only finish once we return a UUID that is not in use.
+	 * If -1, we're setting up. 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
 	 */
-	while (1)
+	if (curindex == -1)
 	{
-		/*
-		 * Okay. The rules for generating a UID go like this...
-		 * -- > ABCDEFGHIJKLMNOPQRSTUVWXYZ --> 012345679 --> WRAP
-		 * That is, we start at A. When we reach Z, we go to 0. At 9, we go to
-		 * A again, in an iterative fashion.. so..
-		 * AAA9 -> AABA, and so on. -- w00t
-		 */
-
-		/* start at the end of the current UID string, work backwards. don't trample on SID! */
-		for (i = UUID_LENGTH - 2; i > 3; i--)
-		{
-			if (current_uid[i] == 'Z')
-			{
-				/* reached the end of alphabetical, go to numeric range */
-				current_uid[i] = '0';
-			}
-			else if (current_uid[i] == '9')
-			{
-				/* we reached the end of the sequence, set back to A */
-				current_uid[i] = 'A';
+		current_uid[0] = Config->sid[0];
+		current_uid[1] = Config->sid[1];
+		current_uid[2] = Config->sid[2];
 
-				/* we also need to increment the next digit. */
-				continue;
-			}
-			else
-			{
-				/* most common case .. increment current UID */
-				current_uid[i]++;
-			}
+		for (int i = 3; i < (UUID_LENGTH - 1); i++)
+			current_uid[i] = '9';
 
-			if (current_uid[3] == 'Z')
-			{
-				/*
-				 * Ugh. We have run out of room.. roll back around to the
-				 * start of the UUID namespace. -- w00t
-				 */
-				this->InitialiseUID();
-
-				/*
-				 * and now we need to break the inner for () to continue the while (),
-				 * which will start the checking process over again. -- w00t
-				 */
-				break;
-				
-			}
-			
-			if (this->FindUUID(current_uid))
-			{
-				/*
-				 * It's in use. We need to try the loop again.
-				 */
-				continue;
-			}
+		curindex = UUID_LENGTH - 2; // look at the end of the string now kthx, ignore null
+
+		// Null terminator. Important.
+		current_uid[UUID_LENGTH - 1] = '\0';
+	}
+
+	while (1)
+	{
+		// Add one to the last UID
+		this->IncrementUID(curindex);
 
-			return current_uid;
+		if (this->FindUUID(current_uid))
+		{
+			/*
+			 * It's in use. We need to try the loop again.
+			 */
+			continue;
 		}
+
+		return current_uid;
 	}
 
 	/* not reached. */