m_spanningtree Add TreeServer::GetChildren() that replaces ChildCount() and GetChild()

[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 9d0002b66bc96c2ee3da00fcd988876d59f114b5..ad3a6390df1ee8b5bd236ae0dc9f74f15290202c 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -21,6 +21,7 @@
 
 
 #include "inspircd.h"
+#include "iohook.h"
 
 #include "main.h"
 #include "modules/spanningtree.h"
@@ -28,25 +29,21 @@
 #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
  * most of the action, and append a few of our own values
  * to it.
  */
-TreeSocket::TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* myac, const std::string& ipaddr)
-       : Utils(Util)
+TreeSocket::TreeSocket(Link* link, Autoconnect* myac, const std::string& ipaddr)
+       : linkID(assign(link->Name)), LinkState(CONNECTING), MyRoot(NULL), proto_version(0), ConnectionFailureShown(false)
+       , age(ServerInstance->Time())
 {
-       age = ServerInstance->Time();
-       linkID = assign(link->Name);
        capab = new CapabData;
        capab->link = link;
        capab->ac = myac;
        capab->capab_phase = 0;
-       MyRoot = NULL;
-       proto_version = 0;
-       ConnectionFailureShown = false;
-       LinkState = CONNECTING;
        if (!link->Hook.empty())
        {
                ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, link->Hook);
@@ -55,7 +52,7 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* mya
                        SetError("Could not find hook '" + link->Hook + "' for connection to " + linkID);
                        return;
                }
-               AddIOHook(prov->creator);
+               AddIOHook(static_cast<IOHook*>(prov));
        }
        DoConnect(ipaddr, link->Port, link->Timeout, link->Bind);
        Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, link->Timeout);
@@ -66,19 +63,15 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* mya
  * we must associate it with a socket without creating a new
  * connection. This constructor is used for this purpose.
  */
-TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
-       : BufferedSocket(newfd), Utils(Util)
+TreeSocket::TreeSocket(int newfd, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
+       : BufferedSocket(newfd)
+       , linkID("inbound from " + client->addr()), LinkState(WAIT_AUTH_1), MyRoot(NULL), proto_version(0)
+       , ConnectionFailureShown(false), age(ServerInstance->Time())
 {
        capab = new CapabData;
        capab->capab_phase = 0;
-       MyRoot = NULL;
-       age = ServerInstance->Time();
-       LinkState = WAIT_AUTH_1;
-       proto_version = 0;
-       ConnectionFailureShown = false;
-       linkID = "inbound from " + client->addr();
-
-       FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
+
+       FOREACH_MOD(OnHookIO, (this, via));
        if (GetIOHook())
                GetIOHook()->OnStreamSocketAccept(this, client, server);
        SendCapabilities(1);
@@ -110,8 +103,7 @@ CullResult TreeSocket::cull()
 
 TreeSocket::~TreeSocket()
 {
-       if (capab)
-               delete capab;
+       delete capab;
 }
 
 /** When an outbound connection finishes connecting, we receive
@@ -153,16 +145,15 @@ void TreeSocket::SendError(const std::string &errormessage)
  */
 void TreeSocket::SquitServer(std::string &from, TreeServer* Current, int& num_lost_servers, int& num_lost_users)
 {
-       std::string servername = Current->GetName();
-       ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"SquitServer for %s from %s",
-               servername.c_str(), from.c_str());
+       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "SquitServer for %s from %s", Current->GetName().c_str(), from.c_str());
        /* recursively squit the servers attached to 'Current'.
         * 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 */
@@ -178,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())
+                       {
+                               parameterlist params;
+                               params.push_back(Current->GetID());
+                               params.push_back(":"+reason);
+                               Utils->DoOneToMany(Utils->TreeRoot->GetID(), "SQUIT", params);
+                       }
                }
                else
                {
@@ -215,8 +205,20 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
                        Close();
                }
        }
-       else
-               ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Squit from unknown server");
+}
+
+CmdResult CommandSQuit::Handle(User* user, 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 = Utils->FindServer(user->server)->GetSocket();
+       sock->Squit(quitting, params[1]);
+       return CMD_SUCCESS;
 }
 
 /** This function is called when we receive data from a remote