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 8dbdb3839ebe43a5db3eb4e6052cf3ca371b9f1a..3c838177d11ceb4c0ba68740c8337c3a4e482a9a 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -150,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 */
@@ -168,20 +169,20 @@ 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;
                        if (Current->GetSocket()->Introduced())
                        {
-                               parameterlist params;
+                               CmdBuilder params("SQUIT");
                                params.push_back(Current->GetID());
-                               params.push_back(":"+reason);
-                               Utils->DoOneToMany(Utils->TreeRoot->GetID(), "SQUIT", params);
+                               params.push_last(reason);
+                               params.Broadcast();
                        }
                }
                else
@@ -206,7 +207,7 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
        }
 }
 
-CmdResult CommandSQuit::Handle(User* user, std::vector<std::string>& params)
+CmdResult CommandSQuit::HandleServer(TreeServer* server, std::vector<std::string>& params)
 {
        TreeServer* quitting = Utils->FindServer(params[0]);
        if (!quitting)
@@ -215,9 +216,15 @@ CmdResult CommandSQuit::Handle(User* user, std::vector<std::string>& params)
                return CMD_FAILURE;
        }
 
-       TreeSocket* sock = Utils->FindServer(user->server)->GetRoute()->GetSocket();
+       TreeSocket* sock = server->GetSocket();
        sock->Squit(quitting, params[1]);
-       return CMD_SUCCESS;
+
+       // 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