Merge insp20

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

diff --git a/src/server.cpp b/src/server.cpp
index 9e58c9cff5f6f4dfc40b1e4c704ec1ee37ef3f05..42dce137230ad892c743cb456d94c7a702aa132a 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -46,13 +46,10 @@ void InspIRCd::Exit(int status)
 #ifdef _WIN32
        SetServiceStopped(status);
 #endif
-       if (this)
-       {
-               this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
-               this->Cleanup();
-               delete this;
-               ServerInstance = NULL;
-       }
+       this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
+       this->Cleanup();
+       ServerInstance = NULL;
+       delete this;
        exit (status);
 }
 
@@ -61,15 +58,15 @@ void InspIRCd::Rehash(const std::string& uuid)
        if (!ServerInstance->ConfigThread)
        {
                ServerInstance->ConfigThread = new ConfigReaderThread(uuid);
-               ServerInstance->Threads->Start(ServerInstance->ConfigThread);
+               ServerInstance->Threads.Start(ServerInstance->ConfigThread);
        }
 }
 
 std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
        if (getFullVersion)
-               return VERSION " " + Config->ServerName + " :" SYSTEM " [" REVISION "," INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
-       return BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
+               return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_REVISION "," INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
+       return INSPIRCD_BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
 }
 
 std::string UIDGenerator::GenerateSID(const std::string& servername, const std::string& serverdesc)
@@ -184,8 +181,7 @@ void ISupportManager::Build()
        tokens["STATUSMSG"] = ServerInstance->Modes->BuildPrefixes(false);
        tokens["TOPICLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxTopic);
 
-       tokens["FNC"] = tokens["VBANLIST"] =
-               tokens["WALLCHOPS"] = tokens["WALLVOICES"];
+       tokens["FNC"] = tokens["VBANLIST"];
 
        // Modules can add new tokens and also edit or remove existing tokens
        FOREACH_MOD(On005Numeric, (tokens));
@@ -194,15 +190,14 @@ void ISupportManager::Build()
        std::map<std::string, std::string>::iterator extban = tokens.find("EXTBAN");
        if (extban != tokens.end())
        {
-               sort(extban->second.begin(), extban->second.end());
+               std::sort(extban->second.begin(), extban->second.end());
                extban->second.insert(0, ",");
        }
 
        // Transform the map into a list of lines, ready to be sent to clients
-       std::vector<std::string>& lines = this->Lines;
        std::string line;
        unsigned int token_count = 0;
-       lines.clear();
+       cachedlines.clear();
 
        for (std::map<std::string, std::string>::const_iterator it = tokens.begin(); it != tokens.end(); ++it)
        {
@@ -221,7 +216,7 @@ void ISupportManager::Build()
                        // Reached maximum number of tokens for this line or the current token
                        // is the last one; finalize the line and store it for later use
                        line.append(":are supported by this server");
-                       lines.push_back(line);
+                       cachedlines.push_back(line);
                        line.clear();
                }
        }
@@ -229,6 +224,6 @@ void ISupportManager::Build()
 
 void ISupportManager::SendTo(LocalUser* user)
 {
-       for (std::vector<std::string>::const_iterator i = this->Lines.begin(); i != this->Lines.end(); ++i)
+       for (std::vector<std::string>::const_iterator i = cachedlines.begin(); i != cachedlines.end(); ++i)
                user->WriteNumeric(RPL_ISUPPORT, *i);
 }