]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_spanningtree/treeserver.cpp
Merge pull request #495 from SaberUK/master+fix-libcpp
[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treeserver.cpp
index 49d34538316cd23904355b946466d2404fb29929..4ce7c49d5d2cc803036671e7caf5dfdfb8e87554 100644 (file)
@@ -1,58 +1,52 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "main.h"
+#include "modules/spanningtree.h"
 
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
+#include "utils.h"
+#include "treeserver.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h */
 
-TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, const std::string &id) : ServerInstance(Instance), Utils(Util)
-{
-       Parent = NULL;
-       bursting = false;
-       ServerName.clear();
-       ServerDesc.clear();
-       VersionString.clear();
-       ServerUserCount = ServerOperCount = 0;
-       StartBurst = rtt = 0;
-       Warned = Hidden = DupError = false;
-       VersionString = ServerInstance->GetVersionString();
-       SetID(id);
-}
-
 /** We use this constructor only to create the 'root' item, Utils->TreeRoot, which
  * represents our own server. Therefore, it has no route, no parent, and
  * no socket associated with it. Its version string is our own local version.
  */
-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)
+TreeServer::TreeServer(SpanningTreeUtilities* Util, std::string Name, std::string Desc, const std::string &id)
+       : ServerName(Name.c_str()), ServerDesc(Desc), Utils(Util), ServerUser(ServerInstance->FakeClient)
 {
+       age = ServerInstance->Time();
        bursting = false;
        Parent = NULL;
        VersionString.clear();
-       ServerUserCount = ServerOperCount = 0;
+       UserCount = OperCount = 0;
        VersionString = ServerInstance->GetVersionString();
        Route = NULL;
        Socket = NULL; /* Fix by brain */
        StartBurst = rtt = 0;
-       Warned = Hidden = DupError = false;
+       Warned = Hidden = false;
        AddHashEntry();
        SetID(id);
 }
@@ -61,22 +55,21 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str
  * This constructor initializes the server's Route and Parent, and sets up
  * its ping counters so that it will be pinged one minute from now.
  */
-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)
+TreeServer::TreeServer(SpanningTreeUtilities* Util, std::string Name, std::string Desc, const std::string &id, TreeServer* Above, TreeSocket* Sock, bool Hide)
+       : Parent(Above), ServerName(Name.c_str()), ServerDesc(Desc), Socket(Sock), Utils(Util), ServerUser(new FakeUser(id, Name)), Hidden(Hide)
 {
-       bursting = false;
+       age = ServerInstance->Time();
+       bursting = true;
        VersionString.clear();
-       ServerUserCount = ServerOperCount = 0;
-       this->SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
-       this->SetPingFlag();
-       Warned = DupError = false;
-       StartBurst = rtt = 0;
+       UserCount = OperCount = 0;
+       SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
+       SetPingFlag();
+       Warned = false;
+       rtt = 0;
 
-       timeval t;
-       gettimeofday(&t, NULL);
-       long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
+       long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
        this->StartBurst = ts;
-       Instance->Logs->Log("m_spanningtree",DEBUG, "Started bursting at time %lu", ts);
+       ServerInstance->Logs->Log("m_spanningtree",LOG_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)
@@ -134,38 +127,39 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str
        SetID(id);
 }
 
-std::string& TreeServer::GetID()
+const std::string& TreeServer::GetID()
 {
        return sid;
 }
 
-void TreeServer::FinishBurst()
+void TreeServer::FinishBurstInternal()
 {
        this->bursting = false;
+       SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
+       SetPingFlag();
+       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);
+       long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
        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);
