Merge pull request #1271 from SaberUK/master+exemption

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

diff --git a/src/server.cpp b/src/server.cpp
index 256ccfc4c0540a1e2f06c3d914f5b68ce8757a14..6782187fe2989aaddbfbaf6ac48fbd8fb8e7158d 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -46,13 +46,9 @@ 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();
-               ServerInstance = NULL;
-               delete this;
-       }
+       this->Cleanup();
+       ServerInstance = NULL;
+       delete this;
        exit (status);
 }
 
@@ -68,7 +64,7 @@ void InspIRCd::Rehash(const std::string& uuid)
 std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
        if (getFullVersion)
-               return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_REVISION "," INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
+               return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
        return INSPIRCD_BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
 }
 
@@ -169,13 +165,12 @@ void ISupportManager::Build()
 
        tokens["AWAYLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxAway);
        tokens["CASEMAPPING"] = "rfc1459";
+       tokens["CHANLIMIT"] = InspIRCd::Format("#:%u", ServerInstance->Config->MaxChans);
        tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL);
        tokens["CHANNELLEN"] = ConvToStr(ServerInstance->Config->Limits.ChanMax);
        tokens["CHANTYPES"] = "#";
        tokens["ELIST"] = "MU";
        tokens["KICKLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxKick);
-       tokens["MAXBANS"] = "64"; // TODO: make this a config setting.
-       tokens["MAXCHANNELS"] = ConvToStr(ServerInstance->Config->MaxChans);
        tokens["MAXTARGETS"] = ConvToStr(ServerInstance->Config->MaxTargets);
        tokens["MODES"] = ConvToStr(ServerInstance->Config->Limits.MaxModes);
        tokens["NETWORK"] = ServerInstance->Config->Network;
@@ -183,8 +178,7 @@ void ISupportManager::Build()
        tokens["PREFIX"] = ServerInstance->Modes->BuildPrefixes();
        tokens["STATUSMSG"] = ServerInstance->Modes->BuildPrefixes(false);
        tokens["TOPICLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxTopic);
-
-       tokens["FNC"] = tokens["VBANLIST"];
+       tokens["VBANLIST"];
 
        // Modules can add new tokens and also edit or remove existing tokens
        FOREACH_MOD(On005Numeric, (tokens));
@@ -198,35 +192,34 @@ void ISupportManager::Build()
        }
 
        // Transform the map into a list of lines, ready to be sent to clients
-       std::string line;
+       Numeric::Numeric numeric(RPL_ISUPPORT);
        unsigned int token_count = 0;
        cachedlines.clear();
 
        for (std::map<std::string, std::string>::const_iterator it = tokens.begin(); it != tokens.end(); ++it)
        {
-               line.append(it->first);
+               numeric.push(it->first);
+               std::string& token = numeric.GetParams().back();
 
                // If this token has a value then append a '=' char after the name and then the value itself
                if (!it->second.empty())
-                       line.append(1, '=').append(it->second);
+                       token.append(1, '=').append(it->second);
 
-               // Always append a space, even if it's the last token because all lines will be suffixed
-               line.push_back(' ');
                token_count++;
 
                if (token_count % 13 == 12 || it == --tokens.end())
                {
                        // 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");
-                       cachedlines.push_back(line);
-                       line.clear();
+                       numeric.push("are supported by this server");
+                       cachedlines.push_back(numeric);
+                       numeric.GetParams().clear();
                }
        }
 }
 
 void ISupportManager::SendTo(LocalUser* user)
 {
-       for (std::vector<std::string>::const_iterator i = cachedlines.begin(); i != cachedlines.end(); ++i)
-               user->WriteNumeric(RPL_ISUPPORT, *i);
+       for (std::vector<Numeric::Numeric>::const_iterator i = cachedlines.begin(); i != cachedlines.end(); ++i)
+               user->WriteNumeric(*i);
 }