X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=f163bc7335e5ae573b6f9d68bc9c2fe338823d4a;hb=3593e33ce374caee9aec0575b49ec9b0001a8ec6;hp=a18610fab9a6d42b3e797a723df0572b29bdc63a;hpb=c125dd1decee96ddbde3cfd5dc72fe2206c87376;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index a18610fab..f163bc733 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -11,6 +11,8 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDserver */
+
 #include <signal.h>
 #include "exitcodes.h"
 #include "inspircd.h"
@@ -31,6 +33,7 @@ void InspIRCd::SignalHandler(int signal)
 
 void InspIRCd::Exit(int status)
 {
+	printf("exit with status %d\n", status);
 #ifdef WINDOWS
 	delete WindowsIPC;
 #endif
@@ -38,8 +41,9 @@ void InspIRCd::Exit(int status)
 	{
 		this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
 		this->Cleanup();
-    }
-    exit (status);
+	}
+	printf("Exit done.\n");
+	exit (status);
 }
 
 void InspIRCd::Rehash()
@@ -69,15 +73,13 @@ void InspIRCd::RehashServer()
 std::string InspIRCd::GetVersionString()
 {
 	char versiondata[MAXBUF];
-	char dnsengine[] = "singlethread-object";
-
 	if (*Config->CustomVersion)
 	{
 		snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion);
 	}
 	else
 	{
-		snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),dnsengine);
+		snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%d]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),Config->sid);
 	}
 	return versiondata;
 }
@@ -136,10 +138,12 @@ bool InspIRCd::FindServerName(const std::string &servername)
  */
 std::string InspIRCd::GetUID()
 {
-	bool HasUID = false;
 	int i;
 
-	while (!HasUID)
+	/*
+	 * This will only finish once we return a UUID that is not in use.
+	 */
+	while (1)
 	{
 		/*
 		 * Okay. The rules for generating a UID go like this...
@@ -171,22 +175,35 @@ std::string InspIRCd::GetUID()
 				current_uid[i]++;
 			}
 
-			/*
-			 * XXX!
-			 * Check if it's in use here, continue; if it is!
-			 * This will only be an issue once we have a server that gets
-			 * an assload of connections, but.. -- w00t
-			 *
-			 * Until we have a map to check, just bail. -- w00t
-			 */
 			if (current_uid[3] == 'Z')
 			{
-				InspIRCd::Exit(0);
+				/*
+				 * 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;
+				
 			}
 			
-			return std::string(current_uid);
+			if (this->FindUUID(current_uid))
+			{
+				/*
+				 * It's in use. We need to try the loop again.
+				 */
+				continue;
+			}
+
+			return current_uid;
 		}
 	}
+
+	/* not reached. */
 	return "";
 }