m_spanningtree Rewrite PING logic to use Timers

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

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 4e738488b1c85422c07e25ed80847d750b47bef4..025bd1e611fd633a304e271dfc7d977bf6ee85d5 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -69,11 +69,6 @@ TreeSocket::TreeSocket(int newfd, ListenSocket* via, irc::sockets::sockaddrs* cl
        Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, 30);
 }
 
-ServerState TreeSocket::GetLinkState()
-{
-       return this->LinkState;
-}
-
 void TreeSocket::CleanNegotiationInfo()
 {
        // connect is good, reset the autoconnect block (if used)
@@ -154,6 +149,8 @@ CmdResult CommandSQuit::HandleServer(TreeServer* server, std::vector<std::string
                ret = CMD_FAILURE;
                server = server->GetParent();
        }
+       else if (quitting->GetParent() != server)
+               throw ProtocolException("Attempted to SQUIT a non-directly connected server or the parent");
 
        server->SQuitChild(quitting, params[1]);
 
@@ -175,7 +172,7 @@ void TreeSocket::OnDataReady()
        {
                std::string::size_type rline = line.find('\r');
                if (rline != std::string::npos)
-                       line = line.substr(0,rline);
+                       line.erase(rline);
                if (line.find('\0') != std::string::npos)
                {
                        SendError("Read null character from socket");