m_spanningtree Fix routing of unicast messages

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / override_squit.cpp

diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp
index 84ce2788e1a09fc82bc579e183428ac077907040..84cb01f50683378f2c38effadad5e6feb2fee678 100644 (file)
--- a/src/modules/m_spanningtree/override_squit.cpp
+++ b/src/modules/m_spanningtree/override_squit.cpp
@@ -25,14 +25,12 @@
 #include "treeserver.h"
 #include "treesocket.h"
 
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
 ModResult ModuleSpanningTree::HandleSquit(const std::vector<std::string>& parameters, User* user)
 {
        TreeServer* s = Utils->FindServerMask(parameters[0]);
        if (s)
        {
-               if (s == Utils->TreeRoot)
+               if (s->IsRoot())
                {
                        user->WriteNotice("*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (" + parameters[0] + " matches local server name)");
                        return MOD_RES_DENY;
@@ -40,11 +38,10 @@ ModResult ModuleSpanningTree::HandleSquit(const std::vector<std::string>& parame
 
                TreeSocket* sock = s->GetSocket();
 
-               if (sock)
+               if (s->IsLocal())
                {
                        ServerInstance->SNO->WriteToSnoMask('l',"SQUIT: Server \002%s\002 removed from network by %s",parameters[0].c_str(),user->nick.c_str());
                        sock->Squit(s,"Server quit by " + user->GetFullRealHost());
-                       ServerInstance->SE->DelFd(sock);
                        sock->Close();
                }
                else
@@ -58,4 +55,3 @@ ModResult ModuleSpanningTree::HandleSquit(const std::vector<std::string>& parame
        }
        return MOD_RES_DENY;
 }
-