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 43f3c9b640743d5274ebb2f8afe11ef8f519df1e..86d511a2a970993a1aefd6752aa16f0551526642 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -274,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 */
@@ -333,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
@@ -573,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)
@@ -687,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);
@@ -878,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);