Allow the maximum length of a chanfilter message to be configured.

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

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index fda420434fb1b9ebc874725610cb8da4706e853b..1a77237bd6d437686d6c0807774eb132306537bb 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -25,7 +25,7 @@
 #include "socket.h"
 #include "xline.h"
 #include "iohook.h"
-#include "modules/spanningtree.h"
+#include "modules/server.h"
 
 #include "resolvers.h"
 #include "main.h"
@@ -40,7 +40,7 @@ ModuleSpanningTree::ModuleSpanningTree()
        : rconnect(this), rsquit(this), map(this)
        , commands(this)
        , currmembid(0)
-       , eventprov(this, "event/spanningtree")
+       , eventprov(this, "event/server")
        , DNS(this, "DNS")
        , loopCall(false)
 {
@@ -209,7 +209,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
        else
        {
                in_addr n;
-               if (inet_aton(x->IPAddr.c_str(),&n) < 1)
+               if (inet_pton(AF_INET, x->IPAddr.c_str(),&n) < 1)
                        ipvalid = false;
        }
 
@@ -231,7 +231,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
        }
        else if (!DNS)
        {
-               ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: Hostname given and m_dns.so is not loaded, unable to resolve.", x->Name.c_str());
+               ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: Hostname given and core_dns is not loaded, unable to resolve.", x->Name.c_str());
        }
        else
        {
@@ -273,12 +273,12 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime)
 
 void ModuleSpanningTree::DoConnectTimeout(time_t curtime)
 {
-       std::map<TreeSocket*, std::pair<std::string, int> >::iterator i = Utils->timeoutlist.begin();
+       SpanningTreeUtilities::TimeoutList::iterator i = Utils->timeoutlist.begin();
        while (i != Utils->timeoutlist.end())
        {
                TreeSocket* s = i->first;
-               std::pair<std::string, int> p = i->second;
-               std::map<TreeSocket*, std::pair<std::string, int> >::iterator me = i;
+               std::pair<std::string, unsigned int> p = i->second;
+               SpanningTreeUtilities::TimeoutList::iterator me = i;
                i++;
                if (s->GetLinkState() == DYING)
                {
@@ -287,7 +287,7 @@ void ModuleSpanningTree::DoConnectTimeout(time_t curtime)
                }
                else if (curtime > s->age + p.second)
                {
-                       ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002 (timeout of %d seconds)",p.first.c_str(),p.second);
+                       ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002 (timeout of %u seconds)",p.first.c_str(),p.second);
                        Utils->timeoutlist.erase(me);
                        s->Close();
                }
@@ -334,7 +334,7 @@ ModResult ModuleSpanningTree::HandleConnect(const std::vector<std::string>& para
                                return MOD_RES_DENY;
                        }
 
-                       TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str());
+                       TreeServer* CheckDupe = Utils->FindServer(x->Name);
                        if (!CheckDupe)
                        {
                                user->WriteRemoteNotice(InspIRCd::Format("*** CONNECT: Connecting to server: \002%s\002 (%s:%d)", x->Name.c_str(), (x->HiddenFromStats ? "<hidden>" : x->IPAddr.c_str()), x->Port));
@@ -365,6 +365,18 @@ void ModuleSpanningTree::OnUserInvite(User* source, User* dest, Channel* channel
        }
 }
 
+ModResult ModuleSpanningTree::OnPreTopicChange(User* user, Channel* chan, const std::string& topic)
+{
+       // XXX: Deny topic changes if the current topic set time is the current time or is in the future because
+       // other servers will drop our FTOPIC. This restriction will be removed when the protocol is updated.
+       if ((chan->topicset >= ServerInstance->Time()) && (Utils->serverlist.size() > 1))
+       {
+               user->WriteNumeric(ERR_CHANOPRIVSNEEDED, chan->name, "Retry topic change later");
+               return MOD_RES_DENY;
+       }
+       return MOD_RES_PASSTHRU;
+}
+
 void ModuleSpanningTree::OnPostTopicChange(User* user, Channel* chan, const std::string &topic)
 {
        // Drop remote events on the floor.
@@ -374,33 +386,33 @@ void ModuleSpanningTree::OnPostTopicChange(User* user, Channel* chan, const std:
        CommandFTopic::Builder(user, chan).Broadcast();
 }
 
-void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, const std::string& text, char status, const CUList& exempt_list, MessageType msgtype)
+void ModuleSpanningTree::OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details)
 {
        if (!IS_LOCAL(user))
                return;
 
-       const char* message_type = (msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
-       if (target_type == TYPE_USER)
+       const char* message_type = (details.type == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
+       if (target.type == MessageTarget::TYPE_USER)
        {
-               User* d = (User*) dest;
+               User* d = target.Get<User>();
                if (!IS_LOCAL(d))
                {
                        CmdBuilder params(user, message_type);
                        params.push_back(d->uuid);
-                       params.push_last(text);
+                       params.push_last(details.text);
                        params.Unicast(d);
                }
        }
-       else if (target_type == TYPE_CHANNEL)
+       else if (target.type == MessageTarget::TYPE_CHANNEL)
        {
-               Utils->SendChannelMessage(user->uuid, (Channel*)dest, text, status, exempt_list, message_type);
+               Utils->SendChannelMessage(user->uuid, target.Get<Channel>(), details.text, target.status, details.exemptions, message_type);
        }
-       else if (target_type == TYPE_SERVER)
+       else if (target.type == MessageTarget::TYPE_SERVER)
        {
-               char* target = (char*) dest;
+               const std::string* serverglob = target.Get<std::string>();
                CmdBuilder par(user, message_type);
-               par.push_back(target);
-               par.push_last(text);
+               par.push_back(*serverglob);
+               par.push_last(details.text);
                par.Broadcast();
        }
 }
@@ -630,7 +642,7 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod)
                {
                        TreeServer* server = i->second;
                        if (!server->IsRoot())
-                               FOREACH_MOD_CUSTOM(GetEventProvider(), SpanningTreeEventListener, OnServerSplit, (server));
+                               FOREACH_MOD_CUSTOM(GetEventProvider(), ServerEventListener, OnServerSplit, (server));
                }
                return;
        }
@@ -762,6 +774,7 @@ Version ModuleSpanningTree::GetVersion()
 void ModuleSpanningTree::Prioritize()
 {
        ServerInstance->Modules->SetPriority(this, PRIORITY_LAST);
+       ServerInstance->Modules.SetPriority(this, I_OnPreTopicChange, PRIORITY_FIRST);
 }
 
 MODULE_INIT(ModuleSpanningTree)