X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=d6dccba14b2e481e2416f4ed45740e5fd3366294;hb=1d020d132ff6d05ffd865d025cf161d7637f10d8;hp=dbd246ffe447ce96a2e38bba8e05297d80c8de10;hpb=428e8f4f693192a527065e5488bbc7fceb938b6f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index dbd246ffe..d6dccba14 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -93,9 +93,7 @@ TreeServer* SpanningTreeUtilities::BestRouteTo(const std::string &ServerName)
 		User *u = ServerInstance->FindNick(ServerName);
 		if (u)
 		{
-			Found = FindServer(u->server);
-			if (Found)
-				return Found->GetRoute();
+			return TreeServer::Get(u)->GetRoute();
 		}
 
 		return NULL;
@@ -130,7 +128,7 @@ TreeServer* SpanningTreeUtilities::FindServerID(const std::string &id)
 SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C)
 	: Creator(C), TreeRoot(NULL)
 {
-	ServerInstance->Timers->AddTimer(&RefreshTimer);
+	ServerInstance->Timers.AddTimer(&RefreshTimer);
 }
 
 CullResult SpanningTreeUtilities::cull()
@@ -180,9 +178,8 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet
 
 		if (exempt_list.find(i->first) == exempt_list.end())
 		{
-			TreeServer* best = this->BestRouteTo(i->first->server);
-			if (best)
-				list.insert(best->GetSocket());
+			TreeServer* best = TreeServer::Get(i->first);
+			list.insert(best->GetSocket());
 		}
 	}
 	return;
@@ -210,10 +207,18 @@ bool SpanningTreeUtilities::DoOneToOne(const CmdBuilder& params, const std::stri
 	if (!Route)
 		return false;
 
-	Route->GetSocket()->WriteLine(params);
+	DoOneToOne(params, Route);
 	return true;
 }
 
+void SpanningTreeUtilities::DoOneToOne(const CmdBuilder& params, Server* server)
+{
+	TreeServer* ts = static_cast<TreeServer*>(server);
+	TreeSocket* sock = ts->GetSocket();
+	if (sock)
+		sock->WriteLine(params);
+}
+
 void SpanningTreeUtilities::RefreshIPCache()
 {
 	ValidIPs.clear();
@@ -256,7 +261,6 @@ void SpanningTreeUtilities::ReadConfiguration()
 	HideULines = security->getBool("hideulines");
 	AnnounceTSChange = options->getBool("announcets");
 	AllowOptCommon = options->getBool("allowmismatch");
-	ChallengeResponse = !security->getBool("disablehmac");
 	quiet_bursts = ServerInstance->Config->ConfValue("performance")->getBool("quietbursts");
 	PingWarnTime = options->getInt("pingwarning");
 	PingFreq = options->getInt("serverpingfreq");
@@ -298,8 +302,8 @@ void SpanningTreeUtilities::ReadConfiguration()
 		if (L->Name.find('.') == std::string::npos)
 			throw ModuleException("The link name '"+assign(L->Name)+"' is invalid as it must contain at least one '.' character");
 
-		if (L->Name.length() > 64)
-			throw ModuleException("The link name '"+assign(L->Name)+"' is invalid as it is longer than 64 characters");
+		if (L->Name.length() > ServerInstance->Config->Limits.MaxHost)
+			throw ModuleException("The link name '"+assign(L->Name)+"' is invalid as it is longer than " + ConvToStr(ServerInstance->Config->Limits.MaxHost) + " characters");
 
 		if (L->RecvPass.empty())
 			throw ModuleException("Invalid configuration for server '"+assign(L->Name)+"', recvpass not defined");
@@ -349,6 +353,9 @@ void SpanningTreeUtilities::ReadConfiguration()
 		AutoconnectBlocks.push_back(A);
 	}
 
+	for (server_hash::const_iterator i = serverlist.begin(); i != serverlist.end(); ++i)
+		i->second->CheckULine();
+
 	RefreshIPCache();
 }
 
@@ -357,7 +364,7 @@ Link* SpanningTreeUtilities::FindLink(const std::string& name)
 	for (std::vector<reference<Link> >::iterator i = LinkBlocks.begin(); i != LinkBlocks.end(); ++i)
 	{
 		Link* x = *i;
-		if (InspIRCd::Match(x->Name.c_str(), name.c_str()))
+		if (InspIRCd::Match(x->Name.c_str(), name.c_str(), rfc_case_insensitive_map))
 		{
 			return x;
 		}