Fix various rline bugs, implement /stats R, and fix the issue where you get no error...

[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 9688cfb7dab10414fae80ce25c72ee34a5d3da86..86d511a2a970993a1aefd6752aa16f0551526642 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -17,11 +17,10 @@
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "transport.h"
 
-#include "m_spanningtree/timesynctimer.h"
+#include "m_spanningtree/cachetimer.h"
 #include "m_spanningtree/resolvers.h"
 #include "m_spanningtree/main.h"
 #include "m_spanningtree/utils.h"
@@ -32,7 +31,7 @@
 #include "m_spanningtree/rsquit.h"
 #include "m_spanningtree/protocolinterface.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h m_spanningtree/protocolinterface.h */
+/* $ModDep: m_spanningtree/cachetimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h m_spanningtree/protocolinterface.h */
 
 ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me)
        : Module(Me), max_local(0), max_global(0)
@@ -193,16 +192,6 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime)
        {
                TreeServer *s = i->second;
 
-               if (s->bursting)
-               {
-                       unsigned long bursttime = ts - s->StartBurst;
-                       if (bursttime > 60000) // A minute
-                       {
-                               ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not finished burst, forcing end of burst.", s->GetName().c_str());
-                               s->FinishBurst();
-                       }
-               }
-
                // Now do PING checks on all servers
                TreeServer *mts = Utils->BestRouteTo(s->GetID());
 
@@ -255,6 +244,13 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime)
 void ModuleSpanningTree::ConnectServer(Link* x)
 {
        bool ipvalid = true;
+
+       if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name)))
+       {
+               RemoteMessage(NULL, "CONNECT: Not connecting to myself.");
+               return;
+       }
+
        QueryType start_type = DNS_QUERY_A;
 #ifdef IPV6
        start_type = DNS_QUERY_AAAA;
@@ -278,7 +274,7 @@ void ModuleSpanningTree::ConnectServer(Link* x)
                /* Gave a hook, but it wasnt one we know */
                if ((!x->Hook.empty()) && (Utils->hooks.find(x->Hook.c_str()) == Utils->hooks.end()))
                        return;
-               TreeSocket* newsocket = new TreeSocket(Utils, ServerInstance, x->IPAddr,x->Port,false,x->Timeout ? x->Timeout : 10,x->Name.c_str(), x->Bind, x->Hook.empty() ? NULL : Utils->hooks[x->Hook.c_str()]);
+               TreeSocket* newsocket = new TreeSocket(Utils, ServerInstance, x->IPAddr,x->Port, x->Timeout ? x->Timeout : 10,x->Name.c_str(), x->Bind, x->Hook.empty() ? NULL : Utils->hooks[x->Hook.c_str()]);
                if (newsocket->GetFd() > -1)
                {
                        /* Handled automatically on success */
@@ -337,6 +333,30 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime)
        }
 }
 
+void ModuleSpanningTree::DoConnectTimeout(time_t curtime)
+{
+       std::vector<Link*> failovers;
+       for (std::map<TreeSocket*, std::pair<std::string, int> >::iterator i = Utils->timeoutlist.begin(); i != Utils->timeoutlist.end(); i++)
+       {
+               TreeSocket* s = i->first;
+               std::pair<std::string, int> p = i->second;
+               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->SE->DelFd(s);
+                       s->Close();
+                       Link* MyLink = Utils->FindLink(p.first);
+                       if (MyLink)
+                               failovers.push_back(MyLink);
+               }
+       }
+       /* Trigger failover for each timed out socket */
+       for (std::vector<Link*>::const_iterator n = failovers.begin(); n != failovers.end(); ++n)
+       {
+               Utils->DoFailOver(*n);
+       }
+}
+
 int ModuleSpanningTree::HandleVersion(const std::vector<std::string>& parameters, User* user)
 {
        // we've already checked if pcnt > 0, so this is safe
@@ -402,8 +422,14 @@ int ModuleSpanningTree::HandleConnect(const std::vector<std::string>& parameters
 {
        for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
        {
-               if (ServerInstance->MatchText(x->Name.c_str(),parameters[0]))
+               if (InspIRCd::Match(x->Name.c_str(),parameters[0]))
                {
+                       if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name)))
+                       {
+                               RemoteMessage(user, "*** CONNECT: Server \002%s\002 is ME, not connecting.",x->Name.c_str());
+                               return 1;
+                       }
+
                        TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str());
                        if (!CheckDupe)
                        {
@@ -571,6 +597,7 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime)
 {
        AutoConnectServers(curtime);
        DoPingChecks(curtime);
+       DoConnectTimeout(curtime);
 }
 
 void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
@@ -610,7 +637,7 @@ void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos)
        Utils->DoOneToMany(user->uuid,"FNAME",params);
 }
 
-void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
+void ModuleSpanningTree::OnUserPart(User* user, Channel* channel,  std::string &partmessage, bool &silent)
 {
        if (IS_LOCAL(user))
        {
@@ -685,6 +712,7 @@ void ModuleSpanningTree::OnUserKick(User* source, User* user, Channel* chan, con
 
 void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason)
 {
+       if (!IS_LOCAL(source)) return; // Only start routing if we're origin.
        std::deque<std::string> params;
        params.push_back(":"+reason);
        Utils->DoOneToMany(dest->uuid,"OPERQUIT",params);
@@ -705,7 +733,7 @@ void ModuleSpanningTree::OnRehash(User* user, const std::string &parameter)
                ServerInstance->Logs->Log("remoterehash", DEBUG, "sending out lol");
                std::deque<std::string> params;
                params.push_back(parameter);
-               Utils->DoOneToAllButSender(user ? user->uuid : ServerInstance->Config->GetSID(), "REHASH", params, user ? user->server : ServerInstance->Config->GetSID()); /// Can this take SID?
+               Utils->DoOneToAllButSender(user ? user->uuid : ServerInstance->Config->GetSID(), "REHASH", params, user ? user->server : ServerInstance->Config->ServerName);
        }
 
        // Re-read config stuff
@@ -876,10 +904,10 @@ void ModuleSpanningTree::OnEvent(Event* event)
 
 ModuleSpanningTree::~ModuleSpanningTree()
 {
-       /* This will also free the listeners */
        delete ServerInstance->PI;
        ServerInstance->PI = new ProtocolInterface(ServerInstance);
 
+       /* This will also free the listeners */
        delete Utils;
 
        ServerInstance->Timers->DelTimer(RefreshTimer);
@@ -889,7 +917,7 @@ ModuleSpanningTree::~ModuleSpanningTree()
 
 Version ModuleSpanningTree::GetVersion()
 {
-       return Version(1,2,0,2,VF_VENDOR,API_VERSION);
+       return Version("$Id$", VF_VENDOR, API_VERSION);
 }
 
 /* It is IMPORTANT that m_spanningtree is the last module in the chain