m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

[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 f36692a542959636fcc45629bf0947e688831100..1ca5b982c997851ab84c468ea8a7ba4ddc5034dc 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"
@@ -68,7 +66,7 @@ static std::string BuildModeList(ModeType type)
                }
        }
        sort(modes.begin(), modes.end());
-       irc::stringjoiner line(" ", modes, 0, modes.size() - 1);
+       irc::stringjoiner line(modes);
        return line.GetJoined();
 }
 
@@ -134,6 +132,10 @@ void TreeSocket::SendCapabilities(int phase)
                extra = " CHALLENGE=" + this->GetOurChallenge();
        }
 
+       // 2.0 needs this key
+       if (proto_version == 1202)
+               extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion));
+
        this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */
                        ":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+
                        " CHANMAX="+ConvToStr(ServerInstance->Config->Limits.ChanMax)+
@@ -144,12 +146,11 @@ void TreeSocket::SendCapabilities(int phase)
                        " MAXKICK="+ConvToStr(ServerInstance->Config->Limits.MaxKick)+
                        " MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxGecos)+
                        " MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+
-                       " IP6SUPPORT=1"+
-                       " PROTOCOL="+ConvToStr(ProtocolVersion)+extra+
+                       extra+
                        " PREFIX="+ServerInstance->Modes->BuildPrefixes()+
                        " CHANMODES="+ServerInstance->Modes->GiveModeList(MASK_CHANNEL)+
-                       " USERMODES="+ServerInstance->Modes->GiveModeList(MASK_USER)+
-                       " SVSPART=1");
+                       " USERMODES="+ServerInstance->Modes->GiveModeList(MASK_USER)
+                       );
 
        this->WriteLine("CAPAB END");
 }
@@ -194,7 +195,23 @@ 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]);
+
+               if (proto_version < MinCompatProtocol)
+               {
+                       SendError("CAPAB negotiation failed: Server is using protocol version " + (proto_version ? ConvToStr(proto_version) : "1201 or older")
+                               + " which is too old to link with this server (version " + ConvToStr(ProtocolVersion)
+                               + (ProtocolVersion != MinCompatProtocol ? ", links with " + ConvToStr(MinCompatProtocol) + " and above)" : ")"));
+                       return false;
+               }
+
+               // Special case, may be removed in the future
+               if (proto_version == 1203 || proto_version == 1204)
+               {
+                       SendError("CAPAB negotiation failed: InspIRCd 2.1 beta is not supported");
+                       return false;
+               }
+
                SendCapabilities(2);
        }
        else if (params[0] == "END")
@@ -242,21 +259,6 @@ bool TreeSocket::Capab(const parameterlist &params)
                        }
                }
 
-               if (this->capab->CapKeys.find("PROTOCOL") == this->capab->CapKeys.end())
-               {
-                       reason = "Protocol version not specified";
-               }
-               else
-               {
-                       proto_version = atoi(capab->CapKeys.find("PROTOCOL")->second.c_str());
-                       if (proto_version < MinCompatProtocol)
-                       {
-                               reason = "Server is using protocol version " + ConvToStr(proto_version) +
-                                       " which is too old to link with this server (version " + ConvToStr(ProtocolVersion)
-                                       + (ProtocolVersion != MinCompatProtocol ? ", links with " + ConvToStr(MinCompatProtocol) + " and above)" : ")");
-                       }
-               }
-
                if(this->capab->CapKeys.find("PREFIX") != this->capab->CapKeys.end() && this->capab->CapKeys.find("PREFIX")->second != ServerInstance->Modes->BuildPrefixes())
                        reason = "One or more of the prefixes on the remote server are invalid on this server.";