X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=b6ec7a3055577691c669c3a9dbaee2b732525867;hb=a02ed18a1a1ae42fd81452b6ca5809fc3430a04c;hp=455b49c846030a174746ffbc40b29e7365aaaaf7;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 455b49c84..b6ec7a305 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -16,27 +16,13 @@
 #include "commands/cmd_stats.h"
 #include "socket.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 = 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.
@@ -64,13 +50,13 @@ 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;
+	bursting = true;
 	VersionString.clear();
 	ServerUserCount = ServerOperCount = 0;
-	this->SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
-	this->SetPingFlag();
+	SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
+	SetPingFlag();
 	Warned = false;
-	StartBurst = rtt = 0;
+	rtt = 0;
 
 	timeval t;
 	gettimeofday(&t, NULL);
@@ -142,6 +128,8 @@ std::string& TreeServer::GetID()
 void TreeServer::FinishBurstInternal()
 {
 	this->bursting = false;
+	SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
+	SetPingFlag();
 	for(unsigned int q=0; q < ChildCount(); q++)
 	{
 		TreeServer* child = GetChild(q);
@@ -157,7 +145,8 @@ void TreeServer::FinishBurst()
 	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"));
+	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);
 }
@@ -327,7 +316,7 @@ void TreeServer::AddChild(TreeServer* Child)
 
 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)
 		{
@@ -348,7 +337,7 @@ bool TreeServer::Tidy()
 	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();