X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=0b21a462d54b5ebdd73a04235b98ec40df5792d5;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=4bedf8388286cb32e8c56c695c46728867de5811;hpb=d8a4b50e313249ae4b01e91cb118bbb0c803be94;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 4bedf8388..0b21a462d 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -27,11 +27,12 @@
 TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, const std::string &id) : ServerInstance(Instance), Utils(Util)
 {
 	Parent = NULL;
+	bursting = false;
 	ServerName.clear();
 	ServerDesc.clear();
 	VersionString.clear();
-	UserCount = OperCount = 0;
-	rtt = LastPing = 0;
+	ServerUserCount = ServerOperCount = 0;
+	StartBurst = rtt = 0;
 	Warned = Hidden = DupError = false;
 	VersionString = ServerInstance->GetVersionString();
 	SetID(id);
@@ -44,14 +45,14 @@ 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;
+	StartBurst = rtt = 0;
 	Warned = Hidden = DupError = false;
 	AddHashEntry();
 	SetID(id);
@@ -64,12 +65,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 = false;
 	VersionString.clear();
-	UserCount = OperCount = 0;
+	ServerUserCount = ServerOperCount = 0;
 	this->SetNextPingTime(time(NULL) + Utils->PingFreq);
 	this->SetPingFlag();
-	DupError = false;
-	rtt = LastPing = 0;
+	Warned = 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)
 	 *
@@ -131,8 +140,22 @@ 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())
@@ -149,23 +172,23 @@ bool TreeServer::DuplicateID()
 int TreeServer::QuitUsers(const std::string &reason)
 {
 	const char* reason_s = reason.c_str();
-	std::vector<userrec*> time_to_die;
-	for (user_hash::iterator n = ServerInstance->clientlist->begin(); n != ServerInstance->clientlist->end(); n++)
+	std::vector<User*> 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<userrec*>::iterator n = time_to_die.begin(); n != time_to_die.end(); n++)
+	for (std::vector<User*>::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);
+				ServerInstance->Users->QuitUser(a, "*.net *.split", reason_s);
 			else
-				userrec::QuitUser(ServerInstance, a, reason_s);
+				ServerInstance->Users->QuitUser(a, reason_s);
 
 			if (this->Utils->quiet_bursts)
 				ServerInstance->GlobalCulls.MakeSilent(a);
@@ -240,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()
@@ -330,7 +353,7 @@ bool TreeServer::Tidy()
 			TreeServer* s = (TreeServer*)*a;
 			s->Tidy();
 			Children.erase(a);
-			DELETE(s);
+			delete s;
 			stillchildren = true;
 			break;
 		}