Changeset 3923003

Timestamp:

2010-03-28T02:49:19Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

38ee021

Parents:

6761a40

Message:

Restored server-initiated PINGs.

Files:

• irc.c (modified) (3 diffs)
• irc_commands.c (modified) (4 diffs)

irc.c

@@ -28 +28 @@
 GSList *irc_connection_list;
 
+static gboolean irc_userping( gpointer _irc, gint fd, b_input_condition cond );
 static char *set_eval_charset( set_t *set, char *value );
 
@@ -87 +88 @@
                 myhost = g_strdup( "localhost.localdomain" );
         
-        //if( global.conf->ping_interval > 0 && global.conf->ping_timeout > 0 )
-        //      irc->ping_source_id = b_timeout_add( global.conf->ping_interval * 1000, irc_userping, irc );
+        if( global.conf->ping_interval > 0 && global.conf->ping_timeout > 0 )
+                irc->ping_source_id = b_timeout_add( global.conf->ping_interval * 1000, irc_userping, irc );
 
         irc_connection_list = g_slist_append( irc_connection_list, irc );
@@ -689 +690 @@
 
 
+/* Returns 0 if everything seems to be okay, a number >0 when there was a
+   timeout. The number returned is the number of seconds we received no
+   pongs from the user. When not connected yet, we don't ping but drop the
+   connection when the user fails to connect in IRC_LOGIN_TIMEOUT secs. */
+static gboolean irc_userping( gpointer _irc, gint fd, b_input_condition cond )
+{
+        irc_t *irc = _irc;
+        int rv = 0;
+        
+        if( !( irc->status & USTATUS_LOGGED_IN ) )
+        {
+                if( gettime() > ( irc->last_pong + IRC_LOGIN_TIMEOUT ) )
+                        rv = gettime() - irc->last_pong;
+        }
+        else
+        {
+                if( ( gettime() > ( irc->last_pong + global.conf->ping_interval ) ) && !irc->pinging )
+                {
+                        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 );
+                return FALSE;
+        }
+        
+        return TRUE;
+}
+
 
 static char *set_eval_charset( set_t *set, char *value )

irc_commands.c

@@ -106 +106 @@
         irc_write( irc, ":%s PONG %s :%s", irc->root->host,
                    irc->root->host, cmd[1]?cmd[1]:irc->root->host );
+}
+
+static void irc_cmd_pong( irc_t *irc, char **cmd )
+{
+        /* We could check the value we get back from the user, but in
+           fact we don't care, we're just happy s/he's still alive. */
+        irc->last_pong = gettime();
+        irc->pinging = 0;
 }
 
@@ -517 +525 @@
 }
 
-static void irc_cmd_pong( irc_t *irc, char **cmd )
-{
-        /* We could check the value we get back from the user, but in
-           fact we don't care, we're just happy he's still alive. */
-        irc->last_pong = gettime();
-        irc->pinging = 0;
-}
-
 static void irc_cmd_version( irc_t *irc, char **cmd )
 {
@@ -568 +568 @@
         { "quit",        0, irc_cmd_quit,        0 },
         { "ping",        0, irc_cmd_ping,        0 },
+        { "pong",        0, irc_cmd_pong,        IRC_CMD_LOGGED_IN },
         { "join",        1, irc_cmd_join,        IRC_CMD_LOGGED_IN },
         { "names",       1, irc_cmd_names,       IRC_CMD_LOGGED_IN },
@@ -588 +589 @@
         { "nickserv",    1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
         { "ns",          1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
-        { "pong",        0, irc_cmd_pong,        IRC_CMD_LOGGED_IN },
         { "version",     0, irc_cmd_version,     IRC_CMD_LOGGED_IN },
         { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },