Fix build of m_spanningtree and display of dependency regeneration

[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 d363f31c1af4353f0ba0c59669dddac4206990b5..aa4ab5e0354d6aaf3aa54613924354cb1bf2b0f8 100644 (file)
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -14,10 +14,10 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/main.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
+#include "main.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
@@ -178,12 +178,19 @@ bool TreeSocket::Capab(const std::deque<std::string> &params)
                        reason = "We don't both support linking to IPV6 servers";
                if (((this->CapKeys.find("IP6NATIVE") != this->CapKeys.end()) && (this->CapKeys.find("IP6NATIVE")->second == "1")) && (!ip6support))
                        reason = "The remote server is IPV6 native, and we don't support linking to IPV6 servers";
-               if (((this->CapKeys.find("PROTOCOL") == this->CapKeys.end()) || ((this->CapKeys.find("PROTOCOL") != this->CapKeys.end()) && (this->CapKeys.find("PROTOCOL")->second != ConvToStr(ProtocolVersion)))))
+               if (this->CapKeys.find("PROTOCOL") == this->CapKeys.end())
                {
-                       if (this->CapKeys.find("PROTOCOL") != this->CapKeys.end())
-                               reason = "Mismatched protocol versions "+this->CapKeys.find("PROTOCOL")->second+" and "+ConvToStr(ProtocolVersion);
-                       else
-                               reason = "Protocol version not specified";
+                       reason = "Protocol version not specified";
+               }
+               else
+               {
+                       int otherProto = atoi(CapKeys.find("PROTOCOL")->second.c_str());
+                       if (otherProto < MinCompatProtocol)
+                       {
+                               reason = "Server is using protocol version " + ConvToStr(otherProto) +
+                                       " which is too old to link with this server (version " + ConvToStr(ProtocolVersion)
+                                       + (ProtocolVersion != MinCompatProtocol ? ", links with " + ConvToStr(MinCompatProtocol) + " and above)" : ")");
+                       }
                }
 
                if(this->CapKeys.find("PREFIX") != this->CapKeys.end() && this->CapKeys.find("PREFIX")->second != this->ServerInstance->Modes->BuildPrefixes())
@@ -196,11 +203,6 @@ bool TreeSocket::Capab(const std::deque<std::string> &params)
                        reason = "One or more of the user modes on the remote server are invalid on this server.";
 
 
-               if (((this->CapKeys.find("HALFOP") == this->CapKeys.end()) && (ServerInstance->Config->AllowHalfop)) || ((this->CapKeys.find("HALFOP") != this->CapKeys.end()) && (this->CapKeys.find("HALFOP")->second != ConvToStr(ServerInstance->Config->AllowHalfop))))
-                       reason = "We don't both have halfop support enabled/disabled identically";
-
-
-
                /* Challenge response, store their challenge for our password */
                std::map<std::string,std::string>::iterator n = this->CapKeys.find("CHALLENGE");
                if (Utils->ChallengeResponse && (n != this->CapKeys.end()) && (ServerInstance->Modules->Find("m_sha256.so")))