Changeset 823de9d

Timestamp:

2009-03-12T19:10:06Z (16 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

673a54c

Parents:

9b55485

Message:

commit updates by ashish shukla <wahjava@…>

Files:

• Makefile (modified) (1 diff)
• account.c (modified) (6 diffs)
• account.h (modified) (2 diffs)
• bitlbee.h (modified) (1 diff)
• conf.c (modified) (1 diff)
• configure (modified) (1 diff)
• doc/CHANGES (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (1 diff)
• ipc.c (modified) (8 diffs)
• ipc.h (modified) (1 diff)
• irc.c (modified) (5 diffs)
• irc_commands.c (modified) (1 diff)
• lib/ssl_bogus.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/jabber_util.c (modified) (1 diff)
• protocols/msn/msn.c (modified) (6 diffs)
• protocols/msn/msn.h (modified) (2 diffs)
• protocols/msn/ns.c (modified) (2 diffs)
• protocols/msn/sb.c (modified) (1 diff)
• protocols/nogaim.c (modified) (3 diffs)
• protocols/yahoo/libyahoo2.c (modified) (1 diff)
• protocols/yahoo/yahoo.c (modified) (1 diff)
• protocols/yahoo/yahoo_httplib.c (modified) (1 diff)
• root_commands.c (modified) (13 diffs)
• set.c (modified) (10 diffs)
• set.h (modified) (3 diffs)
• sock.h (modified) (1 diff)
• storage.c (modified) (6 diffs)
• storage.h (modified) (2 diffs)
• storage_text.c (modified) (5 diffs)
• storage_xml.c (modified) (6 diffs)
• unix.c (modified) (2 diffs)

Makefile

@@ -107 +107 @@
         x=$$(basename $$(pwd)); \
         cd ..; \
-        tar czf $$x.tar.gz --exclude=debian --exclude=.bzr $$x
+        tar czf $$x.tar.gz --exclude=debian --exclude=.bzr* $$x
 
 $(subdirs):

account.c

@@ -55 +55 @@
         
         s = set_add( &a->set, "password", NULL, set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE;
+        s->flags |= ACC_SET_NOSAVE | SET_NULL_OK;
         
         s = set_add( &a->set, "username", NULL, set_eval_account, a );
@@ -77 +77 @@
         /* Double-check: We refuse to edit on-line accounts. */
         if( set->flags & ACC_SET_OFFLINE_ONLY && acc->ic )
-                return NULL;
-        
-        if( strcmp( set->key, "username" ) == 0 )
+                return SET_INVALID;
+        
+        if( strcmp( set->key, "server" ) == 0 )
+        {
+                g_free( acc->server );
+                if( value && *value )
+                {
+                        acc->server = g_strdup( value );
+                        return value;
+                }
+                else
+                {
+                        acc->server = g_strdup( set->def );
+                        return g_strdup( set->def );
+                }
+        }
+        else if( strcmp( set->key, "username" ) == 0 )
         {
                 g_free( acc->user );
@@ -87 +101 @@
         else if( strcmp( set->key, "password" ) == 0 )
         {
-                g_free( acc->pass );
-                acc->pass = g_strdup( value );
-                return NULL;    /* password shouldn't be visible in plaintext! */
-        }
-        else if( strcmp( set->key, "server" ) == 0 )
-        {
-                g_free( acc->server );
-                if( *value )
-                {
-                        acc->server = g_strdup( value );
-                        return value;
+                if( value )
+                {
+                        g_free( acc->pass );
+                        acc->pass = g_strdup( value );
+                        return NULL;    /* password shouldn't be visible in plaintext! */
                 }
                 else
                 {
-                        acc->server = NULL;
-                        return g_strdup( set->def );
+                        /* NULL can (should) be stored in the set_t
+                           variable, but is otherwise not correct. */
+                        return SET_INVALID;
                 }
         }
@@ -108 +117 @@
         {
                 if( !is_bool( value ) )
-                        return NULL;
+                        return SET_INVALID;
                 
                 acc->auto_connect = bool2int( value );
@@ -114 +123 @@
         }
         
-        return NULL;
+        return SET_INVALID;
 }
 
@@ -234 +243 @@
         }
 }
+
+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 immediately know where to continue parsing. */
+        
+        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 : SET_INVALID;
+}
+
+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
-#define ACC_SET_OFFLINE_ONLY    2
-#define ACC_SET_ONLINE_ONLY     4
+#define ACC_SET_NOSAVE          0x01
+#define ACC_SET_OFFLINE_ONLY    0x02
+#define ACC_SET_ONLINE_ONLY     0x04
 
 #endif

bitlbee.h

@@ -32 +32 @@
 #define _WIN32_WINNT 0x0501
 
+/* Depend on Windows 2000 for now since we need getaddrinfo() */
+#define _WIN32_WINNT 0x0501
+
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.2.1"
+#define BITLBEE_VERSION "1.2.3"
 #define VERSION BITLBEE_VERSION
 

conf.c

@@ -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' )

configure

@@ -72 +72 @@
 --gcov=0/1      Disable/enable test coverage reporting  $gcov
 --plugins=0/1   Disable/enable plugins support          $plugins
---otr=0/1/auto  Disable/enable OTR encryption support   $otr
+--otr=0/1       Disable/enable OTR encryption support   $otr
 
 --events=...    Event handler (glib, libevent)          $events

doc/CHANGES

@@ -3 +3 @@
 
 http://bugs.bitlbee.org/bitlbee/timeline?daysback=90&changeset=on
+
+Version 1.2.3:
+- Fixed one more flaw similar to the previous hijacking bug, caused by incon-
+  sistent handling of the USTATUS_IDENTIFIED state. All code touching these
+  variables was reviewed and should be correct now.
+
+Finished 7 Sep 2008 
+
+Version 1.2.2:
+- Security bugfix: It was possible to hijack accounts (without gaining access
+  to the old account, it's simply an overwrite)
+- Some more stability improvements.
+- Fixed bug where people with non-lowercase nicks couldn't drop their account.
+- Easier upgrades of non-forking daemon mode servers (using the DEAF
+  command).
+- Can be cross-compiled for Win32 now! (No support for SSL yet though, which
+  makes it less useful for now.)
+- Exponential backoff on auto-reconnect.
+- Changing passwords gives less confusing feedback ("password is empty") now.
+
+Finished 26 Aug 2008
 
 Version 1.2.1:

doc/user-guide/commands.xml

@@ -470 +470 @@
         </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>
 

ipc.c

@@ -33 +33 @@
 
 GSList *child_list = NULL;
+static char *statefile = NULL;
 
 static void ipc_master_cmd_client( irc_t *data, char **cmd )
@@ -62 +63 @@
 }
 
-static void ipc_master_cmd_deaf( irc_t *data, char **cmd )
-{
-        if( global.conf->runmode == RUNMODE_DAEMON )
-        {
-                b_event_remove( global.listen_watch_source_id );
-                close( global.listen_socket );
-                
-                global.listen_socket = global.listen_watch_source_id = -1;
-        
-                ipc_to_children_str( "OPERMSG :Closed listening socket, waiting "
-                                     "for all users to disconnect." );
-        }
-        else
-        {
-                ipc_to_children_str( "OPERMSG :The DEAF command only works in "
-                                     "normal daemon mode. Try DIE instead." );
-        }
-}
-
 void ipc_master_cmd_rehash( irc_t *data, char **cmd )
 {
@@ -116 +98 @@
         { "hello",      0, ipc_master_cmd_client,     0 },
         { "die",        0, ipc_master_cmd_die,        0 },
-        { "deaf",       0, ipc_master_cmd_deaf,       0 },
         { "wallops",    1, NULL,                      IPC_CMD_TO_CHILDREN },
         { "wall",       1, NULL,                      IPC_CMD_TO_CHILDREN },
@@ -460 +441 @@
 }
 
-#ifndef _WIN32
 char *ipc_master_save_state()
 {
@@ -501 +481 @@
 }
 
+void ipc_master_set_statefile( char *fn )
+{
+        statefile = g_strdup( fn );
+}
+
 
 static gboolean new_ipc_client( gpointer data, gint serversock, b_input_condition cond )
@@ -521 +506 @@
 }
 
