X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=38d91f54cbf695f43b4e81716bde634d17c2c1bd;hb=b16e16ac1bae4ac5494778b4b8a7009febb58137;hp=3d0e2e49bc15da5029d1e0752ddfd7cd88561f75;hpb=b0d59543bb9d920b9926239d66b950ea27a9b4f3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index 3d0e2e49b..38d91f54c 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -1,55 +1,70 @@ -#include "configreader.h" -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "commands/cmd_whois.h" -#include "commands/cmd_stats.h" -#include "socket.h" +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * 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. + * + * --------------------------------------------------- + */ + #include "inspircd.h" -#include "wildcard.h" +#include "socket.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" -TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance) : ServerInstance(Instance), Utils(Util) -{ - Parent = NULL; - ServerName = ""; - ServerDesc = ""; - VersionString = ""; - UserCount = OperCount = 0; - VersionString = ServerInstance->GetVersionString(); -} +/* $ModDep: m_spanningtree/utils.h m_spanningtree/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) : 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 = ""; - UserCount = ServerInstance->UserCount(); - OperCount = ServerInstance->OperCount(); + VersionString.clear(); + ServerUserCount = ServerOperCount = 0; VersionString = ServerInstance->GetVersionString(); Route = NULL; Socket = NULL; /* Fix by brain */ + StartBurst = rtt = 0; + Warned = Hidden = 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, TreeServer* Above, TreeSocket* Sock) - : ServerInstance(Instance), Parent(Above), ServerName(Name.c_str()), ServerDesc(Desc), Socket(Sock), Utils(Util) +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) { - VersionString = ""; - UserCount = OperCount = 0; - this->SetNextPingTime(time(NULL) + 60); - this->SetPingFlag(); + age = ServerInstance->Time(); + bursting = true; + VersionString.clear(); + ServerUserCount = ServerOperCount = 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; + 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) * @@ -102,24 +117,71 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str */ this->AddHashEntry(); + + SetID(id); +} + +std::string& TreeServer::GetID() +{ + return sid; +} + +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(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; + Utils->sidlist[sid] = this; } 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::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); } } - for (std::vector::iterator n = time_to_die.begin(); n != time_to_die.end(); n++) + for (std::vector::iterator n = time_to_die.begin(); n != time_to_die.end(); n++) { - userrec* a = (userrec*)*n; + User* a = (User*)*n; if (!IS_LOCAL(a)) - userrec::QuitUser(ServerInstance,a,reason_s); + { + 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); + } } return time_to_die.size(); } @@ -190,24 +252,24 @@ void TreeServer::SetPingFlag() LastPingWasGood = true; } -int TreeServer::GetUserCount() +unsigned int TreeServer::GetUserCount() { - return UserCount; + return ServerUserCount; } -void TreeServer::AddUserCount() +void TreeServer::SetUserCount(int diff) { - UserCount++; + ServerUserCount += diff; } -void TreeServer::DelUserCount() +void TreeServer::SetOperCount(int diff) { - UserCount--; + ServerOperCount += diff; } -int TreeServer::GetOperCount() +unsigned int TreeServer::GetOperCount() { - return OperCount; + return ServerOperCount; } TreeSocket* TreeServer::GetSocket() @@ -254,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) { @@ -275,12 +337,12 @@ 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(); Children.erase(a); - DELETE(s); + delete s; stillchildren = true; break; } @@ -288,10 +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); +}