From 5cc9614e73a783dec7a8e0887a0435cf577eaad4 Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Fri, 19 Jul 2013 13:10:18 +0200 Subject: m_spanningtree Change TreeServer::GetSocket() to always return the socket that can be used to talk to the server The only exception is the tree root (us) which has no associated socket (NULL) Add TreeServer::IsRoot() and IsLocal() helpers --- src/modules/m_spanningtree/treeserver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules/m_spanningtree/treeserver.cpp') diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index 0fad3132d..54ea5922f 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -288,7 +288,7 @@ void TreeServer::Tidy() CullResult TreeServer::cull() { - if (ServerUser != ServerInstance->FakeClient) + if (!IsRoot()) ServerUser->cull(); return classbase::cull(); } @@ -296,7 +296,7 @@ CullResult TreeServer::cull() TreeServer::~TreeServer() { /* We'd better tidy up after ourselves, eh? */ - if (ServerUser != ServerInstance->FakeClient) + if (!IsRoot()) delete ServerUser; Utils->sidlist.erase(sid); -- cgit v1.3.1-10-gc9f91