+#ifndef _WIN32
 int ipc_master_listen_socket()
 {
@@ -557 +543 @@
 }
 #else
-int ipc_master_listen_socket()
-{
         /* FIXME: Open named pipe \\.\BITLBEE */
-        return 0;
-}
 #endif
 
-int ipc_master_load_state( char *statefile )
+int ipc_master_load_state()
 {
         struct bitlbee_child *child;
@@ -572 +554 @@
         if( statefile == NULL )
                 return 0;
-        
         fp = fopen( statefile, "r" );
         unlink( statefile );    /* Why do it later? :-) */

ipc.h

@@ -58 +58 @@
 
 char *ipc_master_save_state();
-int ipc_master_load_state( char *statefile );
+void ipc_master_set_statefile( char *fn );
+int ipc_master_load_state();
 int ipc_master_listen_socket();
 

irc.c

@@ -33 +33 @@
 
 static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );
-static void irc_welcome( irc_t *irc );
+static void irc_welcome( irc_t* irc );
 
 GSList *irc_connection_list = NULL;
 
-static char *passchange( set_t *set, char *value )
+static char *set_eval_password( set_t *set, char *value )
 {
         irc_t *irc = set->data;
         
-        irc_setpass( irc, value );
-        irc_usermsg( irc, "Password successfully changed" );
-        return NULL;
+        if( irc->status & USTATUS_IDENTIFIED && value )
+        {
+                irc_setpass( irc, value );
+                return NULL;
+        }
+        else
+        {
+                return SET_INVALID;
+        }
 }
 
