X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=c72ac1f912a8ad5e228a36ce8d962b66fa8b6f28;hb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;hp=f259e44359a8fefdd02992bceb12e4c4be9b74bd;hpb=f017306e4ef286059a1a63059309355b4b4bca77;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index f259e4435..c72ac1f91 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,6 +11,8 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDserver */
+
 #include <signal.h>
 #include "exitcodes.h"
 #include "inspircd.h"
@@ -38,18 +40,19 @@ void InspIRCd::Exit(int status)
 	{
 		this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
 		this->Cleanup();
-    }
-    exit (status);
+	}
+	exit (status);
 }
 
 void InspIRCd::Rehash()
 {
 	this->WriteOpers("*** Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(this->ConfigFileName));
 	this->CloseLog();
-	this->OpenLog(this->Config->argv, this->Config->argc);
+	if (!this->OpenLog(this->Config->argv, this->Config->argc))
+		this->WriteOpers("*** ERROR: Could not open logfile %s: %s", Config->logpath.c_str(), strerror(errno));
 	this->RehashUsersAndChans();
 	FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
-	this->Config->Read(false,NULL);
+	/*this->Config->Read(false,NULL);*/
 	this->ResetMaxBans();
 	this->Res->Rehash();
 	FOREACH_MOD_I(this,I_OnRehash,OnRehash(NULL,""));
@@ -60,7 +63,7 @@ void InspIRCd::RehashServer()
 {
 	this->WriteOpers("*** Rehashing config file");
 	this->RehashUsersAndChans();
-	this->Config->Read(false,NULL);
+	/*this->Config->Read(false,NULL);*/
 	this->ResetMaxBans();
 	this->Res->Rehash();
 }
@@ -68,15 +71,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,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),Config->sid);
 	}
 	return versiondata;
 }
@@ -85,9 +86,9 @@ 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=" << MAXMODES-1 << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
-	v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN=";
-	v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
+	v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
+	v << " CASEMAPPING=rfc1459 STATUSMSG=@" << (this->Config->AllowHalfop ? "%" : "") << "+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets;
+	v << " AWAYLEN=" << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
 	Config->data005 = v.str();
 	FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
 	Config->Update005();
@@ -130,3 +131,79 @@ bool InspIRCd::FindServerName(const std::string &servername)
 	return false;
 }
 
+/*
+ * Retrieve the next valid UUID that is free for this server.
+ */
+std::string InspIRCd::GetUID()
+{
+	int i;
+
+	/*
+	 * 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...
+		 * -- > 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';
+
+				/* we also need to increment the next digit. */
+				continue;
+			}
+			else
+			{
+				/* most common case .. increment current UID */
+				current_uid[i]++;
+			}
+
+			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;
+			}
+
+			return current_uid;
+		}
+	}
+
+	/* not reached. */
+	return "";
+}
+
+
+