X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=6920fc97b6b5f80eff1b79d96ac8d7bb5ce1ed1e;hb=b4a174ee9c32d62ea6bf010e837e8c5b1c3d36a3;hp=3d57b1314f15ff15a3be5d3b6b1159b9bbc66339;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index 3d57b1314..6920fc97b 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -1,9 +1,13 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2018-2020 Sadie Powell + * Copyright (C) 2017 B00mX0r + * Copyright (C) 2013-2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2007-2008 Craig Edwards * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007, 2010 Craig Edwards * Copyright (C) 2007 Dennis Friis * * This file is part of InspIRCd. InspIRCd is free software: you can @@ -23,7 +27,6 @@ #include "inspircd.h" #include "xline.h" #include "main.h" -#include "modules/spanningtree.h" #include "utils.h" #include "treeserver.h" @@ -33,30 +36,49 @@ * no socket associated with it. Its version string is our own local version. */ TreeServer::TreeServer() - : Server(ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc) + : Server(ServerInstance->Config->GetSID(), ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc) , Parent(NULL), Route(NULL) - , 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) + , VersionString(ServerInstance->GetVersionString()) + , fullversion(ServerInstance->GetVersionString(true)) + , rawversion(INSPIRCD_VERSION) + , Socket(NULL) + , behind_bursting(0) + , isdead(false) + , pingtimer(this) + , ServerUser(ServerInstance->FakeClient) + , age(ServerInstance->Time()) + , UserCount(ServerInstance->Users.LocalUserCount()) + , OperCount(0) + , rtt(0) + , StartBurst(0) + , Hidden(false) { AddHashEntry(); } /** 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. + * the ping timer for the server. */ -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), ServerUser(new FakeUser(id, this)) - , age(ServerInstance->Time()), Warned(false), bursting(true), UserCount(0), OperCount(0), rtt(0), Hidden(Hide) +TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const std::string& Sid, TreeServer* Above, TreeSocket* Sock, bool Hide) + : Server(Sid, Name, Desc) + , Parent(Above) + , Socket(Sock) + , behind_bursting(Parent->behind_bursting) + , isdead(false) + , pingtimer(this) + , ServerUser(new FakeUser(id, this)) + , age(ServerInstance->Time()) + , UserCount(0) + , OperCount(0) + , rtt(0) + , StartBurst(0) + , Hidden(Hide) { + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "New server %s behind_bursting %u", GetName().c_str(), behind_bursting); CheckULine(); - SetNextPingTime(ServerInstance->Time() + Utils->PingFreq); - SetPingFlag(); - long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000); - this->StartBurst = ts; - ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Server %s started bursting at time %lu", sid.c_str(), ts); + ServerInstance->Timers.AddTimer(&pingtimer); /* find the 'route' for this server (e.g. the one directly connected * to the local server, which we can use to reach it) @@ -105,23 +127,36 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s * be referenced by its server name. The AddHashEntry() * call below automatically inserts each TreeServer class * into the hash_map as it is created. There is a similar - * maintainance call in the destructor to tidy up deleted + * maintenance call in the destructor to tidy up deleted * servers. */ this->AddHashEntry(); + Parent->Children.push_back(this); + + FOREACH_MOD_CUSTOM(Utils->Creator->GetLinkEventProvider(), ServerProtocol::LinkEventListener, OnServerLink, (this)); } -const std::string& TreeServer::GetID() +void TreeServer::BeginBurst(uint64_t startms) { - return sid; + behind_bursting++; + + uint64_t 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 %s behind_bursting %u", GetId().c_str(), ConvToStr(startms).c_str(), behind_bursting); } void TreeServer::FinishBurstInternal() { - this->bursting = false; - SetNextPingTime(ServerInstance->Time() + Utils->PingFreq); - SetPingFlag(); + // 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); + for (ChildServers::const_iterator i = Children.begin(); i != Children.end(); ++i) { TreeServer* child = *i; @@ -131,18 +166,71 @@ void TreeServer::FinishBurstInternal() void TreeServer::FinishBurst() { - FinishBurstInternal(); ServerInstance->XLines->ApplyLines(); - long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000); + uint64_t 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)", + ServerInstance->SNO->WriteToSnoMask(Parent == Utils->TreeRoot ? 'l' : 'L', "Received end of netburst from \002%s\002 (burst time: %lu %s)", GetName().c_str(), (bursttime > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs")); - AddServerEvent(Utils->Creator, GetName()); + FOREACH_MOD_CUSTOM(Utils->Creator->GetLinkEventProvider(), ServerProtocol::LinkEventListener, OnServerBurst, (this)); + + StartBurst = 0; + FinishBurstInternal(); +} + +void TreeServer::SQuitChild(TreeServer* server, const std::string& reason, bool error) +{ + stdalgo::erase(Children, 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 + { + ServerInstance->SNO->WriteToSnoMask('L', "Server \002" + server->GetName() + "\002 split from server \002" + GetName() + "\002 with reason: " + reason); + } + + unsigned int num_lost_servers = 0; + server->SQuitInternal(num_lost_servers, error); + + const std::string quitreason = GetName() + " " + server->GetName(); + unsigned int num_lost_users = QuitUsers(quitreason); + + ServerInstance->SNO->WriteToSnoMask(IsRoot() ? 'l' : 'L', "Netsplit complete, lost \002%u\002 user%s on \002%u\002 server%s.", + num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : ""); + + // No-op if the socket is already closed (i.e. it called us) + if (server->IsLocal()) + server->GetSocket()->Close(); + + // Add the server to the cull list, the servers behind it are handled by cull() and the destructor + ServerInstance->GlobalCulls.AddItem(server); } -int TreeServer::QuitUsers(const std::string &reason) +void TreeServer::SQuitInternal(unsigned int& num_lost_servers, bool error) { - std::string publicreason = ServerInstance->Config->HideSplits ? "*.net *.split" : reason; + 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(num_lost_servers, error); + } + + // Mark server as dead + isdead = true; + num_lost_servers++; + RemoveHash(); + + if (!Utils->Creator->dying) + FOREACH_MOD_CUSTOM(Utils->Creator->GetLinkEventProvider(), ServerProtocol::LinkEventListener, OnServerSplit, (this, error)); +} + +unsigned int TreeServer::QuitUsers(const std::string& reason) +{ + std::string publicreason = Utils->HideSplits ? "*.net *.split" : reason; const user_hash& users = ServerInstance->Users->GetUsers(); unsigned int original_size = users.size(); @@ -151,7 +239,8 @@ int TreeServer::QuitUsers(const std::string &reason) User* user = i->second; // Increment the iterator now because QuitUser() removes the user from the container ++i; - if (user->server == this) + TreeServer* server = TreeServer::Get(user); + if (server->IsDead()) ServerInstance->Users->QuitUser(user, publicreason, &reason); } return original_size - users.size(); @@ -166,7 +255,7 @@ void TreeServer::CheckULine() { ConfigTag* tag = i->second; std::string server = tag->getString("server"); - if (!strcasecmp(server.c_str(), GetName().c_str())) + if (irc::equals(server, GetName())) { if (this->IsRoot()) { @@ -181,102 +270,25 @@ void TreeServer::CheckULine() } } -/** This method is used to add the structure to the - * hash_map for linear searches. It is only called +/** This method is used to add the server to the + * maps for linear searches. It is only called * by the constructors. */ void TreeServer::AddHashEntry() { Utils->serverlist[GetName()] = this; - Utils->sidlist[sid] = this; -} - -/** These accessors etc should be pretty self- - * explanitory. - */ -TreeServer* TreeServer::GetRoute() -{ - return Route; -} - -const std::string& TreeServer::GetVersion() -{ - return VersionString; -} - -void TreeServer::SetNextPingTime(time_t t) -{ - this->NextPing = t; - LastPingWasGood = false; -} - -time_t TreeServer::NextPingTime() -{ - return NextPing; -} - -bool TreeServer::AnsweredLastPing() -{ - return LastPingWasGood; -} - -void TreeServer::SetPingFlag() -{ - LastPingWasGood = true; -} - -TreeSocket* TreeServer::GetSocket() -{ - return Socket; -} - -TreeServer* TreeServer::GetParent() -{ - return Parent; -} - -void TreeServer::SetVersion(const std::string &Version) -{ - VersionString = Version; + Utils->sidlist[GetId()] = this; } -void TreeServer::AddChild(TreeServer* Child) -{ - Children.push_back(Child); -} - -bool TreeServer::DelChild(TreeServer* Child) -{ - std::vector::iterator it = std::find(Children.begin(), Children.end(), Child); - if (it != Children.end()) - { - Children.erase(it); - return true; - } - return false; -} - -/** Removes child nodes of this node, and of that node, etc etc. - * This is used during netsplits to automatically tidy up the - * server tree. It is slow, we don't use it for much else. - */ -void TreeServer::Tidy() +CullResult TreeServer::cull() { - while (1) + // Recursively cull all servers that are under us in the tree + for (ChildServers::const_iterator i = Children.begin(); i != Children.end(); ++i) { - std::vector::iterator a = Children.begin(); - if (a == Children.end()) - return; - TreeServer* s = *a; - s->Tidy(); - s->cull(); - Children.erase(a); - delete s; + TreeServer* server = *i; + server->cull(); } -} -CullResult TreeServer::cull() -{ if (!IsRoot()) ServerUser->cull(); return classbase::cull(); @@ -284,10 +296,17 @@ CullResult TreeServer::cull() TreeServer::~TreeServer() { - /* We'd better tidy up after ourselves, eh? */ + // Recursively delete all servers that are under us in the tree first + for (ChildServers::const_iterator i = Children.begin(); i != Children.end(); ++i) + delete *i; + + // Delete server user unless it's us if (!IsRoot()) delete ServerUser; +} - Utils->sidlist.erase(sid); +void TreeServer::RemoveHash() +{ + Utils->sidlist.erase(GetId()); Utils->serverlist.erase(GetName()); }