mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-12-12 18:00:28 +00:00
Code Issues Releases Wiki Activity

Handle time shifts backwards gracefully.

Browse Source
This commit is contained in:
Alexander Barton 2006-05-09 14:49:08 +00:00
parent d0045afb09
commit 2af87e9152
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/ngircd/conn.c
View File

@ -17,7 +17,7 @@
#include "portab.h" #include "portab.h"
#include "io.h" #include "io.h"
static char UNUSED id[] = "$Id: conn.c,v 1.193 2006/04/29 16:19:46 fw Exp $"; static char UNUSED id[] = "$Id: conn.c,v 1.194 2006/05/09 14:49:08 alex Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -1083,12 +1083,15 @@ Read_Request( CONN_ID Idx )
/* Update timestamp of last data received if this connection is /* Update timestamp of last data received if this connection is
* registered as a user, server or service connection. Don't update * registered as a user, server or service connection. Don't update
* otherwise, so users have at least Conf_PongTimeout seconds time to * otherwise, so users have at least Conf_PongTimeout seconds time to
* register with the IRC server -- see Check_Connections(). */ * register with the IRC server -- see Check_Connections().
* Set "lastping", too, so we can handle time shifts backwards ... */
c = Conn_GetClient(Idx); c = Conn_GetClient(Idx);
if (c && (Client_Type(c) == CLIENT_USER if (c && (Client_Type(c) == CLIENT_USER
|| Client_Type(c) == CLIENT_SERVER || Client_Type(c) == CLIENT_SERVER
|| Client_Type(c) == CLIENT_SERVICE)) || Client_Type(c) == CLIENT_SERVICE)) {
My_Connections[Idx].lastdata = time(NULL); My_Connections[Idx].lastdata = time(NULL);
My_Connections[Idx].lastping = My_Connections[Idx].lastdata;
}
/* Look at the data in the (read-) buffer of this connection */ /* Look at the data in the (read-) buffer of this connection */
Handle_Buffer(Idx); Handle_Buffer(Idx);
@ -1218,27 +1221,31 @@ Check_Connections( void )
continue; continue;
c = Conn_GetClient(i); c = Conn_GetClient(i);
if( c && (( Client_Type( c ) == CLIENT_USER ) || ( Client_Type( c ) == CLIENT_SERVER ) || ( Client_Type( c ) == CLIENT_SERVICE ))) if (c && ((Client_Type(c) == CLIENT_USER)
{ || (Client_Type(c) == CLIENT_SERVER)
|| (Client_Type(c) == CLIENT_SERVICE))) {
/* connected User, Server or Service */ /* connected User, Server or Service */
if( My_Connections[i].lastping > My_Connections[i].lastdata ) { if (My_Connections[i].lastping >
/* we already sent a ping */ My_Connections[i].lastdata) {
if( My_Connections[i].lastping < time( NULL ) - Conf_PongTimeout ) { /* We already sent a ping */
if (My_Connections[i].lastping <
time(NULL) - Conf_PongTimeout) {
/* Timeout */ /* Timeout */
LogDebug("Connection %d: Ping timeout: %d seconds.", LogDebug
("Connection %d: Ping timeout: %d seconds.",
i, Conf_PongTimeout); i, Conf_PongTimeout);
Conn_Close( i, NULL, "Ping timeout", true ); Conn_Close(i, NULL, "Ping timeout",
true);
} }
} } else if (My_Connections[i].lastdata <
else if( My_Connections[i].lastdata < time( NULL ) - Conf_PingTimeout ) { time(NULL) - Conf_PingTimeout) {
/* we need to sent a PING */ /* We need to send a PING ... */
LogDebug("Connection %d: sending PING ...", i); LogDebug("Connection %d: sending PING ...", i);
My_Connections[i].lastping = time(NULL); My_Connections[i].lastping = time(NULL);
Conn_WriteStr( i, "PING :%s", Client_ID( Client_ThisServer( ))); Conn_WriteStr(i, "PING :%s",
Client_ID(Client_ThisServer()));
} }
} } else {
else
{
/* The connection is not fully established yet, so /* The connection is not fully established yet, so
* we don't do the PING-PONG game here but instead * we don't do the PING-PONG game here but instead
* disconnect the client after "a short time" if it's * disconnect the client after "a short time" if it's
@ -1246,7 +1253,9 @@ Check_Connections( void )
if (My_Connections[i].lastdata < if (My_Connections[i].lastdata <
time(NULL) - Conf_PongTimeout) { time(NULL) - Conf_PongTimeout) {
LogDebug("Unregistered connection %d timed out ...", i); LogDebug
("Unregistered connection %d timed out ...",
i);
Conn_Close(i, NULL, "Timeout", false); Conn_Close(i, NULL, "Timeout", false);
} }
} }