m_spanningtree Remove unneeded #includes

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / capab.cpp

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 3786950910d4452ea5530d26426669d91bc424ea..039a3c5e70b7a5db8de36497b5b046b35ce3aa36 100644 (file)
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -20,9 +20,7 @@
 
 
 #include "inspircd.h"
-#include "xline.h"
 
-#include "treesocket.h"
 #include "treeserver.h"
 #include "utils.h"
 #include "link.h"
@@ -32,25 +30,19 @@ std::string TreeSocket::MyModules(int filter)
 {
        std::vector<std::string> modlist = ServerInstance->Modules->GetAllModuleNames(filter);
 
-       if (filter == VF_COMMON && proto_version != ProtocolVersion)
-               CompatAddModules(modlist);
-
        std::string capabilities;
        sort(modlist.begin(),modlist.end());
-       for (unsigned int i = 0; i < modlist.size(); i++)
+       for (std::vector<std::string>::const_iterator i = modlist.begin(); i != modlist.end(); ++i)
        {
-               if (i)
-                       capabilities.push_back(proto_version > 1201 ? ' ' : ',');
-               capabilities.append(modlist[i]);
-               Module* m = ServerInstance->Modules->Find(modlist[i]);
-               if (m && proto_version > 1201)
+               if (i != modlist.begin())
+                       capabilities.push_back(' ');
+               capabilities.append(*i);
+               Module* m = ServerInstance->Modules->Find(*i);
+               Version v = m->GetVersion();
+               if (!v.link_data.empty())
                {
-                       Version v = m->GetVersion();
-                       if (!v.link_data.empty())
-                       {
-                               capabilities.push_back('=');
-                               capabilities.append(v.link_data);
-                       }
+                       capabilities.push_back('=');
+                       capabilities.append(v.link_data);
                }
        }
        return capabilities;
@@ -90,7 +82,7 @@ void TreeSocket::SendCapabilities(int phase)
        if (phase < 2)
                return;
 
-       char sep = proto_version > 1201 ? ' ' : ',';
+       const char sep = ' ';
        irc::sepstream modulelist(MyModules(VF_COMMON), sep);
        irc::sepstream optmodulelist(MyModules(VF_OPTCOMMON), sep);
        /* Send module names, split at 509 length */
@@ -139,8 +131,6 @@ void TreeSocket::SendCapabilities(int phase)
                SetOurChallenge(ServerInstance->GenRandomStr(20));
                extra = " CHALLENGE=" + this->GetOurChallenge();
        }
-       if (proto_version < 1202)
-               extra += ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL) ? " HALFOP=1" : " HALFOP=0";
 
        this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */
                        ":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+
@@ -202,7 +192,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                capab->OptModuleList.clear();
                capab->CapKeys.clear();
                if (params.size() > 1)
-                       proto_version = atoi(params[1].c_str());
+                       proto_version = ConvToInt(params[1]);
                SendCapabilities(2);
        }
        else if (params[0] == "END")
@@ -212,7 +202,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                if ((this->capab->ModuleList != this->MyModules(VF_COMMON)) && (this->capab->ModuleList.length()))
                {
                        std::string diffIneed, diffUneed;
-                       ListDifference(this->capab->ModuleList, this->MyModules(VF_COMMON), proto_version > 1201 ? ' ' : ',', diffIneed, diffUneed);
+                       ListDifference(this->capab->ModuleList, this->MyModules(VF_COMMON), ' ', diffIneed, diffUneed);
                        if (diffIneed.length() || diffUneed.length())
                        {
                                reason = "Modules incorrectly matched on these servers.";
@@ -256,7 +246,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                }
                else
                {
-                       proto_version = atoi(capab->CapKeys.find("PROTOCOL")->second.c_str());
+                       proto_version = ConvToInt(capab->CapKeys.find("PROTOCOL")->second);
                        if (proto_version < MinCompatProtocol)
                        {
                                reason = "Server is using protocol version " + ConvToStr(proto_version) +
@@ -321,7 +311,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                        if (!this->GetTheirChallenge().empty() && (this->LinkState == CONNECTING))
                        {
                                this->SendCapabilities(2);
-                               this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+this->MakePass(capab->link->SendPass, capab->theirchallenge)+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
+                               this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+this->MakePass(capab->link->SendPass, capab->theirchallenge)+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
                        }
                }
                else
@@ -330,7 +320,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                        if (this->LinkState == CONNECTING)
                        {
                                this->SendCapabilities(2);
-                               this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+capab->link->SendPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
+                               this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+capab->link->SendPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
                        }
                }
 
@@ -348,7 +338,7 @@ bool TreeSocket::Capab(const parameterlist &params)
                }
                else
                {
-                       capab->ModuleList.push_back(proto_version > 1201 ? ' ' : ',');
+                       capab->ModuleList.push_back(' ');
                        capab->ModuleList.append(params[1]);
                }
        }