X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=5a2d4f8861b74757bdf990b163179beabb770e49;hb=001e9c1372a1c6fc2877f9d6607cf662f09228df;hp=64f01e83ce4c7fcb984684f61ee88af86e28b427;hpb=13a4f598b7e4ad56b5dc654d8f4b50b8a9851673;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index 64f01e83c..5a2d4f886 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -1,75 +1,63 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 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 "wildcard.h" #include "xline.h" -#include "transport.h" - -#include "m_spanningtree/utils.h" -#include "m_spanningtree/treeserver.h" +#include "main.h" +#include "modules/spanningtree.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; - ServerName.clear(); - ServerDesc.clear(); - VersionString.clear(); - UserCount = OperCount = 0; - rtt = LastPing = 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() + : Server(ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc) + , Parent(NULL), Route(NULL) + , VersionString(ServerInstance->GetVersionString()) + , fullversion(ServerInstance->GetVersionString(true)) + , Socket(NULL), sid(ServerInstance->Config->GetSID()), behind_bursting(0), ServerUser(ServerInstance->FakeClient) + , age(ServerInstance->Time()), Warned(false), UserCount(ServerInstance->Users.GetLocalUsers().size()) + , OperCount(0), rtt(0), StartBurst(0), Hidden(false) { - Parent = NULL; - VersionString.clear(); - UserCount = ServerInstance->UserCount(); - OperCount = ServerInstance->OperCount(); - VersionString = ServerInstance->GetVersionString(); - Route = NULL; - Socket = NULL; /* Fix by brain */ - rtt = LastPing = 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) + : Server(Name, Desc) + , Parent(Above), Socket(Sock), sid(id), behind_bursting(Parent->behind_bursting), ServerUser(new FakeUser(id, this)) + , age(ServerInstance->Time()), Warned(false), UserCount(0), OperCount(0), rtt(0), StartBurst(0), Hidden(Hide) { - VersionString.clear(); - UserCount = OperCount = 0; - this->SetNextPingTime(time(NULL) + Utils->PingFreq); - this->SetPingFlag(); - DupError = false; - rtt = LastPing = 0; + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "New server %s behind_bursting %u", GetName().c_str(), behind_bursting); + CheckULine(); + SetNextPingTime(ServerInstance->Time() + Utils->PingFreq); + SetPingFlag(); + /* find the 'route' for this server (e.g. the one directly connected * to the local server, which we can use to reach it) * @@ -122,57 +110,151 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str */ this->AddHashEntry(); + Parent->AddChild(this); +} - SetID(id); +void TreeServer::BeginBurst(unsigned long startms) +{ + behind_bursting++; + + unsigned long now = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000); + // If the start time is in the future (clocks are not synced) then use current time + if ((!startms) || (startms > now)) + startms = now; + this->StartBurst = startms; + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Server %s started bursting at time %lu behind_bursting %u", sid.c_str(), startms, behind_bursting); } -std::string& TreeServer::GetID() +const std::string& TreeServer::GetID() { return sid; } -void TreeServer::SetID(const std::string &id) +void TreeServer::FinishBurstInternal() { - ServerInstance->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; + // Check is needed because 1202 protocol servers don't send the bursting state of a server, so servers + // introduced during a netburst may later send ENDBURST which would normally decrease this counter + if (behind_bursting > 0) + behind_bursting--; + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "FinishBurstInternal() %s behind_bursting %u", GetName().c_str(), behind_bursting); + + if (!IsBehindBursting()) + { + SetNextPingTime(ServerInstance->Time() + Utils->PingFreq); + SetPingFlag(); + } + for (ChildServers::const_iterator i = Children.begin(); i != Children.end(); ++i) + { + TreeServer* child = *i; + child->FinishBurstInternal(); + } +} + +void TreeServer::FinishBurst() +{ + 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)", + GetName().c_str(), (bursttime > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs")); + AddServerEvent(Utils->Creator, GetName()); + + StartBurst = 0; + FinishBurstInternal(); +} + +void TreeServer::SQuitChild(TreeServer* server, const std::string& reason) +{ + DelServerEvent(Utils->Creator, server->GetName()); + DelChild(server); + + if (IsRoot()) + { + // Server split from us, generate a SQUIT message and broadcast it + ServerInstance->SNO->WriteGlobalSno('l', "Server \002" + server->GetName() + "\002 split: " + reason); + CmdBuilder("SQUIT").push(server->GetID()).push_last(reason).Broadcast(); + } else - DupError = true; + { + ServerInstance->SNO->WriteToSnoMask('L', "Server \002" + server->GetName() + "\002 split from server \002" + GetName() + "\002 with reason: " + reason); + } + + int num_lost_servers = 0; + int num_lost_users = 0; + const std::string quitreason = GetName() + " " + server->GetName(); + + ModuleSpanningTree* st = Utils->Creator; + st->SplitInProgress = true; + server->SQuitInternal(quitreason, num_lost_servers, num_lost_users); + st->SplitInProgress = false; + + ServerInstance->SNO->WriteToSnoMask(IsRoot() ? 'l' : 'L', "Netsplit complete, lost \002%d\002 user%s on \002%d\002 server%s.", + num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : ""); + + server->Tidy(); + + // No-op if the socket is already closed (i.e. it called us) + if (server->IsLocal()) + server->GetSocket()->Close(); + + server->cull(); + delete server; } -bool TreeServer::DuplicateID() +void TreeServer::SQuitInternal(const std::string& reason, int& num_lost_servers, int& num_lost_users) { - return DupError; + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Server %s lost in split", GetName().c_str()); + + for (ChildServers::const_iterator i = Children.begin(); i != Children.end(); ++i) + { + TreeServer* server = *i; + server->SQuitInternal(reason, num_lost_servers, num_lost_users); + } + + num_lost_servers++; + num_lost_users += QuitUsers(reason); + RemoveHash(); } int TreeServer::QuitUsers(const std::string &reason) { - const char* reason_s = reason.c_str(); - std::vector time_to_die; - for (user_hash::iterator n = ServerInstance->clientlist->begin(); n != ServerInstance->clientlist->end(); n++) + std::string publicreason = ServerInstance->Config->HideSplits ? "*.net *.split" : reason; + + const user_hash& users = ServerInstance->Users->GetUsers(); + unsigned int original_size = users.size(); + for (user_hash::const_iterator i = users.begin(); i != users.end(); ) { - if (!strcmp(n->second->server, this->ServerName.c_str())) - { - time_to_die.push_back(n->second); - } + User* user = i->second; + // Increment the iterator now because QuitUser() removes the user from the container + ++i; + if (user->server == this) + ServerInstance->Users->QuitUser(user, publicreason, &reason); } - for (std::vector::iterator n = time_to_die.begin(); n != time_to_die.end(); n++) + return original_size - users.size(); +} + +void TreeServer::CheckULine() +{ + uline = silentuline = false; + + ConfigTagList tags = ServerInstance->Config->ConfTags("uline"); + for (ConfigIter i = tags.first; i != tags.second; ++i) { - User* a = (User*)*n; - if (!IS_LOCAL(a)) + ConfigTag* tag = i->second; + std::string server = tag->getString("server"); + if (!strcasecmp(server.c_str(), GetName().c_str())) { - if (ServerInstance->Config->HideSplits) - User::QuitUser(ServerInstance, a, "*.net *.split", reason_s); - else - User::QuitUser(ServerInstance, a, reason_s); - - if (this->Utils->quiet_bursts) - ServerInstance->GlobalCulls.MakeSilent(a); + if (this->IsRoot()) + { + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Servers should not uline themselves (at " + tag->getTagLocation() + ")"); + return; + } + + uline = true; + silentuline = tag->getBool("silent"); + break; } } - return time_to_die.size(); } /** This method is used to add the structure to the @@ -181,20 +263,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[GetName()] = this; + Utils->sidlist[sid] = this; } /** These accessors etc should be pretty self- @@ -205,17 +275,7 @@ TreeServer* TreeServer::GetRoute() return Route; } -std::string TreeServer::GetName() -{ - return ServerName.c_str(); -} - -std::string TreeServer::GetDesc() -{ - return ServerDesc; -} - -std::string TreeServer::GetVersion() +const std::string& TreeServer::GetVersion() { return VersionString; } @@ -241,26 +301,6 @@ void TreeServer::SetPingFlag() LastPingWasGood = true; } -int TreeServer::GetUserCount() -{ - return UserCount; -} - -void TreeServer::AddUserCount() -{ - UserCount++; -} - -void TreeServer::DelUserCount() -{ - UserCount--; -} - -int TreeServer::GetOperCount() -{ - return OperCount; -} - TreeSocket* TreeServer::GetSocket() { return Socket; @@ -276,28 +316,6 @@ void TreeServer::SetVersion(const std::string &Version) VersionString = Version; } -unsigned int TreeServer::ChildCount() -{ - return Children.size(); -} - -TreeServer* TreeServer::GetChild(unsigned int n) -{ - if (n < Children.size()) - { - /* Make sure they cant request - * an out-of-range object. After - * all we know what these programmer - * types are like *grin*. - */ - return Children[n]; - } - else - { - return NULL; - } -} - void TreeServer::AddChild(TreeServer* Child) { Children.push_back(Child); @@ -305,13 +323,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; } @@ -320,33 +336,37 @@ 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(); - - server_hash::iterator iter = Utils->sidlist.find(GetID()); - if (iter != Utils->sidlist.end()) - Utils->sidlist.erase(iter); + if (!IsRoot()) + delete ServerUser; } - +void TreeServer::RemoveHash() +{ + Utils->sidlist.erase(sid); + Utils->serverlist.erase(GetName()); +}