X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=a1980790f2c9a688c2961f38db94bc20cedbc8ce;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=aa4ab5e0354d6aaf3aa54613924354cb1bf2b0f8;hpb=192fa7d3138ccb5929dc9af8de3395d6ea25619c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index aa4ab5e03..a1980790f 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -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,7 +88,7 @@ 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->GiveModeList(MASK_CHANNEL)+
@@ -133,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)
 	{
@@ -148,13 +144,7 @@ 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 diffIneed = ListDifference(this->ModuleList, this->MyCapabilities());
@@ -174,10 +164,6 @@ bool TreeSocket::Capab(const std::deque<std::string> &params)
 			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())
 		{
 			reason = "Protocol version not specified";