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 3e13526aada71ffd24983a1630acee57f2fdafe6..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-2007 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"
 
@@ -27,12 +26,13 @@
 TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, const std::string &id) : ServerInstance(Instance), Utils(Util)
 {
        Parent = NULL;
+       bursting = false;
        ServerName.clear();
        ServerDesc.clear();
        VersionString.clear();
-       UserCount = OperCount = 0;
-       rtt = LastPing = 0;
-       Warned = Hidden = DupError = false;
+       ServerUserCount = ServerOperCount = 0;
+       StartBurst = rtt = 0;
+       Warned = Hidden = false;
        VersionString = ServerInstance->GetVersionString();
        SetID(id);
 }
@@ -44,15 +44,15 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, const st
 TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, const std::string &id)
                                                : ServerInstance(Instance), ServerName(Name.c_str()), ServerDesc(Desc), Utils(Util)
 {
+       bursting = false;
        Parent = NULL;
        VersionString.clear();
-       UserCount = ServerInstance->UserCount();
-       OperCount = ServerInstance->OperCount();
+       ServerUserCount = ServerOperCount = 0;
        VersionString = ServerInstance->GetVersionString();
        Route = NULL;
        Socket = NULL; /* Fix by brain */
-       rtt = LastPing = 0;
-       Warned = Hidden = DupError = false;
+       StartBurst = rtt = 0;
+       Warned = Hidden = false;
        AddHashEntry();
        SetID(id);
 }
@@ -64,12 +64,20 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str
 TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, const std::string &id, TreeServer* Above, TreeSocket* Sock, bool Hide)
        : ServerInstance(Instance), Parent(Above), ServerName(Name.c_str()), ServerDesc(Desc), Socket(Sock), Utils(Util), Hidden(Hide)
 {
+       bursting = false;
        VersionString.clear();
-       UserCount = OperCount = 0;
-       this->SetNextPingTime(time(NULL) + Utils->PingFreq);
+       ServerUserCount = ServerOperCount = 0;
+       this->SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
        this->SetPingFlag();
-       DupError = false;
-       rtt = LastPing = 0;
+       Warned = false;
+       StartBurst = rtt = 0;
+
+       timeval t;
+       gettimeofday(&t, NULL);
+       long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
+       this->StartBurst = ts;
+       Instance->Logs->Log("m_spanningtree",DEBUG, "Started bursting at time %lu", ts);
+
        /* find the 'route' for this server (e.g. the one directly connected
         * to the local server, which we can use to reach it)
         *
@@ -131,26 +139,41 @@ std::string& TreeServer::GetID()
        return sid;
 }
 
-void TreeServer::SetID(const std::string &id)
+void TreeServer::FinishBurstInternal()
 {
-       sid = id;
-       server_hash::iterator iter = Utils->sidlist.find(sid);
-       if (iter == Utils->sidlist.end())
-               Utils->sidlist[sid] = this;
-       else
-               DupError = true;
+       this->bursting = false;
+       for(unsigned int q=0; q < ChildCount(); q++)
+       {
+               TreeServer* child = GetChild(q);
+               child->FinishBurstInternal();
+       }
 }
 
-bool TreeServer::DuplicateID()
+void TreeServer::FinishBurst()
 {
-       return DupError;
+       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"));
+       Event rmode((char*)ServerName.c_str(),  (Module*)Utils->Creator, "new_server");
+       rmode.Send(ServerInstance);
+}
+
+void TreeServer::SetID(const std::string &id)
+{
+       ServerInstance->Logs->Log("m_spanningtree",DEBUG, "Setting SID to " + id);
+       sid = id;
+       Utils->sidlist[sid] = this;
 }
 
 int TreeServer::QuitUsers(const std::string &reason)
 {
        const char* reason_s = reason.c_str();
        std::vector<User*> time_to_die;
-       for (user_hash::iterator n = ServerInstance->clientlist->begin(); n != ServerInstance->clientlist->end(); n++)
+       for (user_hash::iterator n = ServerInstance->Users->clientlist->begin(); n != ServerInstance->Users->clientlist->end(); n++)
        {
                if (!strcmp(n->second->server, this->ServerName.c_str()))
                {
@@ -163,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);
@@ -240,24 +263,24 @@ void TreeServer::SetPingFlag()
        LastPingWasGood = true;
 }
 
-int TreeServer::GetUserCount()
+unsigned int TreeServer::GetUserCount()
 {
-       return UserCount;
+       return ServerUserCount;
 }
 
-void TreeServer::AddUserCount()
+void TreeServer::SetUserCount(int diff)
 {
-       UserCount++;
+       ServerUserCount += diff;
 }
 
-void TreeServer::DelUserCount()
+void TreeServer::SetOperCount(int diff)
 {
-       UserCount--;
+       ServerOperCount += diff;
 }
 
-int TreeServer::GetOperCount()
+unsigned int TreeServer::GetOperCount()
 {
-       return OperCount;
+       return ServerOperCount;
 }
 
 TreeSocket* TreeServer::GetSocket()
@@ -347,5 +370,3 @@ TreeServer::~TreeServer()
        if (iter != Utils->sidlist.end())
                Utils->sidlist.erase(iter);
 }
-
-