X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=54ea5922fbaa56a770c31935c91455bc9cddfb65;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=f4939c00e96e1e3b876b5ef5f401adeee8e6dea4;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index f4939c00e..54ea5922f 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -1,82 +1,59 @@ -/* +------------------------------------+ - * | 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 + * Copyright (C) 2007-2008 Craig Edwards + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis * - * 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 . */ + #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" - -/* $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); -} +#include "utils.h" +#include "treeserver.h" /** 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() + : Parent(NULL), Route(NULL), ServerName(ServerInstance->Config->ServerName), ServerDesc(ServerInstance->Config->ServerDesc) + , VersionString(ServerInstance->GetVersionString()), Socket(NULL), sid(ServerInstance->Config->GetSID()), ServerUser(ServerInstance->FakeClient) + , age(ServerInstance->Time()), Warned(false), bursting(false), UserCount(0), OperCount(0), rtt(0), StartBurst(0), Hidden(false) { - bursting = false; - Parent = NULL; - VersionString.clear(); - ServerUserCount = ServerOperCount = 0; - VersionString = ServerInstance->GetVersionString(); - Route = NULL; - Socket = NULL; /* Fix by brain */ - StartBurst = rtt = 0; - Warned = Hidden = DupError = false; AddHashEntry(); - SetID(id); } /** When we create a new server, we call this constructor to initialize it. * 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(const std::string& Name, const std::string& Desc, const std::string& id, TreeServer* Above, TreeSocket* Sock, bool Hide) + : Parent(Above), ServerName(Name), ServerDesc(Desc), Socket(Sock), sid(id), ServerUser(new FakeUser(id, Name)) + , age(ServerInstance->Time()), Warned(false), bursting(true), UserCount(0), OperCount(0), rtt(0), Hidden(Hide) { - bursting = false; - VersionString.clear(); - ServerUserCount = ServerOperCount = 0; - this->SetNextPingTime(ServerInstance->Time() + Utils->PingFreq); - this->SetPingFlag(); - Warned = DupError = false; - StartBurst = rtt = 0; - - timeval t; - gettimeofday(&t, NULL); - long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000); + SetNextPingTime(ServerInstance->Time() + Utils->PingFreq); + SetPingFlag(); + + 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(MODNAME, LOG_DEBUG, "Server %s started bursting at time %lu", sid.c_str(), ts); /* find the 'route' for this server (e.g. the one directly connected * to the local server, which we can use to reach it) @@ -130,42 +107,34 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str */ this->AddHashEntry(); - - SetID(id); } -std::string& TreeServer::GetID() +const std::string& TreeServer::GetID() { return sid; } -void TreeServer::FinishBurst() +void TreeServer::FinishBurstInternal() { this->bursting = false; - 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; - server_hash::iterator iter = Utils->sidlist.find(sid); - if (iter == Utils->sidlist.end()) - Utils->sidlist[sid] = this; - else - DupError = true; + SetNextPingTime(ServerInstance->Time() + Utils->PingFreq); + SetPingFlag(); + 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(); + long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000); + unsigned long bursttime = ts - this->StartBurst; + 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); } int TreeServer::QuitUsers(const std::string &reason) @@ -174,7 +143,7 @@ int TreeServer::QuitUsers(const std::string &reason) std::vector 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 +153,13 @@ int TreeServer::QuitUsers(const std::string &reason) User* a = (User*)*n; if (!IS_LOCAL(a)) { + if (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(); @@ -202,20 +171,8 @@ int TreeServer::QuitUsers(const std::string &reason) */ void TreeServer::AddHashEntry() { - server_hash::iterator iter = Utils->serverlist.find(this->ServerName.c_str()); - if (iter == Utils->serverlist.end()) - Utils->serverlist[this->ServerName.c_str()] = this; -} - -/** This method removes the reference to this object - * from the hash_map which is used for linear searches. - * It is only called by the default destructor. - */ -void TreeServer::DelHashEntry() -{ - server_hash::iterator iter = Utils->serverlist.find(this->ServerName.c_str()); - if (iter != Utils->serverlist.end()) - Utils->serverlist.erase(iter); + Utils->serverlist[ServerName] = this; + Utils->sidlist[sid] = this; } /** These accessors etc should be pretty self- @@ -226,17 +183,12 @@ TreeServer* TreeServer::GetRoute() return Route; } -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 +214,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 +258,11 @@ void TreeServer::AddChild(TreeServer* Child) bool TreeServer::DelChild(TreeServer* Child) { - for (std::vector::iterator a = Children.begin(); a < Children.end(); a++) + std::vector::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; } @@ -341,33 +271,34 @@ bool TreeServer::DelChild(TreeServer* Child) * This is used during netsplits to automatically tidy up the * server tree. It is slow, we don't use it for much else. */ -bool TreeServer::Tidy() +void TreeServer::Tidy() { - bool stillchildren = true; - while (stillchildren) + while (1) { - stillchildren = false; - for (std::vector::iterator a = Children.begin(); a < Children.end(); a++) - { - TreeServer* s = (TreeServer*)*a; - s->Tidy(); - Children.erase(a); - delete s; - stillchildren = true; - break; - } + std::vector::iterator a = Children.begin(); + if (a == Children.end()) + return; + TreeServer* s = *a; + s->Tidy(); + s->cull(); + Children.erase(a); + delete s; } - return true; +} + +CullResult TreeServer::cull() +{ + if (!IsRoot()) + ServerUser->cull(); + return classbase::cull(); } TreeServer::~TreeServer() { /* We'd better tidy up after ourselves, eh? */ - this->DelHashEntry(); + if (!IsRoot()) + delete ServerUser; - server_hash::iterator iter = Utils->sidlist.find(GetID()); - if (iter != Utils->sidlist.end()) - Utils->sidlist.erase(iter); + Utils->sidlist.erase(sid); + Utils->serverlist.erase(ServerName); } - -