Weed out a few leftover server instances from before modules had ServerInstance....

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

diff --git a/src/modules/m_spanningtree/pong.cpp b/src/modules/m_spanningtree/pong.cpp
index 13860f0e99f37539a479566c38bcecc0b64fda6c..9354caa2e020d8041dd9129d3b49dc22ece710b3 100644 (file)
--- a/src/modules/m_spanningtree/pong.cpp
+++ b/src/modules/m_spanningtree/pong.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -15,7 +15,6 @@
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "transport.h"
 #include "socketengine.h"
@@ -23,12 +22,9 @@
 #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"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
 bool TreeSocket::LocalPong(const std::string &prefix, std::deque<std::string> &params)
 {
@@ -50,7 +46,7 @@ bool TreeSocket::LocalPong(const std::string &prefix, std::deque<std::string> &p
        else
        {
                std::string forwardto = params[1];
-               if (forwardto == Instance->Config->GetSID() || forwardto == Instance->Config->ServerName)
+               if (forwardto == ServerInstance->Config->GetSID() || forwardto == ServerInstance->Config->ServerName)
                {
                        /*
                         * this is a PONG for us
@@ -58,7 +54,7 @@ bool TreeSocket::LocalPong(const std::string &prefix, std::deque<std::string> &p
                         * dump the PONG reply back to their fd. If its a server, do nowt.
                         * Services might want to send these s->s, but we dont need to yet.
                         */
-                       User* u = this->Instance->FindNick(prefix);
+                       User* u = this->ServerInstance->FindNick(prefix);
                        if (u)
                        {
                                u->WriteServ("PONG %s %s",params[0].c_str(),params[1].c_str());