Make m_password_hash able to pick up hasher modules after it's loaded, meaning m_md5...

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

diff --git a/src/server.cpp b/src/server.cpp
index ac693adb1da9e09ec49447c02d7eeb99d708409f..a73abcac271e2b06c05c78798bf04b1e7e8827d2 100644 (file)
--- 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,19 +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->SNO->WriteToSnoMask('A', "Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(this->ConfigFileName));
        this->CloseLog();
        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->SNO->WriteToSnoMask('A', "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,""));
@@ -59,9 +61,9 @@ void InspIRCd::Rehash()
 
 void InspIRCd::RehashServer()
 {
-       this->WriteOpers("*** Rehashing config file");
+       this->SNO->WriteToSnoMask('A', "Rehashing config file");
        this->RehashUsersAndChans();
-       this->Config->Read(false,NULL);
+       /*this->Config->Read(false,NULL);*/
        this->ResetMaxBans();
        this->Res->Rehash();
 }
@@ -69,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;
 }
@@ -86,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();
@@ -136,10 +136,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 +173,36 @@ 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 "";
 }