Fixed m_saquit to direct the command to the user's server and from there send a QUIT...

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

diff --git a/src/server.cpp b/src/server.cpp
index 1ab5b5efdc51eb9614725c66b7f0d35ba3bbe9c9..2722c6831966840b145ad9f0c59bce05e88c2499 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -69,15 +69,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;
 }
@@ -86,7 +84,7 @@ 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 << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " 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";
        Config->data005 = v.str();
@@ -131,9 +129,78 @@ 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 "";
 }