@@ -80 +86 @@
         struct sockaddr_storage sock;
         socklen_t socklen = sizeof( sock );
+        set_t *s;
         
         irc = g_new0( irc_t, 1 );
@@ -139 +146 @@
         irc_connection_list = g_slist_append( irc_connection_list, irc );
 
-        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, "buddy_sendbuffer", "false", set_eval_bool, irc );
-        set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
-        set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc );
-        set_add( &irc->set, "color_encrypted", "true", set_eval_bool, irc );
-        set_add( &irc->set, "debug", "false", set_eval_bool, irc );
-        set_add( &irc->set, "default_target", "root", NULL, irc );
-        set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc );
-        set_add( &irc->set, "handle_unknown", "root", NULL, irc );
-        set_add( &irc->set, "halfop_buddies", "encrypted", set_eval_halfop_buddies, irc );
-        set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc );
-        set_add( &irc->set, "op_buddies", "trusted", set_eval_op_buddies, irc );
-        set_add( &irc->set, "op_root", "true", set_eval_op_root, irc );
-        set_add( &irc->set, "op_user", "true", set_eval_op_user, irc );
-        set_add( &irc->set, "otr_policy", "opportunistic", set_eval_otr_policy, irc );
-        set_add( &irc->set, "password", NULL, passchange, irc );
-        set_add( &irc->set, "private", "true", set_eval_bool, irc );
-        set_add( &irc->set, "query_order", "lifo", NULL, irc );
-        set_add( &irc->set, "root_nick", irc->mynick, set_eval_root_nick, irc );
-        set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc );
-        set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
-        set_add( &irc->set, "strip_html", "true", NULL, irc );
-        set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );
-        set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc );
-        set_add( &irc->set, "voice_buddies", "notaway",  set_eval_voice_buddies, irc );
+        s = set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "auto_reconnect", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "auto_reconnect_delay", "5*3<900", set_eval_account_reconnect_delay, irc );
+        s = set_add( &irc->set, "buddy_sendbuffer", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
+        s = set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc );
+        s = set_add( &irc->set, "color_encrypted", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "debug", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "default_target", "root", NULL, irc );
+        s = set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "handle_unknown", "root", NULL, irc );
+        s = set_add( &irc->set, "halfop_buddies", "encrypted", set_eval_halfop_buddies, irc );
+        s = set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "op_buddies", "trusted", set_eval_op_buddies, irc );
+        s = set_add( &irc->set, "op_root", "true", set_eval_op_root, irc );
+        s = set_add( &irc->set, "otr_policy", "oppurtunistic", set_eval_otr_policy, irc );
+        s = set_add( &irc->set, "password", NULL, set_eval_password, irc );
+        s->flags |= SET_NULL_OK;
+        s = set_add( &irc->set, "private", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "query_order", "lifo", NULL, irc );
+        s = set_add( &irc->set, "root_nick", irc->mynick, set_eval_root_nick, irc );
+        s = set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "strip_html", "true", NULL, irc );
+        s = set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );
+        s = set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "voice_buddies", "notaway", set_eval_voice_buddies, irc);
         
         conf_loaddefaults( irc );
 
         irc->otr = otr_new();
-        
+
         /* Evaluator sets the iconv/oconv structures. */
         set_eval_charset( set_find( &irc->set, "charset" ), set_getstr( &irc->set, "charset" ) );
@@ -241 +248 @@
         
         if( irc->status & USTATUS_IDENTIFIED && set_getbool( &irc->set, "save_on_quit" ) ) 
-                if( storage_save( irc, TRUE ) != STORAGE_OK )
+                if( storage_save( irc, NULL, TRUE ) != STORAGE_OK )
                         irc_usermsg( irc, "Error while saving settings!" );
         
