Remove spanningtree override of /LUSERS

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

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index 0256756425f4b815152d34d4ff53bd6c272c90af..6fda446ea16fab29cf1348eb77cc36ce1e11e4f6 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -14,7 +14,6 @@
 #include "inspircd.h"
 #include "socket.h"
 #include "xline.h"
-#include "../transport.h"
 #include "socketengine.h"
 
 #include "main.h"
@@ -72,7 +71,7 @@ bool TreeSocket::RemoteServer(const std::string &prefix, parameterlist &params)
 
        Link* lnk = Utils->FindLink(servername);
 
-       TreeServer *Node = new TreeServer(this->Utils, ServerInstance, servername, description, sid, ParentOfThis,NULL, lnk ? lnk->Hidden : false);
+       TreeServer *Node = new TreeServer(Utils, servername, description, sid, ParentOfThis,NULL, lnk ? lnk->Hidden : false);
 
        ParentOfThis->AddChild(Node);
        params[4] = ":" + params[4];
@@ -120,8 +119,9 @@ bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
                return false;
        }
 
-       for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
+       for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i < Utils->LinkBlocks.end(); i++)
        {
+               Link* x = *i;
                if (x->Name != servername && x->Name != "*") // open link allowance
                        continue;
 
@@ -158,7 +158,7 @@ bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
 
                Utils->timeoutlist.erase(this);
 
-               TreeServer *Node = new TreeServer(this->Utils, ServerInstance, sname, description, sid, Utils->TreeRoot, this, x->Hidden);
+               TreeServer *Node = new TreeServer(Utils, sname, description, sid, Utils->TreeRoot, this, x->Hidden);
 
                Utils->TreeRoot->AddChild(Node);
                params[4] = ":" + params[4];
@@ -215,8 +215,9 @@ bool TreeSocket::Inbound_Server(parameterlist &params)
                return false;
        }
 
-       for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
+       for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i < Utils->LinkBlocks.end(); i++)
        {
+               Link* x = *i;
                if (x->Name != servername && x->Name != "*") // open link allowance
                        continue;
 
@@ -249,11 +250,6 @@ bool TreeSocket::Inbound_Server(parameterlist &params)
 
 
                ServerInstance->SNO->WriteToSnoMask('l',"Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "<hidden>" : this->IP)+"] ("+description+")");
-               if (this->GetIOHook())
-               {
-                       std::string name = BufferedSocketNameRequest(Utils->Creator, this->GetIOHook()).Send();
-                       ServerInstance->SNO->WriteToSnoMask('l',"Connection from \2"+sname+"\2["+(x->HiddenFromStats ? "<hidden>" : this->IP)+"] using transport \2"+name+"\2");
-               }
 
                // this is good. Send our details: Our server name and description and hopcount of 0,
                // along with the sendpass from this block.