Changeset 748bcdd for protocols/account.c

Timestamp:

2010-11-21T15:23:54Z (10 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.

File:

• protocols/account.c (modified) (3 diffs)

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;
 }