@@ -322 +329 @@
         
         g_free( irc->last_target );
-        
+
         otr_free(irc->otr);
         
         g_free( irc );
-        
+
         if( global.conf->runmode == RUNMODE_INETD ||
             global.conf->runmode == RUNMODE_FORKDAEMON ||

irc_commands.c

@@ -626 +626 @@
         { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
         { "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
-        { "deaf",        0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "wallops",     1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "wall",        1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },

lib/ssl_bogus.c

@@ -70 +70 @@
         return 0;
 }
+
+int ssl_pending( void *conn )
+{
+        return 0;
+}

protocols/jabber/jabber.c

@@ -70 +70 @@
         
         s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
         
         s = set_add( &acc->set, "ssl", "false", set_eval_bool, acc );

protocols/jabber/jabber_util.c

@@ -37 +37 @@
                 /* Priority is a signed 8-bit integer, according to RFC 3921. */
                 if( i < -128 || i > 127 )
-                        return NULL;
+                        return SET_INVALID;
         }
         else
-                return NULL;
+                return SET_INVALID;
         
         /* Only run this stuff if the account is online ATM,

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/ns.c

@@ -278 +278 @@
                 if( num_parts == 5 )
                 {
-                        int i, groupcount;
-                        
-                        groupcount = atoi( cmd[4] );
-                        if( groupcount > 0 )
-                        {
-                                /* valgrind says this is leaking memory, I'm guessing
-                                   that this happens during server redirects. */
-                                if( md->grouplist )
-                                {
-                                        for( i = 0; i < md->groupcount; i ++ )
-                                                g_free( md->grouplist[i] );
-                                        g_free( md->grouplist );
-                                }
-                                
-                                md->groupcount = groupcount;
+                        md->buddycount = atoi( cmd[3] );
+                        md->groupcount = atoi( cmd[4] );
+                        if( md->groupcount > 0 )
                                 md->grouplist = g_new0( char *, md->groupcount );
-                        }
-                        
-                        md->buddycount = atoi( cmd[3] );
+                        
                         if( !*cmd[3] || md->buddycount == 0 )
                                 msn_logged_in( ic );
@@ -679 +665 @@
                                         imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
                                 }
-                                
-                                g_free( inbox );
-                                g_free( folders );
                         }
                         else if( g_strncasecmp( ct, "text/x-msmsgsemailnotification", 30 ) == 0 )

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

protocols/yahoo/libyahoo2.c

@@ -69 +69 @@
 #ifdef __MINGW32__
 # include <winsock2.h>
+# define write(a,b,c) send(a,b,c,0)
+# define read(a,b,c)  recv(a,b,c,0)
 #endif
 

protocols/yahoo/yahoo.c

@@ -666 +666 @@
         
         imcb_error( ic, "%s", err );
-        
-        if( fatal )
-                imc_logout( ic, TRUE );
 }
 

protocols/yahoo/yahoo_httplib.c

@@ -51 +51 @@
 #ifdef __MINGW32__
 # include <winsock2.h>
+# define write(a,b,c) send(a,b,c,0)
+# define read(a,b,c)  recv(a,b,c,0)
 # define snprintf _snprintf
 #endif

root_commands.c

@@ -132 +132 @@
 static void cmd_identify( irc_t *irc, char **cmd )
 {
-        storage_status_t status = storage_load( irc->nick, cmd[1], irc );
+        storage_status_t status = storage_load( irc, cmd[1] );
         char *account_on[] = { "account", "on", NULL };
         
@@ -144 +144 @@
         case STORAGE_OK:
                 irc_usermsg( irc, "Password accepted, settings and accounts loaded" );
+                irc_setpass( irc, cmd[1] );
+                irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "+R", 1 );
                 if( set_getbool( &irc->set, "auto_connect" ) )
@@ -163 +165 @@
         }
 
