Store id in TreeServer, use TreeServer::GetID() to get the id (NOTE: it is std::string)

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

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 8b191fa032fae4593874b9b5fe51c5c35d1fb9a6..b8a634797b8acf691374986caaabf1ead0b48495 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -190,7 +190,6 @@ SpanningTreeUtilities::~SpanningTreeUtilities()
        {
                ServerInstance->SE->DelFd(Bindings[i]);
                Bindings[i]->Close();
-               DELETE(Bindings[i]);
        }
        while (TreeRoot->ChildCount())
        {
@@ -200,10 +199,10 @@ SpanningTreeUtilities::~SpanningTreeUtilities()
                        TreeSocket* sock = child_server->GetSocket();
                        ServerInstance->SE->DelFd(sock);
                        sock->Close();
-                       DELETE(sock);
                }
        }
        delete TreeRoot;
+       ServerInstance->InspSocketCull();
 }
 
 void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &list)
@@ -486,7 +485,6 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
                                        {
                                                ServerInstance->Log(DEFAULT,"m_spanningtree: Warning: Failed to bind server port: %s:%d: %s",IP.c_str(), portno, strerror(errno));
                                                listener->Close();
-                                               DELETE(listener);
                                        }
                                }
                        }
@@ -500,8 +498,12 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
        ChallengeResponse = !Conf->ReadFlag("options", "disablehmac", 0);
        quiet_bursts = Conf->ReadFlag("options", "quietbursts", 0);
        PingWarnTime = Conf->ReadInteger("options", "pingwarning", 0, true);
+       PingFreq = Conf->ReadInteger("options", "serverpingfreq", 0, true);
 
-       if (PingWarnTime < 0 || PingWarnTime > 59)
+       if (PingFreq == 0)
+               PingFreq = 60;
+
+       if (PingWarnTime < 0 || PingWarnTime > PingFreq - 1)
                PingWarnTime = 0;
 
        LinkBlocks.clear();
@@ -518,7 +520,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
                L.SendPass = Conf->ReadValue("link", "sendpass", j);
                L.RecvPass = Conf->ReadValue("link", "recvpass", j);
                L.AutoConnect = Conf->ReadInteger("link", "autoconnect", j, true);
-               L.HiddenFromStats = Conf->ReadFlag("link", "hidden", j);
+               L.HiddenFromStats = Conf->ReadFlag("link", "statshidden", j);
                L.Timeout = Conf->ReadInteger("link", "timeout", j, true);
                L.Hook = Conf->ReadValue("link", "transport", j);
                L.Bind = Conf->ReadValue("link", "bind", j);
@@ -619,18 +621,18 @@ void SpanningTreeUtilities::DoFailOver(Link* x)
        {
                if (x->FailOver == x->Name)
                {
-                       ServerInstance->SNO->WriteToSnoMask('l',"FAILOVER: Some muppet configured the failover for server \002%s\002 to point at itself. Not following it!", x->Name.c_str());
+                       Creator->RemoteMessage(NULL,"FAILOVER: Some muppet configured the failover for server \002%s\002 to point at itself. Not following it!", x->Name.c_str());
                        return;
                }
                Link* TryThisOne = this->FindLink(x->FailOver.c_str());
                if (TryThisOne)
                {
-                       ServerInstance->SNO->WriteToSnoMask('l',"FAILOVER: Trying failover link for \002%s\002: \002%s\002...", x->Name.c_str(), TryThisOne->Name.c_str());
+                       Creator->RemoteMessage(NULL,"FAILOVER: Trying failover link for \002%s\002: \002%s\002...", x->Name.c_str(), TryThisOne->Name.c_str());
                        Creator->ConnectServer(TryThisOne);
                }
                else
                {
-                       ServerInstance->SNO->WriteToSnoMask('l',"FAILOVER: Invalid failover server specified for server \002%s\002, will not follow!", x->Name.c_str());
+                       Creator->RemoteMessage(NULL,"FAILOVER: Invalid failover server specified for server \002%s\002, will not follow!", x->Name.c_str());
                }
        }
 }