From 4f6589e123c0a494287f59e3bc75e34ed6e4f6d7 Mon Sep 17 00:00:00 2001 From: danieldg Date: Mon, 21 Sep 2009 17:16:28 +0000 Subject: Don't try to write to dead users, add debug to SquitServer, and remove a string copy in spanningtree write git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11753 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/compat.cpp | 4 +++- src/modules/m_spanningtree/treesocket1.cpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/modules') diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp index 71272edec..94c797bfd 100644 --- a/src/modules/m_spanningtree/compat.cpp +++ b/src/modules/m_spanningtree/compat.cpp @@ -27,6 +27,8 @@ static const char* const forge_common_1201[] = { "m_setident.so", }; +static std::string wide_newline("\r\n"); + void TreeSocket::CompatAddModules(std::vector& modlist) { if (proto_version < 1202) @@ -81,8 +83,8 @@ void TreeSocket::WriteLine(std::string line) } ServerInstance->Logs->Log("m_spanningtree",DEBUG, "S[%d] O %s", this->GetFd(), line.c_str()); - line.append("\r\n"); this->WriteData(line); + this->WriteData(wide_newline); } diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index 55fbc2c91..729c273ec 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -176,6 +176,8 @@ void TreeSocket::SendError(const std::string &errormessage) */ void TreeSocket::SquitServer(std::string &from, TreeServer* Current) { + ServerInstance->Logs->Log("m_spanningtree",DEBUG,"SquitServer for %s from %s", + Current->GetName().c_str(), from.c_str()); /* recursively squit the servers attached to 'Current'. * We're going backwards so we don't remove users * while we still need them ;) -- cgit v1.2.3