Strip SUPPORT_IP6LINKS #define

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

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 68b5a784091cb4f5d7d61fc6056ce4c74c08fe9b..b117ebe822fc34c8c14ea28c5387ae36124d1dd8 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -16,16 +16,16 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "resolvers.h"
+#include "handshaketimer.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/handshaketimer.h */
 
@@ -84,7 +84,7 @@ bool TreeSocket::ProcessLine(std::string &line)
 
                if (prefix.empty())
                {
-                       this->SendError("BUG (?) Empty prefix recieved.");
+                       this->SendError("BUG (?) Empty prefix recieved: " + line);
                        return false;
                }
        }
@@ -299,9 +299,7 @@ bool TreeSocket::ProcessLine(std::string &line)
                        TreeServer *ServerSource = Utils->FindServer(prefix);
                        if (ServerSource)
                        {
-                               // ServerSource->GetName().c_str() may become invalid before it is used
-                               Utils->ServerUser->nick = ServerSource->GetName().c_str();
-                               Utils->ServerUser->server = Utils->ServerUser->nick.c_str();
+                               Utils->ServerUser->SetFakeServer(ServerSource->GetName());
                                Utils->ServerUser->uuid = ServerSource->GetID();
                        }