Remove unused I_ProtoSendMetaData, I_ProtoSendMode fields of Implementation

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treeserver.cpp

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 7520da484b4c3dc79e1fb10ed94c53106f626716..b6ec7a3055577691c669c3a9dbaee2b732525867 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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();