Revert to old sepstream logic until a proper fix is finished

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

diff --git a/src/modules/m_spanningtree/whois.cpp b/src/modules/m_spanningtree/whois.cpp
index a67b572840c67a9c6e33db684ba096e02757a68f..59dc839851a5ffafdfa7e581f8eebbde4fce6b03 100644 (file)
--- a/src/modules/m_spanningtree/whois.cpp
+++ b/src/modules/m_spanningtree/whois.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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,45 +12,33 @@
  */
 
 #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 "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 "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 */
-
-bool TreeSocket::Whois(const std::string &prefix, std::deque<std::string> &params)
+bool TreeSocket::Whois(const std::string &prefix, parameterlist &params)
 {
        if (params.size() < 1)
                return true;
-       User* u = this->Instance->FindNick(prefix);
+       User* u = ServerInstance->FindNick(prefix);
        if (u)
        {
                // an incoming request
                if (params.size() == 1)
                {
-                       User* x = this->Instance->FindNick(params[0]);
+                       User* x = ServerInstance->FindNick(params[0]);
                        if ((x) && (IS_LOCAL(x)))
                        {
-                               char signon[MAXBUF];
-                               char idle[MAXBUF];
-                               snprintf(signon, MAXBUF, "%lu", (unsigned long)x->signon);
-                               snprintf(idle, MAXBUF, "%lu", (unsigned long)abs((long)((x->idle_lastmsg) - Instance->Time())));
-                               std::deque<std::string> par;
+                               long idle = abs((long)((x->idle_lastmsg) - ServerInstance->Time()));
+                               parameterlist par;
                                par.push_back(prefix);
-                               par.push_back(signon);
-                               par.push_back(idle);
+                               par.push_back(ConvToStr(x->signon));
+                               par.push_back(ConvToStr(idle));
                                // ours, we're done, pass it BACK
                                Utils->DoOneToOne(params[0], "IDLE", par, u->server);
                        }
@@ -64,7 +52,7 @@ bool TreeSocket::Whois(const std::string &prefix, std::deque<std::string> &param
                else if (params.size() == 3)
                {
                        std::string who_did_the_whois = params[0];
-                       User* who_to_send_to = this->Instance->FindNick(who_did_the_whois);
+                       User* who_to_send_to = ServerInstance->FindNick(who_did_the_whois);
                        if ((who_to_send_to) && (IS_LOCAL(who_to_send_to)))
                        {
                                // an incoming reply to a whois we sent out
@@ -73,7 +61,7 @@ bool TreeSocket::Whois(const std::string &prefix, std::deque<std::string> &param
                                unsigned long idle = atoi(params[2].c_str());
                                if ((who_to_send_to) && (IS_LOCAL(who_to_send_to)))
                                {
-                                       do_whois(this->Instance, who_to_send_to, u, signon, idle, nick_whoised.c_str());
+                                       ServerInstance->DoWhois(who_to_send_to, u, signon, idle, nick_whoised.c_str());
                                }
                        }
                        else