X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=a9f61221d5f7639124abe4b7ab4a03598488678a;hb=bc9352391f179dbe2a325ff36b00930c886ef1b3;hp=3e13526aada71ffd24983a1630acee57f2fdafe6;hpb=12b9855339a3bbd05cc0636588ea68bf8db390f5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index 3e13526aa..a9f61221d 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-2007 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. @@ -15,7 +15,6 @@ #include "commands/cmd_whois.h" #include "commands/cmd_stats.h" #include "socket.h" -#include "wildcard.h" #include "xline.h" #include "transport.h" @@ -24,19 +23,6 @@ /* $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); -} - /** 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. @@ -44,15 +30,15 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, const st 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.clear(); - UserCount = ServerInstance->UserCount(); - OperCount = ServerInstance->OperCount(); + ServerUserCount = ServerOperCount = 0; VersionString = ServerInstance->GetVersionString(); Route = NULL; Socket = NULL; /* Fix by brain */ - rtt = LastPing = 0; - Warned = Hidden = DupError = false; + StartBurst = rtt = 0; + Warned = Hidden = false; AddHashEntry(); SetID(id); } @@ -64,12 +50,20 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str 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) { + bursting = true; VersionString.clear(); - UserCount = OperCount = 0; - this->SetNextPingTime(time(NULL) + Utils->PingFreq); - this->SetPingFlag(); - DupError = false; - rtt = LastPing = 0; + 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; + 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) * @@ -131,26 +125,44 @@ std::string& TreeServer::GetID() return sid; } -void TreeServer::SetID(const std::string &id) +void TreeServer::FinishBurstInternal() { - sid = id; - server_hash::iterator iter = Utils->sidlist.find(sid); - if (iter == Utils->sidlist.end()) - Utils->sidlist[sid] = this; - else - DupError = true; + 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 > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs")); + Event rmode((char*)ServerName.c_str(), (Module*)Utils->Creator, "new_server"); + rmode.Send(ServerInstance); } -bool TreeServer::DuplicateID() +void TreeServer::SetID(const std::string &id) { - return DupError; + 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++) + for (user_hash::iterator n = ServerInstance->Users->clientlist->begin(); n != ServerInstance->Users->clientlist->end(); n++) { if (!strcmp(n->second->server, this->ServerName.c_str())) { @@ -163,9 +175,9 @@ int TreeServer::QuitUsers(const std::string &reason) if (!IS_LOCAL(a)) { if (ServerInstance->Config->HideSplits) - User::QuitUser(ServerInstance, a, "*.net *.split", reason_s); + ServerInstance->Users->QuitUser(a, "*.net *.split", reason_s); else - User::QuitUser(ServerInstance, a, reason_s); + ServerInstance->Users->QuitUser(a, reason_s); if (this->Utils->quiet_bursts) ServerInstance->GlobalCulls.MakeSilent(a); @@ -240,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() @@ -304,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) { @@ -325,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(); @@ -347,5 +359,3 @@ TreeServer::~TreeServer() if (iter != Utils->sidlist.end()) Utils->sidlist.erase(iter); } - -