* | 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.
*/
#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 "../transport.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)
{
+ age = ServerInstance->Time();
bursting = false;
Parent = NULL;
VersionString.clear();
Route = NULL;
Socket = NULL; /* Fix by brain */
StartBurst = rtt = 0;
- Warned = Hidden = DupError = false;
+ Warned = Hidden = false;
AddHashEntry();
SetID(id);
}
* 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), Hidden(Hide)
{
- bursting = false;
+ age = ServerInstance->Time();
+ bursting = true;
VersionString.clear();
ServerUserCount = ServerOperCount = 0;
- this->SetNextPingTime(time(NULL) + Utils->PingFreq);
- this->SetPingFlag();
- 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)
return sid;
}
-void TreeServer::FinishBurst()
+void TreeServer::FinishBurstInternal()
{
- if (this->bursting)
+ this->bursting = false;
+ SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
+ SetPingFlag();
+ for(unsigned int q=0; q < ChildCount(); q++)
{
- 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);
+ TreeServer* child = GetChild(q);
+ child->FinishBurstInternal();
}
}
-void TreeServer::SetID(const std::string &id)
+void TreeServer::FinishBurst()
{
- 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;
+ 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"));
+ Event rmode((char*)ServerName.c_str(), (Module*)Utils->Creator, "new_server");
+ rmode.Send();
}
-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)
User* a = (User*)*n;
if (!IS_LOCAL(a))
{
+ if (this->Utils->quiet_bursts)
+ a->quietquit = true;
+
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);
-
- if (this->Utils->quiet_bursts)
- ServerInstance->GlobalCulls.MakeSilent(a);
+ ServerInstance->Users->QuitUser(a, reason_s);
}
}
return time_to_die.size();
bool TreeServer::DelChild(TreeServer* Child)
{
- for (std::vector<TreeServer*>::iterator a = Children.begin(); a < Children.end(); a++)
+ for (std::vector<TreeServer*>::iterator a = Children.begin(); a != Children.end(); a++)
{
if (*a == Child)
{
while (stillchildren)
{
stillchildren = false;
- for (std::vector<TreeServer*>::iterator a = Children.begin(); a < Children.end(); a++)
+ for (std::vector<TreeServer*>::iterator a = Children.begin(); a != Children.end(); a++)
{
TreeServer* s = (TreeServer*)*a;
s->Tidy();
if (iter != Utils->sidlist.end())
Utils->sidlist.erase(iter);
}
-
-
projects / user / henk / code / inspircd.git / blobdiff