Use the underlying transport method for pinging idle clients.

Closes #1998.

1 files changed, 16 insertions, 3 deletions

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 53b6a0bef..056280c37 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -72,11 +72,24 @@ namespace
 			return;
 		}
 
-		// Send a ping to the client.
-		ClientProtocol::Messages::Ping ping;
-		user->Send(ServerInstance->GetRFCEvents().ping, ping);
 		user->lastping = 0;
 		user->nextping = ServerInstance->Time() + user->GetClass()->pingtime;
+
+		// If the user has an I/O hook that can handle pinging use that instead.
+		IOHook* hook = user->eh.GetIOHook();
+		while (hook)
+		{
+			if (hook->Ping())
+				return; // Client has been pinged.
+
+			IOHookMiddle* middlehook = IOHookMiddle::ToMiddleHook(hook);
+			hook = middlehook ? middlehook->GetNextHook() : nullptr;
+		}
+
+
+		// Send a ping to the client using an IRC message.
+		ClientProtocol::Messages::Ping ping;
+		user->Send(ServerInstance->GetRFCEvents().ping, ping);
 	}
 
 	void CheckConnectionTimeout(LocalUser* user)