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

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

diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index 137cb256a2ba2490efc3a7cf5335602194c12889..24047226d67a22f1dbbde503550254c52f0b9264 100644 (file)
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.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.
@@ -12,24 +12,14 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
-#include "transport.h"
-#include "m_hash.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 "m_spanningtree/treeserver.h"
+#include "m_spanningtree/utils.h"
+
+/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.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 m_hash.h */
 
 /** FMODE command - server mode with timestamp checks */
 bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &params)
@@ -43,8 +33,9 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 
        bool smode = false;
        std::string sourceserv;
+
        /* Are we dealing with an FMODE from a user, or from a server? */
-       User* who = this->Instance->FindNick(source);
+       User* who = this->ServerInstance->FindNick(source);
        if (who)
        {
                /* FMODE from a user, set sourceserv to the users server name */
@@ -53,14 +44,12 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
        else
        {
                /* FMODE from a server, use a fake user to receive mode feedback */
-               who = this->Instance->FakeClient;
-               smode = true;      /* Setting this flag tells us we should free the User later */
+               who = this->ServerInstance->FakeClient;
+               smode = true;                   /* Setting this flag tells us it is a server mode*/
                sourceserv = source;    /* Set sourceserv to the actual source string */
        }
-       const char* modelist[64];
+       std::vector<std::string> modelist;
        time_t TS = 0;
-       int n = 0;
-       memset(&modelist,0,sizeof(modelist));
        for (unsigned int q = 0; (q < params.size()) && (q < 64); q++)
        {
                if (q == 1)
@@ -74,21 +63,22 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
                else
                {
                        /* Everything else is fine to append to the modelist */
-                       modelist[n++] = params[q].c_str();
+                       modelist.push_back(params[q]);
                }
 
        }
        /* Extract the TS value of the object, either User or Channel */
-       User* dst = this->Instance->FindNick(params[0]);
+       User* dst = this->ServerInstance->FindNick(params[0]);
        Channel* chan = NULL;
        time_t ourTS = 0;
+
        if (dst)
        {
                ourTS = dst->age;
        }
        else
        {
-               chan = this->Instance->FindChan(params[0]);
+               chan = this->ServerInstance->FindChan(params[0]);
                if (chan)
                {
                        ourTS = chan->age;
@@ -100,8 +90,8 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 
        if (!TS)
        {
-               Instance->Log(DEFAULT,"*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
-               Instance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq. Mode was dropped.", sourceserv.c_str());
+               ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"*** BUG? *** TS of 0 sent to FMODE. Are some services authors smoking craq, or is it 1970 again?. Dropped.");
+               ServerInstance->SNO->WriteToSnoMask('d', "WARNING: The server %s is sending FMODE with a TS of zero. Total craq. Mode was dropped.", sourceserv.c_str());
                return true;
        }
 
@@ -109,16 +99,13 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
         */
        if (TS <= ourTS)
        {
-               if ((TS < ourTS) && (!dst))
-                       Instance->Log(DEFAULT,"*** BUG *** Channel TS sent in FMODE to %s is %lu which is not equal to %lu!", params[0].c_str(), TS, ourTS);
-
                if (smode)
                {
-                       this->Instance->SendMode(modelist, n, who);
+                       this->ServerInstance->SendMode(modelist, who);
                }
                else
                {
-                       this->Instance->CallCommandHandler("MODE", modelist, n, who);
+                       this->ServerInstance->CallCommandHandler("MODE", modelist, who);
                }
                /* HOT POTATO! PASS IT ON! */
                Utils->DoOneToAllButSender(source,"FMODE",params,sourceserv);