Get rid of CommandBuilder::push_back.

[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 cde627e21af47aa26b4be649d911a307b71f1e21..2957b8c1462231e4f97e7a2954301ee76266a49f 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -28,6 +28,7 @@
 #include "treesocket.h"
 #include "resolvers.h"
 #include "commandbuilder.h"
+#include "modules/server.h"
 
 SpanningTreeUtilities* Utils = NULL;
 
@@ -144,6 +145,7 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet
                        minrank = mh->GetPrefixRank();
        }
 
+       TreeServer::ChildServers children = TreeRoot->GetChildren();
        const Channel::MemberMap& ulist = c->GetUsers();
        for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
        {
@@ -157,9 +159,22 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet
                {
                        TreeServer* best = TreeServer::Get(i->first);
                        list.insert(best->GetSocket());
+
+                       TreeServer::ChildServers::iterator citer = std::find(children.begin(), children.end(), best);
+                       if (citer != children.end())
+                               children.erase(citer);
                }
        }
-       return;
+
+       // Check whether the servers which do not have users in the channel might need this message. This
+       // is used to keep the chanhistory module synchronised between servers.
+       for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i)
+       {
+               ModResult result;
+               FIRST_MOD_RESULT_CUSTOM(Creator->GetBroadcastEventProvider(), ServerProtocol::BroadcastEventListener, OnBroadcastMessage, result, (c, *i));
+               if (result == MOD_RES_ALLOW)
+                       list.insert((*i)->GetSocket());
+       }
 }
 
 void SpanningTreeUtilities::DoOneToAllButSender(const CmdBuilder& params, TreeServer* omitroute)
@@ -226,6 +241,7 @@ void SpanningTreeUtilities::ReadConfiguration()
        ConfigTag* options = ServerInstance->Config->ConfValue("options");
        FlatLinks = security->getBool("flatlinks");
        HideULines = security->getBool("hideulines");
+       HideSplits = security->getBool("hidesplits");
        AnnounceTSChange = options->getBool("announcets");
        AllowOptCommon = options->getBool("allowmismatch");
        quiet_bursts = ServerInstance->Config->ConfValue("performance")->getBool("quietbursts");
@@ -242,13 +258,12 @@ void SpanningTreeUtilities::ReadConfiguration()
        {
                ConfigTag* tag = i->second;
                reference<Link> L = new Link(tag);
-               std::string linkname = tag->getString("name");
-               L->Name = linkname.c_str();
 
                irc::spacesepstream sep = tag->getString("allowmask");
                for (std::string s; sep.GetToken(s);)
                        L->AllowMasks.push_back(s);
 
+               L->Name = tag->getString("name");
                L->IPAddr = tag->getString("ipaddr");
                L->Port = tag->getUInt("port", 0);
                L->SendPass = tag->getString("sendpass", tag->getString("password"));
@@ -287,7 +302,7 @@ void SpanningTreeUtilities::ReadConfiguration()
                        ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + L->Name + "' has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want.");
                }
 
-               if (!L->Port)
+               if (!L->Port && L->IPAddr.find('/') == std::string::npos)
                        ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + L->Name + "' has no port defined, you will not be able to /connect it.");
 
                L->Fingerprint.erase(std::remove(L->Fingerprint.begin(), L->Fingerprint.end(), ':'), L->Fingerprint.end());
@@ -336,13 +351,16 @@ 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, TreeSocket* omit)
+void SpanningTreeUtilities::SendChannelMessage(User* source, Channel* target, const std::string& text, char status, const ClientProtocol::TagMap& tags, const CUList& exempt_list, const char* message_type, TreeSocket* omit)
 {
-       CmdBuilder msg(prefix, message_type);
+       CmdBuilder msg(source, message_type);
+       msg.push_tags(tags);
        msg.push_raw(' ');
        if (status != 0)
                msg.push_raw(status);
-       msg.push_raw(target->name).push_last(text);
+       msg.push_raw(target->name);
+       if (!text.empty())
+               msg.push_last(text);
 
        TreeSocketSet list;
        this->GetListOfServersForChannel(target, list, status, exempt_list);