m_spanningtree Remove unneeded #includes

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / utils.cpp

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 1517ac1b97735bc3c6cf0334244123fa5bd773bc..cb8a39638266889e05e5ced62180ade099de4a14 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -21,14 +21,10 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
-#include "socketengine.h"
 
 #include "main.h"
 #include "utils.h"
 #include "treeserver.h"
-#include "link.h"
 #include "treesocket.h"
 #include "resolvers.h"
 
@@ -165,12 +161,6 @@ SpanningTreeUtilities::~SpanningTreeUtilities()
        delete TreeRoot;
 }
 
-void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &list)
-{
-       if (list.find(server) == list.end())
-               list[server] = server;
-}
-
 /* returns a list of DIRECT servernames for a specific channel */
 void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerList &list, char status, const CUList &exempt_list)
 {
@@ -196,21 +186,30 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerLis
                {
                        TreeServer* best = this->BestRouteTo(i->first->server);
                        if (best)
-                               AddThisServer(best,list);
+                               list.insert(best);
                }
        }
        return;
 }
 
-bool SpanningTreeUtilities::DoOneToAllButSender(const std::string &prefix, const std::string &command, const parameterlist &params, std::string omit)
+std::string SpanningTreeUtilities::ConstructLine(const std::string& prefix, const std::string& command, const parameterlist& params)
 {
-       TreeServer* omitroute = this->BestRouteTo(omit);
-       std::string FullLine = ":" + prefix + " " + command;
-       unsigned int words = params.size();
-       for (unsigned int x = 0; x < words; x++)
+       std::string FullLine;
+       FullLine.reserve(MAXBUF);
+       FullLine = ":" + prefix + " " + command;
+       for (parameterlist::const_iterator x = params.begin(); x != params.end(); ++x)
        {
-               FullLine = FullLine + " " + params[x];
+               FullLine.push_back(' ');
+               FullLine.append(*x);
        }
+       return FullLine;
+}
+
+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++)
        {
@@ -231,12 +230,8 @@ bool SpanningTreeUtilities::DoOneToAllButSender(const std::string &prefix, const
 
 bool SpanningTreeUtilities::DoOneToMany(const std::string &prefix, const std::string &command, const parameterlist &params)
 {
-       std::string FullLine = ":" + prefix + " " + command;
-       unsigned int words = params.size();
-       for (unsigned int x = 0; x < words; x++)
-       {
-               FullLine = FullLine + " " + params[x];
-       }
+       std::string FullLine = ConstructLine(prefix, command, params);
+
        unsigned int items = this->TreeRoot->ChildCount();
        for (unsigned int x = 0; x < items; x++)
        {
@@ -251,36 +246,16 @@ bool SpanningTreeUtilities::DoOneToMany(const std::string &prefix, const std::st
        return true;
 }
 
-bool SpanningTreeUtilities::DoOneToMany(const char* prefix, const char* command, const parameterlist &params)
-{
-       std::string spfx = prefix;
-       std::string scmd = command;
-       return this->DoOneToMany(spfx, scmd, params);
-}
-
-bool SpanningTreeUtilities::DoOneToAllButSender(const char* prefix, const char* command, const parameterlist &params, std::string omit)
-{
-       std::string spfx = prefix;
-       std::string scmd = command;
-       return this->DoOneToAllButSender(spfx, scmd, params, omit);
-}
-
-bool SpanningTreeUtilities::DoOneToOne(const std::string &prefix, const std::string &command, const parameterlist &params, std::string target)
+bool SpanningTreeUtilities::DoOneToOne(const std::string& prefix, const std::string& command, const parameterlist& params, const std::string& target)
 {
        TreeServer* Route = this->BestRouteTo(target);
        if (Route)
        {
-               std::string FullLine = ":" + prefix + " " + command;
-               unsigned int words = params.size();
-               for (unsigned int x = 0; x < words; x++)
-               {
-                       FullLine = FullLine + " " + params[x];
-               }
                if (Route && Route->GetSocket())
                {
                        TreeSocket* Sock = Route->GetSocket();
                        if (Sock)
-                               Sock->WriteLine(FullLine);
+                               Sock->WriteLine(ConstructLine(prefix, command, params));
                }
                return true;
        }
@@ -442,3 +417,21 @@ 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)
+{
+       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);
+
+       TreeServerList list;
+       this->GetListOfServersForChannel(target, list, status, exempt_list);
+       for (TreeServerList::iterator i = list.begin(); i != list.end(); ++i)
+       {
+               TreeSocket* Sock = (*i)->GetSocket();
+               if (Sock)
+                       Sock->WriteLine(raw);
+       }
+}