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 264ee1078cbc6fe9a4a9f25ecf238ca6c29ad35a..86d511a2a970993a1aefd6752aa16f0551526642 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -335,6 +335,7 @@ 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;
@@ -344,8 +345,16 @@ void ModuleSpanningTree::DoConnectTimeout(time_t curtime)
                        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)