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/treesocket1.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/modules/m_spanningtree/treesocket1.cpp')

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 8dbdb3839..9e0acdd12 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -168,11 +168,11 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 {
 	bool LocalSquit = false;
 
-	if (Current != Utils->TreeRoot)
+	if (!Current->IsRoot())
 	{
 		DelServerEvent(Utils->Creator, Current->GetName());
 
-		if (Current->GetParent() == Utils->TreeRoot)
+		if (Current->IsLocal())
 		{
 			ServerInstance->SNO->WriteGlobalSno('l', "Server \002"+Current->GetName()+"\002 split: "+reason);
 			LocalSquit = true;
@@ -215,7 +215,7 @@ CmdResult CommandSQuit::Handle(User* user, std::vector<std::string>& params)
 		return CMD_FAILURE;
 	}
 
-	TreeSocket* sock = Utils->FindServer(user->server)->GetRoute()->GetSocket();
+	TreeSocket* sock = Utils->FindServer(user->server)->GetSocket();
 	sock->Squit(quitting, params[1]);
 	return CMD_SUCCESS;
 }
-- 
cgit v1.3.1-10-gc9f91