-        irc_setpass( irc, cmd[1] );
-        switch( storage_save( irc, FALSE )) {
+        switch( storage_save( irc, cmd[1], FALSE ) ) {
                 case STORAGE_ALREADY_EXISTS:
                         irc_usermsg( irc, "Nick is already registered" );
@@ -171 +172 @@
                 case STORAGE_OK:
                         irc_usermsg( irc, "Account successfully created" );
+                        irc_setpass( irc, cmd[1] );
                         irc->status |= USTATUS_IDENTIFIED;
                         irc_umode_set( irc, "+R", 1 );
@@ -239 +241 @@
 }
 
+static void cmd_showset( irc_t *irc, set_t **head, char *key )
+{
+        char *val;
+        
+        if( ( val = set_getstr( head, key ) ) )
+                irc_usermsg( irc, "%s = `%s'", key, val );
+        else
+                irc_usermsg( irc, "%s is empty", key );
+}
+
 static void cmd_account( irc_t *irc, char **cmd )
 {
@@ -450 +462 @@
                 {
                         set_t *s = set_find( &a->set, set_name );
+                        int st;
                         
                         if( a->ic && s && s->flags & ACC_SET_OFFLINE_ONLY )
@@ -465 +478 @@
                         
                         if( g_strncasecmp( cmd[2], "-del", 4 ) == 0 )
-                                set_reset( &a->set, set_name );
+                                st = set_reset( &a->set, set_name );
                         else
-                                set_setstr( &a->set, set_name, cmd[3] );
-                }
-                if( set_name ) /* else 'forgotten' on purpose.. Must show new value after changing */
-                {
-                        char *s = set_getstr( &a->set, set_name );
-                        if( s )
-                                irc_usermsg( irc, "%s = `%s'", set_name, s );
+                                st = set_setstr( &a->set, set_name, cmd[3] );
+                        
+                        if( set_getstr( &a->set, set_name ) == NULL )
+                        {
+                                if( st )
+                                        irc_usermsg( irc, "Setting changed successfully" );
+                                else
+                                        irc_usermsg( irc, "Failed to change setting" );
+                        }
                         else
-                                irc_usermsg( irc, "%s is empty", set_name );
+                        {
+                                cmd_showset( irc, &a->set, set_name );
+                        }
+                }
+                else if( set_name )
+                {
+                        cmd_showset( irc, &a->set, set_name );
                 }
                 else
@@ -482 +503 @@
                         while( s )
                         {
-                                if( s->value || s->def )
-                                        irc_usermsg( irc, "%s = `%s'", s->key, s->value ? s->value : s->def );
-                                else
-                                        irc_usermsg( irc, "%s is empty", s->key );
+                                cmd_showset( irc, &s, s->key );
                                 s = s->next;
                         }
@@ -615 +633 @@
                         irc->mynick = g_strdup( cmd[2] );
                         
+                        /* If we're called internally (user did "set root_nick"),
+                           let's not go O(INF). :-) */
                         if( strcmp( cmd[0], "set_rename" ) != 0 )
                                 set_setstr( &irc->set, "root_nick", cmd[2] );
@@ -638 +658 @@
         }
         
-        return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : NULL;
+        return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : SET_INVALID;
 }
 
@@ -826 +846 @@
         if( cmd[1] && cmd[2] )
         {
+                int st;
+                
                 if( g_strncasecmp( cmd[1], "-del", 4 ) == 0 )
                 {
-                        set_reset( &irc->set, cmd[2] );
+                        st = set_reset( &irc->set, cmd[2] );
                         set_name = cmd[2];
                 }
                 else
                 {
-                        set_setstr( &irc->set, cmd[1], cmd[2] );
-                }
-        }
-        if( set_name ) /* else 'forgotten' on purpose.. Must show new value after changing */
-        {
-                char *s = set_getstr( &irc->set, set_name );
-                if( s )
-                        irc_usermsg( irc, "%s = `%s'", set_name, s );
+                        st = set_setstr( &irc->set, cmd[1], cmd[2] );
+                }
+                
+                /* Normally we just show the variable's new/unchanged
+                   value as feedback to the user, but this has always
+                   caused confusion when changing the password. Give
+                   other feedback instead: */
+                if( set_getstr( &irc->set, set_name ) == NULL )
+                {
+                        if( st )
+                                irc_usermsg( irc, "Setting changed successfully" );
+                        else
+                                irc_usermsg( irc, "Failed to change setting" );
+                }
                 else
