Fix for bug #792 reported by recyclebin, do not attempt to ping local servers which...

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

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index db26b3f889ee6a0a414eba0cd5ebd9a27e17d808..455b49c846030a174746ffbc40b29e7365aaaaf7 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -15,7 +15,6 @@
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "transport.h"
 
@@ -33,7 +32,7 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, const st
        VersionString.clear();
        ServerUserCount = ServerOperCount = 0;
        StartBurst = rtt = 0;
-       Warned = Hidden = DupError = false;
+       Warned = Hidden = false;
        VersionString = ServerInstance->GetVersionString();
        SetID(id);
 }
@@ -53,7 +52,7 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str
        Route = NULL;
        Socket = NULL; /* Fix by brain */
        StartBurst = rtt = 0;
-       Warned = Hidden = DupError = false;
+       Warned = Hidden = false;
        AddHashEntry();
        SetID(id);
 }
@@ -68,9 +67,9 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str
        bursting = false;
        VersionString.clear();
        ServerUserCount = ServerOperCount = 0;
-       this->SetNextPingTime(time(NULL) + Utils->PingFreq);
+       this->SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
        this->SetPingFlag();
-       DupError = false;
+       Warned = false;
        StartBurst = rtt = 0;
 
        timeval t;
@@ -140,16 +139,25 @@ std::string& TreeServer::GetID()
        return sid;
 }
 
-void TreeServer::FinishBurst()
+void TreeServer::FinishBurstInternal()
 {
        this->bursting = false;
+       for(unsigned int q=0; q < ChildCount(); q++)
+       {
+               TreeServer* child = GetChild(q);
+               child->FinishBurstInternal();
+       }
+}
+
+void TreeServer::FinishBurst()
+{
+       FinishBurstInternal();
        ServerInstance->XLines->ApplyLines();
        timeval t;
        gettimeofday(&t, NULL);
        long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
        unsigned long bursttime = ts - this->StartBurst;
-       ServerInstance->SNO->WriteToSnoMask('l', "Received end of netburst from \2%s\2 (burst time: %lu %s)", ServerName.c_str(),
-                                               (bursttime > 1000 ? bursttime / 1000 : bursttime), (bursttime > 1000 ? "secs" : "msecs"));
+       ServerInstance->SNO->WriteToSnoMask('l', "Received end of netburst from \2%s\2 (burst time: %lu %s)", ServerName.c_str(), (bursttime > 1000 ? bursttime / 1000 : bursttime), (bursttime > 1000 ? "secs" : "msecs"));
        Event rmode((char*)ServerName.c_str(),  (Module*)Utils->Creator, "new_server");
        rmode.Send(ServerInstance);
 }
@@ -158,16 +166,7 @@ void TreeServer::SetID(const std::string &id)
 {
        ServerInstance->Logs->Log("m_spanningtree",DEBUG, "Setting SID to " + id);
        sid = id;
-       server_hash::iterator iter = Utils->sidlist.find(sid);
-       if (iter == Utils->sidlist.end())
-               Utils->sidlist[sid] = this;
-       else
-               DupError = true;
-}
-
-bool TreeServer::DuplicateID()
-{
-       return DupError;
+       Utils->sidlist[sid] = this;
 }
 
 int TreeServer::QuitUsers(const std::string &reason)
@@ -187,9 +186,9 @@ int TreeServer::QuitUsers(const std::string &reason)
                if (!IS_LOCAL(a))
                {
                        if (ServerInstance->Config->HideSplits)
-                               User::QuitUser(ServerInstance, a, "*.net *.split", reason_s);
+                               ServerInstance->Users->QuitUser(a, "*.net *.split", reason_s);
                        else
-                               User::QuitUser(ServerInstance, a, reason_s);
+                               ServerInstance->Users->QuitUser(a, reason_s);
 
                        if (this->Utils->quiet_bursts)
                                ServerInstance->GlobalCulls.MakeSilent(a);
@@ -371,5 +370,3 @@ TreeServer::~TreeServer()
        if (iter != Utils->sidlist.end())
                Utils->sidlist.erase(iter);
 }
-
-