Fix cidr_mask::str not correctly displaying mask length

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

diff --git a/src/server.cpp b/src/server.cpp
index e5546654eec6372a180f3f74e34c7d73296b27ce..c5e784a1ce5cd7dd1ba920206ba85faa83545c02 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -18,17 +18,15 @@
 #include "inspircd.h"
 #include "inspircd_version.h"
 
-
 void InspIRCd::SignalHandler(int signal)
 {
-       switch (signal)
+       if (signal == SIGHUP)
+       {
+               Rehash("Caught SIGHUP");
+       }
+       else if (signal == SIGTERM)
        {
-               case SIGHUP:
-                       Rehash("due to SIGHUP");
-                       break;
-               case SIGTERM:
-                       Exit(signal);
-                       break;
+               Exit(signal);
        }
 }
 
@@ -44,6 +42,7 @@ void InspIRCd::Exit(int status)
                this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
                this->Cleanup();
                delete this;
+               ServerInstance = NULL;
        }
        exit (status);
 }
@@ -60,11 +59,6 @@ void RehashHandler::Call(const std::string &reason)
        }
 }
 
-void InspIRCd::RehashServer()
-{
-       this->Rehash("");
-}
-
 std::string InspIRCd::GetVersionString()
 {
        char versiondata[MAXBUF];
@@ -84,18 +78,13 @@ 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=" << Config->Limits.MaxModes - 1 << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax - 1;
-       v << " CASEMAPPING=rfc1459 STATUSMSG=@" << (this->Config->AllowHalfop ? "%" : "") << "+ CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic - 1 << " KICKLEN=" << Config->Limits.MaxKick - 1 << " MAXTARGETS=" << Config->MaxTargets - 1;
+       v << " CASEMAPPING=rfc1459 STATUSMSG=" << Modes->BuildPrefixes(false) << " CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic - 1 << " KICKLEN=" << Config->Limits.MaxKick - 1 << " MAXTARGETS=" << Config->MaxTargets - 1;
        v << " AWAYLEN=" << Config->Limits.MaxAway - 1 << " CHANMODES=" << this->Modes->GiveModeList(MASK_CHANNEL) << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
        Config->data005 = v.str();
        FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005));
        Config->Update005();
 }
 
-std::string InspIRCd::GetRevision()
-{
-       return REVISION;
-}
-
 void InspIRCd::IncrementUID(int pos)
 {
        /*
@@ -110,7 +99,7 @@ void InspIRCd::IncrementUID(int pos)
                // At pos 3, if we hit '9', we've run out of available UIDs, and need to reset to AAA..AAA.
                if (current_uid[pos] == '9')
                {
-                       for (int i = 3; i < UUID_LENGTH; i++)
+                       for (int i = 3; i < (UUID_LENGTH - 1); i++)
                        {
                                current_uid[i] = 'A';
                                pos  = UUID_LENGTH - 1;