X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=a1980790f2c9a688c2961f38db94bc20cedbc8ce;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=8b02b954526f5d61bb553522777fd04598771543;hpb=ad3524174350633c25dc8a4e5ffbb7066c4b8cba;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 8b02b9545..a1980790f 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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 */
 
@@ -65,12 +65,8 @@ void TreeSocket::SendCapabilities()
 		this->WriteLine(line);
 
 	int ip6 = 0;
-	int ip6support = 0;
 #ifdef IPV6
 	ip6 = 1;
-#endif
-#ifdef SUPPORT_IP6LINKS
-	ip6support = 1;
 #endif
 	std::string extra;
 	/* Do we have sha256 available? If so, we send a challenge */
@@ -92,10 +88,11 @@ void TreeSocket::SendCapabilities()
 			" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxGecos)+
 			" MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+
 			" IP6NATIVE="+ConvToStr(ip6)+
-			" IP6SUPPORT="+ConvToStr(ip6support)+
+			" IP6SUPPORT=1"+
 			" PROTOCOL="+ConvToStr(ProtocolVersion)+extra+
 			" PREFIX="+ServerInstance->Modes->BuildPrefixes()+
-			" CHANMODES="+ServerInstance->Modes->ChanModes()+
+			" CHANMODES="+ServerInstance->Modes->GiveModeList(MASK_CHANNEL)+
+			" USERMODES="+ServerInstance->Modes->GiveModeList(MASK_USER)+
 			" SVSPART=1");
 
 	this->WriteLine("CAPAB END");
@@ -132,7 +129,7 @@ std::string TreeSocket::ListDifference(const std::string &one, const std::string
 	return result;
 }
 
-bool TreeSocket::Capab(const std::deque<std::string> &params)
+bool TreeSocket::Capab(const parameterlist &params)
 {
 	if (params.size() < 1)
 	{
@@ -147,47 +144,50 @@ bool TreeSocket::Capab(const std::deque<std::string> &params)
 	else if (params[0] == "END")
 	{
 		std::string reason;
-		int ip6support = 0;
-#ifdef SUPPORT_IP6LINKS
-		ip6support = 1;
-#endif
-		/* Compare ModuleList and check CapKeys...
-		 * Maybe this could be tidier? -- Brain
-		 */
+		/* Compare ModuleList and check CapKeys */
 		if ((this->ModuleList != this->MyCapabilities()) && (this->ModuleList.length()))
 		{
-			std::string diff = ListDifference(this->ModuleList, this->MyCapabilities());
-			if (!diff.length())
+			std::string diffIneed = ListDifference(this->ModuleList, this->MyCapabilities());
+			std::string diffUneed = ListDifference(this->MyCapabilities(), this->ModuleList);
+			if (diffIneed.length() == 0 && diffUneed.length() == 0)
 			{
-				diff = "your server:" + ListDifference(this->MyCapabilities(), this->ModuleList);
+				reason = "Module list in CAPAB is not alphabetically ordered, cannot compare lists.";
 			}
 			else
 			{
-				diff = "this server:" + diff;
+				reason = "Modules incorrectly matched on these servers.";
+				if (diffIneed.length())
+					reason += " Not loaded here:" + diffIneed;
+				if (diffUneed.length())
+					reason += " Not loaded there:" + diffUneed;
 			}
-			if (diff.length() == 12)
-				reason = "Module list in CAPAB is not alphabetically ordered, cannot compare lists.";
-			else
-				reason = "Modules loaded on these servers are not correctly matched, these modules are not loaded on " + diff;
+			this->SendError("CAPAB negotiation failed: "+reason);
+			return false;
 		}
-
-		if (((this->CapKeys.find("IP6SUPPORT") == this->CapKeys.end()) && (ip6support)) || ((this->CapKeys.find("IP6SUPPORT") != this->CapKeys.end()) && (this->CapKeys.find("IP6SUPPORT")->second != ConvToStr(ip6support))))
-			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())
 			reason = "One or more of the prefixes 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";
+		if(this->CapKeys.find("CHANMODES") != this->CapKeys.end() && this->CapKeys.find("CHANMODES")->second != this->ServerInstance->Modes->GiveModeList(MASK_CHANNEL))
+			reason = "One or more of the channel modes on the remote server are invalid on this server.";
+
+		if(this->CapKeys.find("USERMODES") != this->CapKeys.end() && this->CapKeys.find("USERMODES")->second != this->ServerInstance->Modes->GiveModeList(MASK_USER))
+			reason = "One or more of the user modes on the remote server are invalid on this server.";
+
 
 		/* Challenge response, store their challenge for our password */
 		std::map<std::string,std::string>::iterator n = this->CapKeys.find("CHALLENGE");