Purge the deprecated hash_map from existance.

[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 e9f1099a919294dd558303f80559704242b5bf8c..5966d05d9f953ed90b7667fc67bfcdabf2da92eb 100644 (file)
--- a/src/modules/m_spanningtree/pong.cpp
+++ b/src/modules/m_spanningtree/pong.cpp
@@ -1,32 +1,35 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #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,9 +40,7 @@ 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;
                }
        }
@@ -54,7 +55,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->ServerInstance->FindNick(prefix);
+                       User* u = ServerInstance->FindNick(prefix);
                        if (u)
                        {
                                u->WriteServ("PONG %s %s",params[0].c_str(),params[1].c_str());
@@ -64,9 +65,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();
                        }