X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=61a06cdd39333a9d0b16347b33986fd687ef2687;hb=53fbf0cf7f41a5644a8776980f2de99db3d03245;hp=f53e88395161be6420ec69584be5ff811d9ba4ec;hpb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index f53e88395..61a06cdd3 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -1,11 +1,20 @@ -#include "configreader.h" -#include "users.h" -#include "channels.h" -#include "modules.h" +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + +#include "inspircd.h" #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" -#include "inspircd.h" #include "wildcard.h" #include "xline.h" #include "transport.h" @@ -15,46 +24,61 @@ /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h */ -TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance) : ServerInstance(Instance), Utils(Util) +TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, const std::string &id) : ServerInstance(Instance), Utils(Util) { Parent = NULL; - ServerName = ""; - ServerDesc = ""; - VersionString = ""; - UserCount = OperCount = 0; - rtt = LastPing = 0; + 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) : ServerInstance(Instance), ServerName(Name.c_str()), ServerDesc(Desc), Utils(Util) +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) { + 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 */ - rtt = LastPing = 0; + 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, TreeServer* Above, TreeSocket* Sock) - : ServerInstance(Instance), Parent(Above), ServerName(Name.c_str()), ServerDesc(Desc), Socket(Sock), Utils(Util) +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) { - VersionString = ""; - UserCount = OperCount = 0; - this->SetNextPingTime(time(NULL) + 60); + bursting = false; + VersionString.clear(); + ServerUserCount = ServerOperCount = 0; + this->SetNextPingTime(time(NULL) + Utils->PingFreq); this->SetPingFlag(); - rtt = LastPing = 0; + DupError = false; + StartBurst = 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); + /* find the 'route' for this server (e.g. the one directly connected * to the local server, which we can use to reach it) * @@ -107,28 +131,67 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str */ this->AddHashEntry(); + + SetID(id); +} + +std::string& TreeServer::GetID() +{ + return sid; +} + +void TreeServer::FinishBurst() +{ + 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; +} + +bool TreeServer::DuplicateID() +{ + return DupError; } 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())) { 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)) { if (ServerInstance->Config->HideSplits) - userrec::QuitUser(ServerInstance, a, "*.net *.split", reason_s); + User::QuitUser(ServerInstance, a, "*.net *.split", reason_s); else - userrec::QuitUser(ServerInstance, a, reason_s); + User::QuitUser(ServerInstance, a, reason_s); + + if (this->Utils->quiet_bursts) + ServerInstance->GlobalCulls.MakeSilent(a); } } return time_to_die.size(); @@ -200,24 +263,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() @@ -290,7 +353,7 @@ bool TreeServer::Tidy() TreeServer* s = (TreeServer*)*a; s->Tidy(); Children.erase(a); - DELETE(s); + delete s; stillchildren = true; break; } @@ -302,6 +365,10 @@ 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); }