-                        irc_usermsg( irc, "%s is empty", set_name );
+                {
+                        cmd_showset( irc, &irc->set, set_name );
+                }
+        }
+        else if( set_name )
+        {
+                cmd_showset( irc, &irc->set, set_name );
 
                 if( strchr( set_name, '/' ) )
@@ -852 +886 @@
                 while( s )
                 {
-                        if( s->value || s->def )
-                                irc_usermsg( irc, "%s = `%s'", s->key, s->value ? s->value : s->def );
-                        else
-                                irc_usermsg( irc, "%s is empty", s->key );
+                        cmd_showset( irc, &s, s->key );
                         s = s->next;
                 }
@@ -863 +894 @@
 static void cmd_save( irc_t *irc, char **cmd )
 {
-        if( storage_save( irc, TRUE ) == STORAGE_OK )
+        if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
+                irc_usermsg( irc, "Please create an account first" );
+        else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
                 irc_usermsg( irc, "Configuration saved" );
         else

set.c

@@ -26 +26 @@
 #include "bitlbee.h"
 
+/* Used to use NULL for this, but NULL is actually a "valid" value. */
+char *SET_INVALID = "nee";
+
 set_t *set_add( set_t **head, char *key, char *def, set_eval eval, void *data )
 {
@@ -114 +117 @@
         
         if( !s )
+                /*
+                Used to do this, but it never really made sense.
                 s = set_add( head, key, NULL, NULL, NULL );
-        
-        if( s->eval && !( nv = s->eval( s, value ) ) )
+                */
+                return 0;
+        
+        if( value == NULL && ( s->flags & SET_NULL_OK ) == 0 )
+                return 0;
+        
+        /* Call the evaluator. For invalid values, evaluators should now
+           return SET_INVALID, but previously this was NULL. Try to handle
+           that too if NULL is not an allowed value for this setting. */
+        if( s->eval && ( ( nv = s->eval( s, value ) ) == SET_INVALID ||
+                         ( ( s->flags & SET_NULL_OK ) == 0 && nv == NULL ) ) )
                 return 0;
         
@@ -168 +182 @@
 }
 
-void set_reset( set_t **head, char *key )
+int set_reset( set_t **head, char *key )
 {
         set_t *s;
@@ -174 +188 @@
         s = set_find( head, key );
         if( s )
-                set_setstr( head, key, s->def );
+                return set_setstr( head, key, s->def );
+        
+        return 0;
 }
 
@@ -187 +203 @@
         for( ; *s; s ++ )
                 if( !isdigit( *s ) )
-                        return NULL;
+                        return SET_INVALID;
         
         return value;
@@ -194 +210 @@
 char *set_eval_bool( set_t *set, char *value )
 {
-        return is_bool( value ) ? value : NULL;
+        return is_bool( value ) ? value : SET_INVALID;
 }
 
@@ -209 +225 @@
 }
 
-char *set_eval_op_root( set_t *set, char *value )
+char* set_eval_op_root( set_t *set, char* value )
 {
         irc_t *irc = set->data;
-        char *ret = set_eval_bool(set, value);
+        char* ret = set_eval_bool(set, value);
         int b = bool2int(ret);
-        
+
         irc_write( irc, ":%s!%s@%s MODE %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                   irc->channel, b?"+o":"-o", irc->mynick );
+                                               irc->channel, b?"+o":"-o", irc->mynick);
+
         return ret;
 }
 
-char *set_eval_op_user( set_t *set, char *value )
+char* set_eval_op_user( set_t *set, char* value )
 {
         irc_t *irc = set->data;
-        char *ret = set_eval_bool(set, value);
+        char* ret = set_eval_bool(set, value);
         int b = bool2int(ret);
-        
+
         irc_write( irc, ":%s!%s@%s MODE %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                   irc->channel, b?"+o":"-o", irc->nick );
+                                               irc->channel, b?"+o":"-o", irc->nick);
+
         return ret;
 }
@@ -250 +268 @@
         else
                 return NULL;
-        
+
         /* sorry for calling them op/deop - too lazy for search+replace :P */
         op[0]='\0';
@@ -335 +353 @@
                 char *flags = g_strnfill(ndeop, modeflag);
                 irc_write( irc, ":%s!%s@%s MODE %s -%s%s", irc->mynick, irc->mynick, irc->myhost,
-                                                       irc->channel, flags, deop );
-                g_free(flags);
-        }
-        
+                                                   irc->channel, flags, deop );
+        g_free(flags);
+    }
+
         return value;
 }
@@ -370 +388 @@
         return NULL;
 }
+

set.h

@@ -44 +44 @@
 typedef char *(*set_eval) ( struct set *set, char *value );
 
