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 739b50dba7a6d80b1fc3547e5e86e8e951c18716..e2afe6421391a32dea7d15a37c07950e6b06d4b0 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -35,8 +35,8 @@
  * 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), linkID(assign(link->Name)), LinkState(CONNECTING), MyRoot(NULL), proto_version(0), ConnectionFailureShown(false)
+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())
 {
        capab = new CapabData;
@@ -62,14 +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), linkID("inbound from " + client->addr()), LinkState(WAIT_AUTH_1), MyRoot(NULL), proto_version(0)
+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;
 
-       FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
+       FOREACH_MOD(OnHookIO, (this, via));
        if (GetIOHook())
                GetIOHook()->OnStreamSocketAccept(this, client, server);
        SendCapabilities(1);
@@ -143,7 +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)
 {
-       ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "SquitServer for %s from %s", Current->GetName().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 ;)
@@ -204,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