Changeset b958cb5

Timestamp:

2012-02-26T09:20:30Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e371011

Parents:

441a67e

Message:

Changing ping behaviour. Pinging seems to be misbehaving for some people
for reasons not entirely clear to me. Instead of suppressing a PING to the
client if we're still waiting for a response to a previous one, just keep
sending them. One PONG will be enough to stay connected but that's okay.

File:

• irc.c (modified) (1 diff)

irc.c

@@ -858 +858 @@
 static gboolean irc_userping( gpointer _irc, gint fd, b_input_condition cond )
 {
+        double now = gettime();
         irc_t *irc = _irc;
-        int rv = 0;
+        int fail = 0;
         
         if( !( irc->status & USTATUS_LOGGED_IN ) )
         {
-                if( gettime() > ( irc->last_pong + IRC_LOGIN_TIMEOUT ) )
-                        rv = gettime() - irc->last_pong;
+                if( now > ( irc->last_pong + IRC_LOGIN_TIMEOUT ) )
+                        fail = now - irc->last_pong;
         }
         else
         {
-                if( ( gettime() > ( irc->last_pong + global.conf->ping_interval ) ) && !irc->pinging )
+                if( now > ( irc->last_pong + global.conf->ping_timeout ) )
+                {
+                        fail = now - irc->last_pong;
+                }
+                else
                 {
                         irc_write( irc, "PING :%s", IRC_PING_STRING );
-                        irc->pinging = 1;
-                }
-                else if( gettime() > ( irc->last_pong + global.conf->ping_timeout ) )
-                {
-                        rv = gettime() - irc->last_pong;
-                }
-        }
-        
-        if( rv > 0 )
-        {
-                irc_abort( irc, 0, "Ping Timeout: %d seconds", rv );
+                }
+        }
+        
+        if( fail > 0 )
+        {
+                irc_abort( irc, 0, "Ping Timeout: %d seconds", fail );
                 return FALSE;
         }