+extern char *SET_INVALID;
+
+#define SET_NULL_OK        0x0100
+
 typedef struct set
 {
@@ -61 +65 @@
                            this (yet?). */
         
-        /* Eval: Returns NULL if the value is incorrect or exactly the
-           passed value variable. When returning a corrected value,
+        /* Eval: Returns SET_INVALID if the value is incorrect or exactly
+           the passed value variable. When returning a corrected value,
            set_setstr() should be able to free() the returned string! */
         set_eval eval;
@@ -88 +92 @@
 int set_setint( set_t **head, char *key, int value );
 void set_del( set_t **head, char *key );
-void set_reset( set_t **head, char *key );
+int set_reset( set_t **head, char *key );
 
 /* Two very useful generic evaluators. */

sock.h

@@ -16 +16 @@
 #else
 # include <winsock2.h>
-# include <ws2tcpip.h>
+# ifndef _MSC_VER
+#  include <ws2tcpip.h>
+# endif
 # if !defined(BITLBEE_CORE) && defined(_MSC_VER)
 #   pragma comment(lib,"bitlbee.lib")
 # endif
 # include <io.h>
+# define read(a,b,c) recv(a,b,c,0)
+# define write(a,b,c) send(a,b,c,0)
+# define umask _umask
+# define mode_t int
 # define sock_make_nonblocking(fd) { int non_block = 1; ioctlsocket(fd, FIONBIO, &non_block); }
 # define sock_make_blocking(fd) { int non_block = 0; ioctlsocket(fd, FIONBIO, &non_block); }

storage.c

@@ -104 +104 @@
 }
 
-storage_status_t storage_load (const char *nick, const char *password, irc_t * irc)
-{
-        GList *gl;
+storage_status_t storage_load (irc_t * irc, const char *password)
+{
+        GList *gl;
+        
+        if (irc && irc->status & USTATUS_IDENTIFIED)
+                return STORAGE_OTHER_ERROR;
         
         /* Loop until we don't get NO_SUCH_USER */
@@ -113 +116 @@
                 storage_status_t status;
 
-                status = st->load(nick, password, irc);
+                status = st->load(irc, password);
                 if (status == STORAGE_OK) {
-                        irc_setpass(irc, password);
-                        otr_load(irc);          /* load our OTR userstate */
+                        otr_load(irc);
                         return status;
                 }
                 
-                if (status != STORAGE_NO_SUCH_USER) {
+                if (status != STORAGE_NO_SUCH_USER) 
                         return status;
-                }
         }
         
@@ -128 +129 @@
 }
 
-storage_status_t storage_save (irc_t *irc, int overwrite)
+storage_status_t storage_save (irc_t *irc, char *password, int overwrite)
 {
         storage_status_t st;
         
+        if (password != NULL) {
+                /* Should only use this in the "register" command. */
+                if (irc->password || overwrite)
+                        return STORAGE_OTHER_ERROR;
+                
+                irc_setpass(irc, password);
+        } else if ((irc->status & USTATUS_IDENTIFIED) == 0) {
+                return STORAGE_NO_SUCH_USER;
+        }
+
         otr_save(irc);
         st = ((storage_t *)global.storage->data)->save(irc, overwrite);
+        
+        if (password != NULL) {
+                irc_setpass(irc, NULL);
+        }
+        
         return st;
 }
@@ -150 +166 @@
 
                 status = st->remove(nick, password);
-                if (status != STORAGE_NO_SUCH_USER && 
-                        status != STORAGE_OK)
+                if (status != STORAGE_NO_SUCH_USER && status != STORAGE_OK)
                         ret = status;
         }
@@ -160 +175 @@
         return ret;
 }
+
+#if 0
+Not using this yet. Test thoroughly before adding UI hooks to this function.
 
 storage_status_t storage_rename (const char *onick, const char *nnick, const char *password)
@@ -202 +220 @@
         return STORAGE_OK;
 }
+#endif

storage.h

@@ -45 +45 @@
         storage_status_t (*check_pass) (const char *nick, const char *password);
 
-        storage_status_t (*load) (const char *nick, const char *password, irc_t * irc);
+        storage_status_t (*load) (irc_t *irc, const char *password);
         storage_status_t (*save) (irc_t *irc, int overwrite);
         storage_status_t (*remove) (const char *nick, const char *password);
@@ -55 +55 @@
 storage_status_t storage_check_pass (const char *nick, const char *password);
 
-storage_status_t storage_load (const char *nick, const char *password, irc_t * irc);
-storage_status_t storage_save (irc_t *irc, int overwrite);
+storage_status_t storage_load (irc_t * irc, const char *password);
+storage_status_t storage_save (irc_t *irc, char *password, int overwrite);
 storage_status_t storage_remove (const char *nick, const char *password);
 
-storage_status_t storage_rename (const char *onick, const char *nnick, const char *password);
+/* storage_status_t storage_rename (const char *onick, const char *nnick, const char *password); */
 
 void register_storage_backend(storage_t *);

