Merge pull request #708 from SaberUK/master+development-branch

[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 ef1070a122a800272622562a3bd7a3d151c6b04f..c9abbd0084ba4afd1dc98ff8f10faa3538a90426 100644 (file)
--- 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;
 
@@ -130,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)
@@ -162,12 +158,12 @@ 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)
        {
-               ModeHandler* mh = ServerInstance->Modes->FindPrefix(status);
+               PrefixMode* mh = ServerInstance->Modes->FindPrefix(status);
                if (mh)
                        minrank = mh->GetPrefixRank();
        }
@@ -186,34 +182,20 @@ 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;
-}
-
-void 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);
+       const std::string& FullLine = params.str();
 
-       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);
+               TreeServer* Route = *i;
                // Send the line if the route isn't the path to the one to be omitted
                if (Route != omitroute)
                {
@@ -222,25 +204,13 @@ void SpanningTreeUtilities::DoOneToAllButSender(const std::string& prefix, const
        }
 }
 
-void 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);
-               Route->GetSocket()->WriteLine(FullLine);
-       }
-}
-
-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));
+       Route->GetSocket()->WriteLine(params);
        return true;
 }
 
@@ -257,8 +227,7 @@ void SpanningTreeUtilities::RefreshIPCache()
                        continue;
                }
 
-               if (L->AllowMask.length())
-                       ValidIPs.push_back(L->AllowMask);
+               std::copy(L->AllowMasks.begin(), L->AllowMasks.end(), std::back_inserter(ValidIPs));
 
                irc::sockets::sockaddrs dummy;
                bool ipvalid = irc::sockets::aptosa(L->IPAddr, L->Port, dummy);
@@ -307,7 +276,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"));
@@ -392,20 +365,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);
        }
 }