Allow support for multiple dns results per request. This is a significant change...

[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 0c9509adab1e9341e397bb4b98cda47d89fe5aa5..d13075f0f8d7aa11fc7d4e03198f4aefd4be3f23 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "channels.h"
@@ -18,7 +19,6 @@
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "inspircd.h"
 #include "wildcard.h"
 #include "xline.h"
 #include "transport.h"
@@ -31,9 +31,9 @@
 TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance) : ServerInstance(Instance), Utils(Util)
 {
        Parent = NULL;
-       ServerName = "";
-       ServerDesc = "";
-       VersionString = "";
+       ServerName.clear();
+       ServerDesc.clear();
+       VersionString.clear();
        UserCount = OperCount = 0;
        rtt = LastPing = 0;
        Hidden = false;
@@ -47,7 +47,7 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance) : Server
 TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc) : ServerInstance(Instance), ServerName(Name.c_str()), ServerDesc(Desc), Utils(Util)
 {
        Parent = NULL;
-       VersionString = "";
+       VersionString.clear();
        UserCount = ServerInstance->UserCount();
        OperCount = ServerInstance->OperCount();
        VersionString = ServerInstance->GetVersionString();
@@ -65,9 +65,9 @@ TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::str
 TreeServer::TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, TreeServer* Above, TreeSocket* Sock, bool Hide)
        : ServerInstance(Instance), Parent(Above), ServerName(Name.c_str()), ServerDesc(Desc), Socket(Sock), Utils(Util), Hidden(Hide)
 {
-       VersionString = "";
+       VersionString.clear();
        UserCount = OperCount = 0;
-       this->SetNextPingTime(time(NULL) + 60);
+       this->SetNextPingTime(time(NULL) + Utils->PingFreq);
        this->SetPingFlag();
        rtt = LastPing = 0;
        /* find the 'route' for this server (e.g. the one directly connected