X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=de96b073d65450959183212fcdc21c1c9dfb5570;hb=a8b146419b2aae36da25b7202292528efd3158a9;hp=f71a9f0d5bed53504b6f7e8ddaf978d83ee61f60;hpb=7264a6a8d4360989ca2f64230da07c562d0f34f1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index f71a9f0d5..de96b073d 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -27,6 +27,7 @@
 #include "treeserver.h"
 #include "treesocket.h"
 #include "resolvers.h"
+#include "commandbuilder.h"
 
 SpanningTreeUtilities* Utils = NULL;
 
@@ -92,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,8 +129,6 @@ SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C)
 	: Creator(C), TreeRoot(NULL)
 {
 	ServerInstance->Timers->AddTimer(&RefreshTimer);
-
-	this->ReadConfiguration();
 }
 
 CullResult SpanningTreeUtilities::cull()
@@ -164,7 +161,7 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet
 	unsigned int minrank = 0;
 	if (status)
 	{
-		ModeHandler* mh = ServerInstance->Modes->FindPrefix(status);
+		PrefixMode* mh = ServerInstance->Modes->FindPrefix(status);
 		if (mh)
 			minrank = mh->GetPrefixRank();
 	}
@@ -181,30 +178,16 @@ 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;
 }
 
-std::string SpanningTreeUtilities::ConstructLine(const std::string& prefix, const std::string& command, const parameterlist& params)
+void SpanningTreeUtilities::DoOneToAllButSender(const CmdBuilder& params, TreeServer* omitroute)
 {
-	std::string FullLine;
-	FullLine.reserve(1024);
-	FullLine = ":" + prefix + " " + command;
-	for (parameterlist::const_iterator x = params.begin(); x != params.end(); ++x)
-	{
-		FullLine.push_back(' ');
-		FullLine.append(*x);
-	}
-	return FullLine;
-}
-
-void SpanningTreeUtilities::DoOneToAllButSender(const std::string& prefix, const std::string& command, const parameterlist& params, TreeServer* omitroute)
-{
-	std::string FullLine = ConstructLine(prefix, command, params);
+	const std::string& FullLine = params.str();
 
 	const TreeServer::ChildServers& children = TreeRoot->GetChildren();
 	for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i)
@@ -218,16 +201,22 @@ void SpanningTreeUtilities::DoOneToAllButSender(const std::string& prefix, const
 	}
 }
 
-bool SpanningTreeUtilities::DoOneToOne(const std::string& prefix, const std::string& command, const parameterlist& params, const std::string& target)
+bool SpanningTreeUtilities::DoOneToOne(const CmdBuilder& params, const std::string& target)
 {
 	TreeServer* Route = this->BestRouteTo(target);
 	if (!Route)
 		return false;
 
-	Route->GetSocket()->WriteLine(ConstructLine(prefix, command, params));
+	DoOneToOne(params, Route);
 	return true;
 }
 
+void SpanningTreeUtilities::DoOneToOne(const CmdBuilder& params, Server* server)
+{
+	TreeServer* ts = static_cast<TreeServer*>(server);
+	ts->GetSocket()->WriteLine(params);
+}
+
 void SpanningTreeUtilities::RefreshIPCache()
 {
 	ValidIPs.clear();
@@ -241,8 +230,7 @@ void SpanningTreeUtilities::RefreshIPCache()
 			continue;
 		}
 
-		if (L->AllowMask.length())
-			ValidIPs.push_back(L->AllowMask);
+		ValidIPs.insert(ValidIPs.end(), L->AllowMasks.begin(), L->AllowMasks.end());
 
 		irc::sockets::sockaddrs dummy;
 		bool ipvalid = irc::sockets::aptosa(L->IPAddr, L->Port, dummy);
@@ -291,7 +279,11 @@ void SpanningTreeUtilities::ReadConfiguration()
 		reference<Link> L = new Link(tag);
 		std::string linkname = tag->getString("name");
 		L->Name = linkname.c_str();
-		L->AllowMask = tag->getString("allowmask");
+
+		irc::spacesepstream sep = tag->getString("allowmask");
+		for (std::string s; sep.GetToken(s);)
+			L->AllowMasks.push_back(s);
+
 		L->IPAddr = tag->getString("ipaddr");
 		L->Port = tag->getInt("port");
 		L->SendPass = tag->getString("sendpass", tag->getString("password"));
@@ -360,6 +352,9 @@ void SpanningTreeUtilities::ReadConfiguration()
 		AutoconnectBlocks.push_back(A);
 	}
 
+	for (server_hash::const_iterator i = serverlist.begin(); i != serverlist.end(); ++i)
+		i->second->CheckULine();
+
 	RefreshIPCache();
 }
 
@@ -368,7 +363,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;
 		}
@@ -378,11 +373,11 @@ Link* SpanningTreeUtilities::FindLink(const std::string& name)
 
 void SpanningTreeUtilities::SendChannelMessage(const std::string& prefix, Channel* target, const std::string& text, char status, const CUList& exempt_list, const char* message_type, TreeSocket* omit)
 {
-	std::string raw(":");
-	raw.append(prefix).append(1, ' ').append(message_type).push_back(' ');
-	if (status)
-		raw.push_back(status);
-	raw.append(target->name).append(" :").append(text);
+	CmdBuilder msg(prefix, message_type);
+	msg.push_raw(' ');
+	if (status != 0)
+		msg.push_raw(status);
+	msg.push_raw(target->name).push_last(text);
 
 	TreeSocketSet list;
 	this->GetListOfServersForChannel(target, list, status, exempt_list);
@@ -390,6 +385,6 @@ void SpanningTreeUtilities::SendChannelMessage(const std::string& prefix, Channe
 	{
 		TreeSocket* Sock = *i;
 		if (Sock != omit)
-			Sock->WriteLine(raw);
+			Sock->WriteLine(msg);
 	}
 }