X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=38d91f54cbf695f43b4e81716bde634d17c2c1bd;hb=b16e16ac1bae4ac5494778b4b8a7009febb58137;hp=0b21a462d54b5ebdd73a04235b98ec40df5792d5;hpb=58f4306bb6e1f91076fccf30a3b43a40b3d1915a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index 0b21a462d..38d91f54c 100644 --- 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-2008 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. @@ -12,39 +12,24 @@ */ #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 "main.h" +#include "../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(); @@ -53,7 +38,7 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str Route = NULL; Socket = NULL; /* Fix by brain */ StartBurst = rtt = 0; - Warned = Hidden = DupError = false; + Warned = Hidden = false; AddHashEntry(); SetID(id); } @@ -62,22 +47,23 @@ 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(time(NULL) + Utils->PingFreq); - this->SetPingFlag(); - Warned = DupError = false; - StartBurst = rtt = 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); this->StartBurst = ts; - Instance->Logs->Log("m_spanningtree",DEBUG, "Started bursting at time %lu", ts); + ServerInstance->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) @@ -140,33 +126,36 @@ 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); 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); 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) @@ -175,7 +164,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); } @@ -185,13 +174,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(); @@ -327,7 +316,7 @@ void TreeServer::AddChild(TreeServer* Child) bool TreeServer::DelChild(TreeServer* Child) { - for (std::vector::iterator a = Children.begin(); a < Children.end(); a++) + for (std::vector::iterator a = Children.begin(); a != Children.end(); a++) { if (*a == Child) { @@ -348,7 +337,7 @@ bool TreeServer::Tidy() while (stillchildren) { stillchildren = false; - for (std::vector::iterator a = Children.begin(); a < Children.end(); a++) + for (std::vector::iterator a = Children.begin(); a != Children.end(); a++) { TreeServer* s = (TreeServer*)*a; s->Tidy(); @@ -361,14 +350,21 @@ bool TreeServer::Tidy() 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()) Utils->sidlist.erase(iter); } - -