Fix waitpong referring to registration timeouts as ping timeouts.

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

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index f9e9262a7a00e93a04787482cc8e548ea9be6c25..d2de63b3f353d076bdad008b4279182d451ad2f2 100644 (file)
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -46,17 +46,19 @@ class ModuleWaitPong : public Module
        ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
        {
                std::string pingrpl = ServerInstance->GenRandomStr(10);
-
-               user->Write("PING :%s", pingrpl.c_str());
+               {
+                       ClientProtocol::Messages::Ping pingmsg(pingrpl);
+                       user->Send(ServerInstance->GetRFCEvents().ping, pingmsg);
+               }
 
                if(sendsnotice)
-                       user->WriteNotice("*** If you are having problems connecting due to ping timeouts, please type /quote PONG " + pingrpl + " or /raw PONG " + pingrpl + " now.");
+                       user->WriteNotice("*** If you are having problems connecting due to registration timeouts type /quote PONG " + pingrpl + " or /raw PONG " + pingrpl + " now.");
 
                ext.set(user, pingrpl);
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated, const std::string& original_line) CXX11_OVERRIDE
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
                if (command == "PONG")
                {