Changeset 748bcdd

Timestamp:

2010-11-21T15:23:54Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

495d21b

Parents:

bb151f7

Message:

Time out if logging in takes too long (2m for now). Except for Twitter
OAuth login, which requires user action. This mostly solves problems with
OSCAR login silently failing, but may also be useful in other places.

Location:

protocols

Files:

• account.c (modified) (3 diffs)
• nogaim.c (modified) (1 diff)
• nogaim.h (modified) (1 diff)
• twitter/twitter.c (modified) (1 diff)

protocols/account.c

@@ -339 +339 @@
 }
 
+static gboolean account_on_timeout( gpointer d, gint fd, b_input_condition cond );
+
 void account_on( bee_t *bee, account_t *a )
 {
@@ -351 +353 @@
         a->reconnect = 0;
         a->prpl->login( a );
+        
+        if( !( a->ic->flags & OPT_SLOW_LOGIN ) )
+                a->ic->keepalive = b_timeout_add( 120000, account_on_timeout, a->ic );
 }
 
@@ -362 +367 @@
                 cancel_auto_reconnect( a );
         }
+}
+
+static gboolean account_on_timeout( gpointer d, gint fd, b_input_condition cond )
+{
+        struct im_connection *ic = d;
+        
+        imcb_error( ic, "Connection timeout" );
+        imc_logout( ic, TRUE );
+        
+        return FALSE;
 }
 

protocols/nogaim.c

@@ -277 +277 @@
         imcb_log( ic, "Logged in" );
         
+        b_event_remove( ic->keepalive );
         ic->keepalive = b_timeout_add( 60000, send_keepalive, ic );
         ic->flags |= OPT_LOGGED_IN;

protocols/nogaim.h

@@ -64 +64 @@
 #define OPT_DOES_HTML   0x00000010
 #define OPT_LOCALBUDDY  0x00000020 /* For nicks local to one groupchat */
+#define OPT_SLOW_LOGIN  0x00000040 /* I.e. Twitter Oauth @ login time */
 #define OPT_TYPING      0x00000100 /* Some pieces of code make assumptions */
 #define OPT_THINKING    0x00000200 /* about these values... Stupid me! */

protocols/twitter/twitter.c

@@ -108 +108 @@
 
         td->oauth_info = oauth_request_token( &twitter_oauth, twitter_oauth_callback, ic );
+        
+        /* We need help from the user to complete OAuth login, so don't time
+           out on this login. */
+        ic->flags |= OPT_SLOW_LOGIN;
 }