Changeset 87f525e

Timestamp:

2008-08-10T10:42:52Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

a2b99ec

Parents:

8661caa (diff), a830512 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged in upstream r416 which includes my msn_write_msg patch. w00t! ;)

Files:

• account.c (modified) (1 diff)
• account.h (modified) (2 diffs)
• conf.c (modified) (2 diffs)
• doc/user-guide/commands.xml (modified) (1 diff)
• irc.c (modified) (1 diff)
• protocols/msn/msn.c (modified) (6 diffs)
• protocols/msn/msn.h (modified) (2 diffs)
• protocols/msn/sb.c (modified) (1 diff)
• protocols/nogaim.c (modified) (3 diffs)

account.c

@@ -234 +234 @@
         }
 }
+
+struct account_reconnect_delay
+{
+        int start;
+        char op;
+        int step;
+        int max;
+};
+
+int account_reconnect_delay_parse( char *value, struct account_reconnect_delay *p )
+{
+        memset( p, 0, sizeof( *p ) );
+        /* A whole day seems like a sane "maximum maximum". */
+        p->max = 86400;
+        
+        /* Format: /[0-9]+([*+][0-9]+(<[0-9+]))/ */
+        while( *value && isdigit( *value ) )
+                p->start = p->start * 10 + *value++ - '0';
+        
+        /* Sure, call me evil for implementing my own fscanf here, but it's
+           dead simple and I'm immediately at the next part to parse. */
+        
+        if( *value == 0 )
+                /* If the string ends now, the delay is constant. */
+                return 1;
+        else if( *value != '+' && *value != '*' )
+                /* Otherwise allow either a + or a * */
+                return 0;
+        
+        p->op = *value++;
+        
+        /* + or * the delay by this number every time. */
+        while( *value && isdigit( *value ) )
+                p->step = p->step * 10 + *value++ - '0';
+        
+        if( *value == 0 )
+                /* Use the default maximum (one day). */
+                return 1;
+        else if( *value != '<' )
+                return 0;
+        
+        p->max = 0;
+        value ++;
+        while( *value && isdigit( *value ) )
+                p->max = p->max * 10 + *value++ - '0';
+        
+        return p->max > 0;
+}
+
+char *set_eval_account_reconnect_delay( set_t *set, char *value )
+{
+        struct account_reconnect_delay p;
+        
+        return account_reconnect_delay_parse( value, &p ) ? value : NULL;
+}
+
+int account_reconnect_delay( account_t *a )
+{
+        char *setting = set_getstr( &a->irc->set, "auto_reconnect_delay" );
+        struct account_reconnect_delay p;
+        
+        if( account_reconnect_delay_parse( setting, &p ) )
+        {
+                if( a->auto_reconnect_delay == 0 )
+                        a->auto_reconnect_delay = p.start;
+                else if( p.op == '+' )
+                        a->auto_reconnect_delay += p.step;
+                else if( p.op == '*' )
+                        a->auto_reconnect_delay *= p.step;
+                
+                if( a->auto_reconnect_delay > p.max )
+                        a->auto_reconnect_delay = p.max;
+        }
+        else
+        {
+                a->auto_reconnect_delay = 0;
+        }
+        
+        return a->auto_reconnect_delay;
+}

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

conf.c

@@ -79 +79 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hu:" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -146 +146 @@
                                 "  -h  Show this help page.\n" );
                         return NULL;
+                }
+                else if( opt == 'R' )
+                {
+                        /* Backward compatibility; older BitlBees passed this
+                           info using a command-line flag. Allow people to
+                           upgrade from such a version for now. */
+                        setenv( "_BITLBEE_RESTART_STATE", optarg, 0 );
                 }
                 else if( opt == 'u' )

doc/user-guide/commands.xml

@@ -321 +321 @@
         </bitlbee-setting>
 
-        <bitlbee-setting name="auto_reconnect_delay" type="integer" scope="global">
-                <default>300</default>
-
-                <description>
-                        <para>
-                                Tell BitlBee after how many seconds it should attempt to bring an IM-connection back up after a crash. It's not a good idea to set this value very low, it will cause too much useless traffic when an IM-server is down for a few hours.
+        <bitlbee-setting name="auto_reconnect_delay" type="string" scope="global">
+                <default>5*3&lt;900</default>
+
+                <description>
+                        <para>
+                                Tell BitlBee after how many seconds it should attempt to bring a broken IM-connection back up.
+                        </para>
+
+                        <para>
+                                This can be one integer, for a constant delay. One can also set it to something like &quot;10*10&quot;, which means wait for ten seconds on the first reconnect, multiply it by ten on every failure. Once successfully connected, this delay is re-set to the initial value. With &lt; you can give a maximum delay.
                         </para>
 

irc.c

@@ -140 +140 @@
         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", "5*3<900", 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/msn/msn.c

