diff options
| author | attilamolnar <attilamolnar@hush.com> | 2013-07-19 13:10:18 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2013-08-22 13:42:20 +0200 |
| commit | 5cc9614e73a783dec7a8e0887a0435cf577eaad4 (patch) | |
| tree | 843e4ee2cf81f1ba818368512ca889281d128459 /src/modules/m_spanningtree/treesocket1.cpp | |
| parent | 39d34b604259b17e2517fcddb5ee15198d7cb412 (diff) | |
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
Diffstat (limited to 'src/modules/m_spanningtree/treesocket1.cpp')
| -rw-r--r-- | src/modules/m_spanningtree/treesocket1.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |