X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=039a3c5e70b7a5db8de36497b5b046b35ce3aa36;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=cf0fde3e83ffd1841cd45e59d99d4c2351524a72;hpb=56cae0f3a484cbcb20569b68917f1810a0c2f4a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index cf0fde3e8..039a3c5e7 100644
--- 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,9 +30,6 @@ 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 (std::vector<std::string>::const_iterator i = modlist.begin(); i != modlist.end(); ++i)
@@ -197,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")
@@ -251,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) +