Merge pull request #53 from SaberUK/clang-analyze

[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 8e21f5a3eb5e2e28a2f5c35a7e73ffb3b0131b05..9627da8c05be34cd454c88c0cb843bfe3f7c42a6 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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,21 +12,18 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.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/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "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)
+bool TreeSocket::LocalPong(const std::string &prefix, parameterlist &params)
 {
        if (params.size() < 1)
                return true;
@@ -37,16 +34,14 @@ bool TreeSocket::LocalPong(const std::string &prefix, std::deque<std::string> &p
                if (ServerSource)
                {
                        ServerSource->SetPingFlag();
-                       timeval t;
-                       gettimeofday(&t, NULL);
-                       long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
+                       long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
                        ServerSource->rtt = ts - ServerSource->LastPingMsec;
                }
        }
        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
@@ -54,7 +49,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 = ServerInstance->FindNick(prefix);
                        if (u)
                        {
                                u->WriteServ("PONG %s %s",params[0].c_str(),params[1].c_str());
@@ -64,9 +59,7 @@ bool TreeSocket::LocalPong(const std::string &prefix, std::deque<std::string> &p
 
                        if (ServerSource)
                        {
-                               timeval t;
-                               gettimeofday(&t, NULL);
-                               long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
+                               long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
                                ServerSource->rtt = ts - ServerSource->LastPingMsec;
                                ServerSource->SetPingFlag();
                        }