Add options:maxtargets that was somehow omitted, fixes bug #400 (Reported by DarkStorm)

[user/henk/code/inspircd.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 0f931da075ec85aae28d5ff043450a5a79bc37e8..162ffeb201ea9261175b9510896c8180e3e8d769 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -32,7 +32,7 @@ void InspIRCd::SignalHandler(int signal)
 void InspIRCd::Exit(int status)
 {
 #ifdef WINDOWS
-       CloseIPC();
+       delete WindowsIPC;
 #endif
        if (this)
        {
@@ -46,7 +46,8 @@ 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);
@@ -130,3 +131,64 @@ bool InspIRCd::FindServerName(const std::string &servername)
        return false;
 }
 
+/*
+ * Retrieve the next valid UUID that is free for this server.
+ */
+std::string InspIRCd::GetUID()
+{
+       bool HasUID = false;
+       int i;
+
+       while (!HasUID)
+       {
+               /*
+                * 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]++;
+                       }
+
+                       /*
+                        * 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);
+                       }
+                       
+                       return std::string(current_uid);
+               }
+       }
+       return "";
+}
+
+
+