Changeset 280e655

Timestamp:

2008-08-05T23:07:07Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4230221

Parents:

d84e2a9

Message:

Simple exponential backoff code. Have to add a maximum delay setting,
something like 5*5<300: 5s, multiply by 5 on each failure, but stop
increasing once we hit 5m.

Files:

• account.c (modified) (1 diff)
• account.h (modified) (2 diffs)
• irc.c (modified) (1 diff)
• protocols/nogaim.c (modified) (2 diffs)

account.c

@@ -234 +234 @@
         }
 }
+
+char *set_eval_account_reconnect_delay( set_t *set, char *value )
+{
+        int start;
+        char op;
+        int step;
+        
+        if( sscanf( value, "%d%c%d", &start, &op, &step ) == 3 &&
+            step > 0 && ( op == '+' || op == '*' ) )
+                return value;
+        else
+                return set_eval_int( set, value );
+}
+
+int account_reconnect_delay( account_t *a )
+{
+        char *setting = set_getstr( &a->irc->set, "auto_reconnect_delay" );
+        int start, step;
+        char op;
+        
+        if( sscanf( setting, "%d%c%d", &start, &op, &step ) == 3 && step > 0 )
+        {
+                if( a->auto_reconnect_delay == 0 )
+                        return a->auto_reconnect_delay = start;
+                else if( op == '+' )
+                        return a->auto_reconnect_delay += step;
+                else if( op == '*' )
+                        return a->auto_reconnect_delay *= step;
+        }
+        else if( sscanf( setting, "%d", &start ) == 1 )
+        {
+                return a->auto_reconnect_delay = start;
+        }
+        
+        return 0;
+}

account.h

@@ -35 +35 @@
         
         int auto_connect;
+        int auto_reconnect_delay;
         int reconnect;
         
@@ -52 +53 @@
 
 char *set_eval_account( set_t *set, char *value );
+char *set_eval_account_reconnect_delay( set_t *set, char *value );
+int account_reconnect_delay( account_t *a );
 
 #define ACC_SET_NOSAVE          1

irc.c

@@ -139 +139 @@
         set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
         set_add( &irc->set, "auto_reconnect", "false", set_eval_bool, irc );
-        set_add( &irc->set, "auto_reconnect_delay", "300", set_eval_int, irc );
+        set_add( &irc->set, "auto_reconnect_delay", "300", set_eval_account_reconnect_delay, irc );
         set_add( &irc->set, "buddy_sendbuffer", "false", set_eval_bool, irc );
         set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );

protocols/nogaim.c

@@ -267 +267 @@
            protocols. */
         imc_set_away( ic, u->away );
+        
+        /* Apparently we're connected successfully, so reset the
+           exponential backoff timer. */
+        ic->acc->auto_reconnect_delay = 0;
 }
 
@@ -331 +335 @@
                  set_getbool( &a->set, "auto_reconnect" ) )
         {
-                int delay = set_getint( &irc->set, "auto_reconnect_delay" );
+                int delay = account_reconnect_delay( a );
                 
                 imcb_log( ic, "Reconnecting in %d seconds..", delay );