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 1224b1cf45d5a0316cbc5aecd5532862be9643b6..2957b8c1462231e4f97e7a2954301ee76266a49f 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -171,7 +171,7 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeSocketSet
        for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i)
        {
                ModResult result;
-               FIRST_MOD_RESULT_CUSTOM(Creator->GetEventProvider(), ServerEventListener, OnBroadcastMessage, result, (c, *i));
+               FIRST_MOD_RESULT_CUSTOM(Creator->GetBroadcastEventProvider(), ServerProtocol::BroadcastEventListener, OnBroadcastMessage, result, (c, *i));
                if (result == MOD_RES_ALLOW)
                        list.insert((*i)->GetSocket());
        }
@@ -258,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"));
@@ -303,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());
@@ -352,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);