m_spanningtree Remove SpanningTreeUtilities* fields and parameters

[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 dc81842b142b47a6b57d401d92cbb299965bf3e3..e2afe6421391a32dea7d15a37c07950e6b06d4b0 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"
@@ -34,19 +35,14 @@
  * 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 +51,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 +62,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 +102,7 @@ CullResult TreeSocket::cull()
 
 TreeSocket::~TreeSocket()
 {
-       if (capab)
-               delete capab;
+       delete capab;
 }
 
 /** When an outbound connection finishes connecting, we receive
@@ -153,9 +144,7 @@ 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 ;)
@@ -216,7 +205,7 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
                }
        }
        else
-               ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Squit from unknown server");
+               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Squit from unknown server");
 }
 
 /** This function is called when we receive data from a remote