Merge pull request #708 from SaberUK/master+development-branch

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

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index e2afe6421391a32dea7d15a37c07950e6b06d4b0..3c838177d11ceb4c0ba68740c8337c3a4e482a9a 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -29,6 +29,7 @@
 #include "treeserver.h"
 #include "link.h"
 #include "treesocket.h"
+#include "commands.h"
 
 /** Because most of the I/O gubbins are encapsulated within
  * BufferedSocket, we just call the superclass constructor for
@@ -149,9 +150,10 @@ void TreeSocket::SquitServer(std::string &from, TreeServer* Current, int& num_lo
         * We're going backwards so we don't remove users
         * while we still need them ;)
         */
-       for (unsigned int q = 0; q < Current->ChildCount(); q++)
+       const TreeServer::ChildServers& children = Current->GetChildren();
+       for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i)
        {
-               TreeServer* recursive_server = Current->GetChild(q);
+               TreeServer* recursive_server = *i;
                this->SquitServer(from,recursive_server, num_lost_servers, num_lost_users);
        }
        /* Now we've whacked the kids, whack self */
@@ -167,22 +169,21 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 {
        bool LocalSquit = false;
 
-       if ((Current) && (Current != Utils->TreeRoot))
+       if (!Current->IsRoot())
        {
                DelServerEvent(Utils->Creator, Current->GetName());
 
-               if (!Current->GetSocket() || Current->GetSocket()->Introduced())
-               {
-                       parameterlist params;
-                       params.push_back(Current->GetID());
-                       params.push_back(":"+reason);
-                       Utils->DoOneToAllButSender(Current->GetParent()->GetID(),"SQUIT",params,Current->GetName());
-               }
-
-               if (Current->GetParent() == Utils->TreeRoot)
+               if (Current->IsLocal())
                {
                        ServerInstance->SNO->WriteGlobalSno('l', "Server \002"+Current->GetName()+"\002 split: "+reason);
                        LocalSquit = true;
+                       if (Current->GetSocket()->Introduced())
+                       {
+                               CmdBuilder params("SQUIT");
+                               params.push_back(Current->GetID());
+                               params.push_last(reason);
+                               params.Broadcast();
+                       }
                }
                else
                {
@@ -204,8 +205,26 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
                        Close();
                }
        }
-       else
+}
+
+CmdResult CommandSQuit::HandleServer(TreeServer* server, std::vector<std::string>& params)
+{
+       TreeServer* quitting = Utils->FindServer(params[0]);
+       if (!quitting)
+       {
                ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Squit from unknown server");
+               return CMD_FAILURE;
+       }
+
+       TreeSocket* sock = server->GetSocket();
+       sock->Squit(quitting, params[1]);
+
+       // XXX: Return CMD_FAILURE when servers SQUIT themselves (i.e. :00S SQUIT 00S :Shutting down)
+       // to avoid RouteCommand() being called. RouteCommand() requires a valid command source but we
+       // do not have one because the server user is deleted when its TreeServer is destructed.
+       // We generate a SQUIT in TreeSocket::Squit(), with our sid as the source and send it to the
+       // remaining servers.
+       return ((quitting == server) ? CMD_FAILURE : CMD_SUCCESS);
 }
 
 /** This function is called when we receive data from a remote