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/server.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules/m_spanningtree/server.cpp') diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp index fcd326974..538d28dbd 100644 --- a/src/modules/m_spanningtree/server.cpp +++ b/src/modules/m_spanningtree/server.cpp @@ -39,7 +39,7 @@ CmdResult CommandServer::Handle(User* user, std::vector& params) std::string sid = params[3]; std::string description = params[4]; TreeServer* ParentOfThis = Utils->FindServer(user->server); - TreeSocket* socket = ParentOfThis->GetRoute()->GetSocket(); + TreeSocket* socket = ParentOfThis->GetSocket(); if (!IS_SERVER(user)) return CMD_FAILURE; @@ -67,7 +67,7 @@ CmdResult CommandServer::Handle(User* user, std::vector& params) Link* lnk = Utils->FindLink(servername); - TreeServer *Node = new TreeServer(servername, description, sid, ParentOfThis,NULL, lnk ? lnk->Hidden : false); + TreeServer* Node = new TreeServer(servername, description, sid, ParentOfThis, ParentOfThis->GetSocket(), lnk ? lnk->Hidden : false); ParentOfThis->AddChild(Node); ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+ParentOfThis->GetName()+"\002 introduced server \002"+servername+"\002 ("+description+")"); -- cgit v1.3.1-10-gc9f91