From: Alexander Barton <alex@barton.de>
Date: Thu, 19 Aug 2010 13:58:55 +0000 (+0200)
Subject: Don't reset My_Connections[Idx].lastping when reading data
X-Git-Tag: rel-17-rc1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04e38f17ae671f84b93e06c6eefa9235dd71d6ce;p=ngircd

Don't reset My_Connections[Idx].lastping when reading data

This fixes PING-PONG lag calculation (which resulted in "0" before).

The "lastping" time is still reset it if a time shift backwards has
been detected to prevent the daemon from miscalculating ping timeouts.
---

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 58a3cbfd..d0548c98 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1507,7 +1507,7 @@ Read_Request( CONN_ID Idx )
 	 * registered as a user, server or service connection. Don't update
 	 * otherwise, so users have at least Conf_PongTimeout seconds time to
 	 * register with the IRC server -- see Check_Connections().
-	 * Set "lastping", too, so we can handle time shifts backwards ... */
+	 * Update "lastping", too, if time shifted backwards ... */
 	c = Conn_GetClient(Idx);
 	if (c && (Client_Type(c) == CLIENT_USER
 		  || Client_Type(c) == CLIENT_SERVER
@@ -1517,7 +1517,8 @@ Read_Request( CONN_ID Idx )
 			My_Connections[Idx].bps = 0;
 
 		My_Connections[Idx].lastdata = t;
-		My_Connections[Idx].lastping = My_Connections[Idx].lastdata;
+		if (My_Connections[Idx].lastping > t)
+			My_Connections[Idx].lastping = t;
 	}
 
 	/* Look at the data in the (read-) buffer of this connection */