X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket1.cpp;h=025bd1e611fd633a304e271dfc7d977bf6ee85d5;hb=bdc70892c647f0d7672aba413100730819a4b217;hp=8dd62a1e9ec5818cda29bbc6918813953006f1e5;hpb=8a7ed312cfcd47a39ac07b146b4aaf5f9ca1c0e2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 8dd62a1e9..025bd1e61 100644
--- 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)
@@ -128,6 +123,7 @@ void TreeSocket::OnError(BufferedSocketError e)
 	ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' failed with error: %s",
 		linkID.c_str(), getError().c_str());
 	LinkState = DYING;
+	Close();
 }
 
 void TreeSocket::SendError(const std::string &errormessage)
@@ -153,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]);
 
@@ -174,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");