storage_text.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "crypting.h"
-#ifdef _WIN32
-# define umask _umask
-# define mode_t int
-#endif
-
-#ifndef F_OK
-#define F_OK 0
-#endif
 
 static void text_init (void)
@@ -44 +36 @@
 }
 
-static storage_status_t text_load ( const char *my_nick, const char* password, irc_t *irc )
+static storage_status_t text_load( irc_t *irc, const char* password )
 {
         char s[512];
@@ -54 +46 @@
         account_t *acc, *acc_lookup[9];
         
-        if( irc->status & USTATUS_IDENTIFIED )
-                return( 1 );
-        
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, my_nick, ".accounts" );
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
         fp = fopen( s, "r" );
         if( !fp ) return STORAGE_NO_SUCH_USER;
@@ -68 +57 @@
                 return STORAGE_INVALID_PASSWORD;
         }
-        
-        /* Do this now. If the user runs with AuthMode = Registered, the
-           account command will not work otherwise. */
-        irc->status |= USTATUS_IDENTIFIED;
         
         while( fscanf( fp, "%511[^\n]s", s ) > 0 )
@@ -101 +86 @@
         }
         
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, my_nick, ".nicks" );
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
         fp = fopen( s, "r" );
         if( !fp ) return STORAGE_NO_SUCH_USER;

storage_xml.c

@@ -29 +29 @@
 #include "arc.h"
 #include "md5.h"
+
+#if GLIB_CHECK_VERSION(2,8,0)
 #include <glib/gstdio.h>
+#else
+/* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */
+#include <unistd.h>
+#define g_access access
+#endif
 
 #if !GLIB_CHECK_VERSION(2,8,0)
@@ -256 +263 @@
 }
 
-static storage_status_t xml_load_real( const char *my_nick, const char *password, irc_t *irc, xml_pass_st action )
+static storage_status_t xml_load_real( irc_t *irc, const char *my_nick, const char *password, xml_pass_st action )
 {
         GMarkupParseContext *ctx;
@@ -263 +270 @@
         GError *gerr = NULL;
         int fd, st;
-        
-        if( irc && irc->status & USTATUS_IDENTIFIED )
-                return( 1 );
         
         xd = g_new0( struct xml_parsedata, 1 );
@@ -318 +322 @@
                 return STORAGE_OK;
         
-        irc->status |= USTATUS_IDENTIFIED;
-        
         return STORAGE_OK;
 }
 
-static storage_status_t xml_load( const char *my_nick, const char *password, irc_t *irc )
-{
-        return xml_load_real( my_nick, password, irc, XML_PASS_UNKNOWN );
+static storage_status_t xml_load( irc_t *irc, const char *password )
+{
+        return xml_load_real( irc, irc->nick, password, XML_PASS_UNKNOWN );
 }
 
@@ -332 +334 @@
         /* This is a little bit risky because we have to pass NULL for the
            irc_t argument. This *should* be fine, if I didn't miss anything... */
-        return xml_load_real( my_nick, password, NULL, XML_PASS_CHECK_ONLY );
+        return xml_load_real( NULL, my_nick, password, XML_PASS_CHECK_ONLY );
 }
 
@@ -367 +369 @@
         md5_byte_t pass_md5[21];
         md5_state_t md5_state;
-        
-        if( irc->password == NULL )
-        {
-                irc_usermsg( irc, "Please register yourself if you want to save your settings." );
-                return STORAGE_OTHER_ERROR;
-        }
         
         path2 = g_strdup( irc->nick );

unix.c

@@ -56 +56 @@
         b_main_init();
         nogaim_init();
-        /* Ugly Note: libotr and gnutls both use libgcrypt. libgcrypt
-           has a process-global config state whose initialization happpens
-           twice if libotr and gnutls are used together. libotr installs custom
-           memory management functions for libgcrypt while our gnutls module
-           uses the defaults. Therefore we initialize OTR after SSL. *sigh* */
-        ssl_init();
-        otr_init();
+        /* Ugly Note: libotr and gnutls both use libgcrypt. libgcrypt
+           has a process-global config state whose initialization happpens
+           twice if libotr and gnutls are used together. libotr installs custom
+           memory management functions for libgcrypt while our gnutls module
+           uses the defaults. Therefore we initialize OTR after SSL. *sigh* */
+        ssl_init();
+        otr_init();
         
         srand( time( NULL ) ^ getpid() );
@@ -223 +223 @@
         return( (double) time->tv_sec + (double) time->tv_usec / 1000000 );
 }
-
-