Convert WriteNumeric() calls to pass the parameters of the numeric as method parameters

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

diff --git a/src/server.cpp b/src/server.cpp
index 4f58c881de6c42727479b63462890415a9161b4a..f22cf1ad4a168f275a9c1d5e96a6debaea771616 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();
-               delete this;
-               ServerInstance = NULL;
-       }
+       this->Cleanup();
+       ServerInstance = NULL;
+       delete this;
        exit (status);
 }
 
@@ -61,15 +57,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 "," + SE->GetName() + "," + 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)
@@ -169,10 +165,9 @@ void ISupportManager::Build()
 
        tokens["AWAYLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxAway);
        tokens["CASEMAPPING"] = "rfc1459";
-       tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MASK_CHANNEL);
+       tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL);
        tokens["CHANNELLEN"] = ConvToStr(ServerInstance->Config->Limits.ChanMax);
        tokens["CHANTYPES"] = "#";
-       tokens["CHARSET"] = "ascii";
        tokens["ELIST"] = "MU";
        tokens["KICKLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxKick);
        tokens["MAXBANS"] = "64"; // TODO: make this a config setting.
@@ -185,8 +180,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));
@@ -195,41 +189,39 @@ 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;
+       Numeric::Numeric numeric(RPL_ISUPPORT);
        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)
        {
-               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");
-                       lines.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 = this->Lines.begin(); i != this->Lines.end(); ++i)
-               user->WriteNumeric(RPL_ISUPPORT, "%s %s", user->nick.c_str(), i->c_str());
+       for (std::vector<Numeric::Numeric>::const_iterator i = cachedlines.begin(); i != cachedlines.end(); ++i)
+               user->WriteNumeric(*i);
 }