@@ -113 +113 @@
 {
         struct msn_switchboard *sb;
-        struct msn_data *md = ic->proto_data;
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -122 +121 @@
         {
                 struct msn_message *m;
-                char buf[1024];
                 
                 /* Create a message. We have to arrange a usable switchboard, and send the message later. */
@@ -129 +127 @@
                 m->text = g_strdup( message );
                 
-                /* FIXME: *CHECK* the reliability of using spare sb's! */
-                if( ( sb = msn_sb_spare( ic ) ) )
-                {
-                        debug( "Trying to use a spare switchboard to message %s", who );
-                        
-                        sb->who = g_strdup( who );
-                        g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, who );
-                        if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                        {
-                                /* He/She should join the switchboard soon, let's queue the message. */
-                                sb->msgq = g_slist_append( sb->msgq, m );
-                                return( 1 );
-                        }
-                }
-                
-                debug( "Creating a new switchboard to message %s", who );
-                
-                /* If we reach this line, there was no spare switchboard, so let's make one. */
-                g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
-                if( !msn_write( ic, buf, strlen( buf ) ) )
-                {
-                        g_free( m->who );
-                        g_free( m->text );
-                        g_free( m );
-                        
-                        return( 0 );
-                }
-                
-                /* And queue the message to md. We'll pick it up when the switchboard comes up. */
-                md->msgq = g_slist_append( md->msgq, m );
-                
-                /* FIXME: If the switchboard creation fails, the message will not be sent. */
-                
-                return( 1 );
+                return msn_sb_write_msg( ic, m );
         }
         
@@ -252 +217 @@
 {
         struct msn_switchboard *sb;
-        struct msn_data *md = ic->proto_data;
-        char buf[1024];
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -263 +226 @@
         {
                 struct msn_message *m;
-                
-                if( ( sb = msn_sb_spare( ic ) ) )
-                {
-                        debug( "Trying to reuse an existing switchboard as a groupchat with %s", who );
-                        g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, who );
-                        if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                                return msn_sb_to_chat( sb );
-                }
-                
-                /* If the stuff above failed for some reason: */
-                debug( "Creating a new switchboard to groupchat with %s", who );
-                
-                /* Request a new switchboard. */
-                g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
-                if( !msn_write( ic, buf, strlen( buf ) ) )
-                        return( 0 );
                 
                 /* Create a magic message. This is quite hackish, but who cares? :-P */
@@ -285 +232 @@
                 m->text = g_strdup( GROUPCHAT_SWITCHBOARD_MESSAGE );
                 
-                /* Queue the magic message and cross your fingers. */
-                md->msgq = g_slist_append( md->msgq, m );
-                
-                /* FIXME: Can I try to return something here already? */
+                msn_sb_write_msg( ic, m );
+
                 return NULL;
         }

protocols/msn/msn.h

@@ -23 +23 @@
   Suite 330, Boston, MA  02111-1307  USA
 */
+
+#ifndef _MSN_H
+#define _MSN_H
 
 /* Some hackish magicstrings to make special-purpose messages/switchboards.
@@ -176 +179 @@
 void msn_sb_destroy( struct msn_switchboard *sb );
 gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond );
+int msn_sb_write_msg( struct im_connection *ic, struct msn_message *m );
+
+#endif //_MSN_H

protocols/msn/sb.c

@@ -44 +44 @@
                 return( 0 );
         }
+        
+        return( 1 );
+}
+
+int msn_sb_write_msg( struct im_connection *ic, struct msn_message *m )
+{
+        struct msn_data *md = ic->proto_data;
+        struct msn_switchboard *sb;
+        char buf[1024];
+
+        /* FIXME: *CHECK* the reliability of using spare sb's! */
+        if( ( sb = msn_sb_spare( ic ) ) )
+        {
+                debug( "Trying to use a spare switchboard to message %s", m->who );
+                
+                sb->who = g_strdup( m->who );
+                g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, m->who );
+                if( msn_sb_write( sb, buf, strlen( buf ) ) )
+                {
+                        /* He/She should join the switchboard soon, let's queue the message. */
+                        sb->msgq = g_slist_append( sb->msgq, m );
+                        return( 1 );
+                }
+        }
+        
+        debug( "Creating a new switchboard to message %s", m->who );
+        
+        /* If we reach this line, there was no spare switchboard, so let's make one. */
+        g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
+        if( !msn_write( ic, buf, strlen( buf ) ) )
+        {
+                g_free( m->who );
+                g_free( m->text );
+                g_free( m );
+                
+                return( 0 );
+        }
+        
+        /* And queue the message to md. We'll pick it up when the switchboard comes up. */
+        md->msgq = g_slist_append( md->msgq, m );
+        
+        /* FIXME: If the switchboard creation fails, the message will not be sent. */
         
         return( 1 );

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;
 }
 
@@ -290 +294 @@
         user_t *t, *u;
         account_t *a;
+        int delay;
         
         /* Nested calls might happen sometimes, this is probably the best
@@ -329 +334 @@
         }
         else if( allow_reconnect && set_getbool( &irc->set, "auto_reconnect" ) &&
-                 set_getbool( &a->set, "auto_reconnect" ) )
-        {
-                int delay = set_getint( &irc->set, "auto_reconnect_delay" );
-                
+                 set_getbool( &a->set, "auto_reconnect" ) &&
+                 ( delay = account_reconnect_delay( a ) ) > 0 )
+        {
                 imcb_log( ic, "Reconnecting in %d seconds..", delay );
                 a->reconnect = b_timeout_add( delay * 1000, auto_reconnect, a );