Changeset e132b60

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.

Location:

protocols

Files:

• msn/msn.c (modified) (1 diff)
• msn/ns.c (modified) (1 diff)
• nogaim.c (modified) (2 diffs)
• nogaim.h (modified) (1 diff)
• twitter/twitter.c (modified) (1 diff)
• twitter/twitter_lib.c (modified) (1 diff)

protocols/msn/msn.c

@@ -53 +53 @@
         
         ic->proto_data = md;
+        ic->flags |= OPT_PONGS | OPT_PONGED;
         
         if( strchr( acc->user, '@' ) == NULL )

protocols/msn/ns.c

@@ -576 +576 @@
                 if( num_parts >= 7 )
                         handler->msglen = atoi( cmd[6] );
+        }
+        else if( strcmp( cmd[0], "QNG" ) == 0 )
+        {
+                ic->flags |= OPT_PONGED;
         }
         else if( isdigit( cmd[0][0] ) )

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. */

protocols/nogaim.h

@@ -68 +68 @@
 #define OPT_THINKING    0x00000200 /* about these values... Stupid me! */
 #define OPT_NOOTR       0x00001000 /* protocol not suitable for OTR */
+#define OPT_PONGS       0x00010000 /* Service sends us keep-alives */
+#define OPT_PONGED      0x00020000 /* Received a keep-alive during last interval */
 
 /* ok. now the fun begins. first we create a connection structure */

protocols/twitter/twitter.c

@@ -72 +72 @@
                    us the rest. \o/ */
                 twitter_open_stream(ic);
+                ic->flags |= OPT_PONGS;
         } else {
                 /* Not using the streaming API, so keep polling the old-

protocols/twitter/twitter_lib.c

@@ -740 +740 @@
                 return;
         
+        ic->flags |= OPT_PONGED;
         td = ic->proto_data;