Put back different stats numerics for /stats g, /stats k etc

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

diff --git a/src/server.cpp b/src/server.cpp
index 041b9f5ddd839ddf7901deb3ca86b9f13ba2f2e7..f163bc7335e5ae573b6f9d68bc9c2fe338823d4a 100644 (file)
--- 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;
 }
@@ -175,9 +177,11 @@ std::string InspIRCd::GetUID()
 
                        if (current_uid[3] == 'Z')
                        {
-                               /* If we get to here, we need to wrap around to AAAA. */
-                               for(int j = 3; j < UUID_LENGTH - 1; j++)
-                                       current_uid[j] = 'A';
+                               /*
+                                * 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 (),