X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=0372172f5ae2e7c4b5d363e94f1a22c2c8fcf4ca;hb=9d75ba35743eb8f44a2d7beb8e08aa43c13f5d2e;hp=5330d2eb3fe7ca04943ada951957c4d5c5d32e81;hpb=e950f568d0f571e9475aa38177486468714de4d3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 5330d2eb3..0372172f5 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;
 
@@ -81,8 +82,6 @@ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
  */
 TreeServer* SpanningTreeUtilities::BestRouteTo(const std::string &ServerName)
 {
-	if (ServerName == TreeRoot->GetName() || ServerName == ServerInstance->Config->GetSID())
-		return NULL;
 	TreeServer* Found = FindServer(ServerName);
 	if (Found)
 	{
@@ -132,20 +131,15 @@ SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C)
 	: Creator(C), TreeRoot(NULL)
 {
 	ServerInstance->Timers->AddTimer(&RefreshTimer);
-
-	this->ReadConfiguration();
 }
 
 CullResult SpanningTreeUtilities::cull()
 {
-	while (TreeRoot->ChildCount())
+	const TreeServer::ChildServers& children = TreeRoot->GetChildren();
+	while (!children.empty())
 	{
-		TreeServer* child_server = TreeRoot->GetChild(0);
-		if (child_server)
-		{
-			TreeSocket* sock = child_server->GetSocket();
-			sock->Close();
-		}
+		TreeSocket* sock = children.front()->GetSocket();
+		sock->Close();
 	}
 
 	for(std::map<TreeSocket*, std::pair<std::string, int> >::iterator i = timeoutlist.begin(); i != timeoutlist.end(); ++i)
@@ -164,7 +158,7 @@ SpanningTreeUtilities::~SpanningTreeUtilities()
 }
 
 /* returns a list of DIRECT servernames for a specific channel */
-void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerList &list, char status, const CUList &exempt_list)
+void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet& list, char status, const CUList& exempt_list)
 {
 	unsigned int minrank = 0;
 	if (status)
@@ -188,83 +182,36 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerLis
 		{
 			TreeServer* best = this->BestRouteTo(i->first->server);
 			if (best)
-				list.insert(best);
+				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;
-}
+	const std::string& FullLine = params.str();
 
-bool SpanningTreeUtilities::DoOneToAllButSender(const std::string& prefix, const std::string& command, const parameterlist& params, const std::string& omit)
-{
-	TreeServer* omitroute = this->BestRouteTo(omit);
-	std::string FullLine = ConstructLine(prefix, command, params);
-
-	unsigned int items = this->TreeRoot->ChildCount();
-	for (unsigned int x = 0; x < items; x++)
+	const TreeServer::ChildServers& children = TreeRoot->GetChildren();
+	for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i)
 	{
-		TreeServer* Route = this->TreeRoot->GetChild(x);
-		// Send the line IF:
-		// The route has a socket (its a direct connection)
-		// The route isnt the one to be omitted
-		// The route isnt the path to the one to be omitted
-		if ((Route) && (Route->GetSocket()) && (Route->GetName() != omit) && (omitroute != Route))
+		TreeServer* Route = *i;
+		// Send the line if the route isn't the path to the one to be omitted
+		if (Route != omitroute)
 		{
-			TreeSocket* Sock = Route->GetSocket();
-			if (Sock)
-				Sock->WriteLine(FullLine);
+			Route->GetSocket()->WriteLine(FullLine);
 		}
 	}
-	return true;
 }
 
-bool SpanningTreeUtilities::DoOneToMany(const std::string &prefix, const std::string &command, const parameterlist &params)
-{
-	std::string FullLine = ConstructLine(prefix, command, params);
-
-	unsigned int items = this->TreeRoot->ChildCount();
-	for (unsigned int x = 0; x < items; x++)
-	{
-		TreeServer* Route = this->TreeRoot->GetChild(x);
-		if (Route && Route->GetSocket())
-		{
-			TreeSocket* Sock = Route->GetSocket();
-			if (Sock)
-				Sock->WriteLine(FullLine);
-		}
-	}
-	return true;
-}
-
-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)
-	{
-		if (Route && Route->GetSocket())
-		{
-			TreeSocket* Sock = Route->GetSocket();
-			if (Sock)
-				Sock->WriteLine(ConstructLine(prefix, command, params));
-		}
-		return true;
-	}
-	else
-	{
+	if (!Route)
 		return false;
-	}
+
+	Route->GetSocket()->WriteLine(params);
+	return true;
 }
 
 void SpanningTreeUtilities::RefreshIPCache()
@@ -415,20 +362,20 @@ Link* SpanningTreeUtilities::FindLink(const std::string& name)
 	return NULL;
 }
 
-void SpanningTreeUtilities::SendChannelMessage(const std::string& prefix, Channel* target, const std::string &text, char status, const CUList& exempt_list, const char* message_type)
+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);
 
-	TreeServerList list;
+	TreeSocketSet list;
 	this->GetListOfServersForChannel(target, list, status, exempt_list);
-	for (TreeServerList::iterator i = list.begin(); i != list.end(); ++i)
+	for (TreeSocketSet::iterator i = list.begin(); i != list.end(); ++i)
 	{
-		TreeSocket* Sock = (*i)->GetSocket();
-		if (Sock)
-			Sock->WriteLine(raw);
+		TreeSocket* Sock = *i;
+		if (Sock != omit)
+			Sock->WriteLine(msg);
 	}
 }