Rewrite CommandParser::TranslateUIDs()

[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 75b4b0407aa2fd23f04098fbb4f7e66d88168021..b7fadf342c7653dc8a341835165efd250f840ee2 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -21,17 +21,14 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
-#include "socketengine.h"
+#include "iohook.h"
 
 #include "main.h"
-#include "../spanningtree.h"
+#include "modules/spanningtree.h"
 #include "utils.h"
 #include "treeserver.h"
 #include "link.h"
 #include "treesocket.h"
-#include "resolvers.h"
 
 /** Because most of the I/O gubbins are encapsulated within
  * BufferedSocket, we just call the superclass constructor for
@@ -59,7 +56,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);
@@ -136,7 +133,7 @@ void TreeSocket::OnConnected()
 
 void TreeSocket::OnError(BufferedSocketError e)
 {
-       ServerInstance->SNO->WriteGlobalSno('l', "Connection to \002%s\002 failed with error: %s",
+       ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' failed with error: %s",
                linkID.c_str(), getError().c_str());
        LinkState = DYING;
 }
@@ -157,8 +154,9 @@ 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",DEBUG,"SquitServer for %s from %s",
-               Current->GetName().c_str(), from.c_str());
+       std::string servername = Current->GetName();
+       ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "SquitServer for %s from %s",
+               servername.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 ;)
@@ -188,9 +186,9 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
                if (!Current->GetSocket() || Current->GetSocket()->Introduced())
                {
                        parameterlist params;
-                       params.push_back(Current->GetName());
+                       params.push_back(Current->GetID());
                        params.push_back(":"+reason);
-                       Utils->DoOneToAllButSender(Current->GetParent()->GetName(),"SQUIT",params,Current->GetName());
+                       Utils->DoOneToAllButSender(Current->GetParent()->GetID(),"SQUIT",params,Current->GetName());
                }
 
                if (Current->GetParent() == Utils->TreeRoot)
@@ -219,7 +217,7 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
                }
        }
        else
-               ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Squit from unknown server");
+               ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Squit from unknown server");
 }
 
 /** This function is called when we receive data from a remote