+       ServerInstance->SNO->WriteToSnoMask(Parent == Utils->TreeRoot ? 'l' : 'L', "Received end of netburst from \2%s\2 (burst time: %lu %s)",
+               ServerName.c_str(), (bursttime > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs"));
+       AddServerEvent(Utils->Creator, ServerName.c_str());
 }
 
 void TreeServer::SetID(const std::string &id)
 {
-       ServerInstance->Logs->Log("m_spanningtree",DEBUG, "Setting SID to " + id);
+       ServerInstance->Logs->Log("m_spanningtree",LOG_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)
@@ -174,7 +168,7 @@ int TreeServer::QuitUsers(const std::string &reason)
        std::vector<User*> time_to_die;
        for (user_hash::iterator n = ServerInstance->Users->clientlist->begin(); n != ServerInstance->Users->clientlist->end(); n++)
        {
-               if (!strcmp(n->second->server, this->ServerName.c_str()))
+               if (n->second->server == ServerName)
                {
                        time_to_die.push_back(n->second);
                }
@@ -184,13 +178,13 @@ int TreeServer::QuitUsers(const std::string &reason)
                User* a = (User*)*n;
                if (!IS_LOCAL(a))
                {
+                       if (this->Utils->quiet_bursts)
+                               a->quietquit = true;
+
                        if (ServerInstance->Config->HideSplits)
                                ServerInstance->Users->QuitUser(a, "*.net *.split", reason_s);
                        else
                                ServerInstance->Users->QuitUser(a, reason_s);
-
-                       if (this->Utils->quiet_bursts)
-                               ServerInstance->GlobalCulls.MakeSilent(a);
                }
        }
        return time_to_die.size();
@@ -231,12 +225,12 @@ std::string TreeServer::GetName()
        return ServerName.c_str();
 }
 
-std::string TreeServer::GetDesc()
+const std::string& TreeServer::GetDesc()
 {
        return ServerDesc;
 }
 
-std::string TreeServer::GetVersion()
+const std::string& TreeServer::GetVersion()
 {
        return VersionString;
 }
@@ -262,26 +256,6 @@ void TreeServer::SetPingFlag()
        LastPingWasGood = true;
 }
 
-unsigned int TreeServer::GetUserCount()
-{
-       return ServerUserCount;
-}
-
-void TreeServer::SetUserCount(int diff)
-{
-       ServerUserCount += diff;
-}
-
-void TreeServer::SetOperCount(int diff)
-{
-       ServerOperCount += diff;
-}
-
-unsigned int TreeServer::GetOperCount()
-{
-       return ServerOperCount;
-}
-
 TreeSocket* TreeServer::GetSocket()
 {
        return Socket;
@@ -326,13 +300,11 @@ void TreeServer::AddChild(TreeServer* Child)
 
 bool TreeServer::DelChild(TreeServer* Child)
 {
-       for (std::vector<TreeServer*>::iterator a = Children.begin(); a < Children.end(); a++)
+       std::vector<TreeServer*>::iterator it = std::find(Children.begin(), Children.end(), Child);
+       if (it != Children.end())
        {
-               if (*a == Child)
-               {
-                       Children.erase(a);
-                       return true;
-               }
+               Children.erase(it);
+               return true;
        }
        return false;
 }
@@ -343,27 +315,32 @@ bool TreeServer::DelChild(TreeServer* Child)
  */
 bool TreeServer::Tidy()
 {
-       bool stillchildren = true;
-       while (stillchildren)
+       while (1)
        {
-               stillchildren = false;
-               for (std::vector<TreeServer*>::iterator a = Children.begin(); a < Children.end(); a++)
-               {
-                       TreeServer* s = (TreeServer*)*a;
-                       s->Tidy();
-                       Children.erase(a);
-                       delete s;
-                       stillchildren = true;
-                       break;
-               }
+               std::vector<TreeServer*>::iterator a = Children.begin();
+               if (a == Children.end())
+                       return true;
+               TreeServer* s = *a;
+               s->Tidy();
+               s->cull();
+               Children.erase(a);
+               delete s;
        }
-       return true;
+}
+
+CullResult TreeServer::cull()
+{
+       if (ServerUser != ServerInstance->FakeClient)
+               ServerUser->cull();
+       return classbase::cull();
 }
 
 TreeServer::~TreeServer()
 {
        /* We'd better tidy up after ourselves, eh? */
        this->DelHashEntry();
+       if (ServerUser != ServerInstance->FakeClient)
+               delete ServerUser;
 
        server_hash::iterator iter = Utils->sidlist.find(GetID());
        if (iter != Utils->sidlist.end())