Changeset e132b60 for protocols/nogaim.c

Timestamp:

2012-11-11T23:32:47Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

67ebc8e

Parents:

dd672e2

Message:

Extend keepalive code to time out connections when pings don't get
acknowledged, using this for Twitter streams and MSN so far.

File:

• protocols/nogaim.c (modified) (2 diffs)

protocols/nogaim.c

@@ -261 +261 @@
         struct im_connection *ic = d;
         
+        if( ( ic->flags & OPT_PONGS ) && !( ic->flags & OPT_PONGED ) )
+        {
+                /* This protocol is expected to ack keepalives and hasn't
+                   since the last time we were here. */
+                imcb_error( ic, "Connection timeout" );
+                imc_logout( ic, TRUE );
+                return FALSE;
+        }
+        ic->flags &= ~OPT_PONGED;
+        
         if( ic->acc->prpl->keepalive )
                 ic->acc->prpl->keepalive( ic );
         
         return TRUE;
+}
+
+void start_keepalives( struct im_connection *ic, int interval )
+{
+        b_event_remove( ic->keepalive );
+        ic->keepalive = b_timeout_add( interval, send_keepalive, ic );
+        
+        /* Connecting successfully counts as a first successful pong. */
+        if( ic->flags & OPT_PONGS )
+                ic->flags |= OPT_PONGED;
 }
 
@@ -277 +297 @@
         imcb_log( ic, "Logged in" );
         
-        b_event_remove( ic->keepalive );
-        ic->keepalive = b_timeout_add( 60000, send_keepalive, ic );
         ic->flags |= OPT_LOGGED_IN;
+        if( !ic->keepalive )
+                start_keepalives( ic, 60000 );
         
         /* Necessary to send initial presence status, even if we're not away. */