Changes in / [46d4230:9299891]

Files:

• account.c (modified) (2 diffs)
• bitlbee.c (modified) (2 diffs)
• bitlbee.conf (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• conf.c (modified) (4 diffs)
• conf.h (modified) (1 diff)
• doc/CHANGES (modified) (1 diff)
• doc/RELEASE-SPEECH-1.2 (deleted)
• doc/user-guide/commands.xml (modified) (1 diff)
• irc.c (modified) (19 diffs)
• irc.h (modified) (2 diffs)
• irc_commands.c (modified) (4 diffs)
• lib/arc.h (modified) (1 diff)
• lib/proxy.c (modified) (2 diffs)
• protocols/jabber/jabber_util.c (modified) (2 diffs)
• protocols/msn/msn.h (modified) (1 diff)
• protocols/msn/msn_util.c (modified) (2 diffs)
• protocols/msn/ns.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (2 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (5 diffs)
• protocols/yahoo/yahoo.c (modified) (2 diffs)
• query.c (modified) (3 diffs)
• query.h (modified) (1 diff)
• root_commands.c (modified) (6 diffs)
• set.c (modified) (1 diff)
• set.h (modified) (1 diff)
• tests/check_irc.c (modified) (1 diff)

account.c

@@ -182 +182 @@
         account_t *a, *l = NULL;
         
+        if( acc->ic )
+                /* Caller should have checked, accounts still in use can't be deleted. */
+                return;
+        
         for( a = irc->accounts; a; a = (l=a)->next )
                 if( a == acc )
                 {
-                        if( a->ic ) return; /* Caller should have checked, accounts still in use can't be deleted. */
-                        
                         if( l )
-                        {
                                 l->next = a->next;
-                        }
                         else
-                        {
                                 irc->accounts = a->next;
-                        }
                         
                         while( a->set )
@@ -203 +201 @@
                         g_free( a->user );
                         g_free( a->pass );
-                        if( a->server ) g_free( a->server );
+                        g_free( a->server );
                         if( a->reconnect )      /* This prevents any reconnect still queued to happen */
                                 cancel_auto_reconnect( a );

bitlbee.c

@@ -54 +54 @@
         ;
 
-        i = getaddrinfo( global.conf->iface, global.conf->port, &hints, &addrinfo_bind );
+        i = getaddrinfo( global.conf->iface_in, global.conf->port, &hints, &addrinfo_bind );
         if( i )
         {
                 log_message( LOGLVL_ERROR, "Couldn't parse address `%s': %s",
-                                           global.conf->iface, gai_strerror(i) );
+                                           global.conf->iface_in, gai_strerror(i) );
                 return -1;
         }
@@ -226 +226 @@
         if( st == size )
         {
-                g_free( irc->sendbuffer );
-                irc->sendbuffer = NULL;
-                irc->w_watch_source_id = 0;
-                
                 if( irc->status & USTATUS_SHUTDOWN )
+                {
                         irc_free( irc );
+                }
+                else
+                {
+                        g_free( irc->sendbuffer );
+                        irc->sendbuffer = NULL;
+                        irc->w_watch_source_id = 0;
+                }
                 
                 return FALSE;

bitlbee.conf

@@ -34 +34 @@
 # DaemonInterface = 0.0.0.0
 # DaemonPort = 6667
+
+## ClientInterface:
+##
+## If for any reason, you want BitlBee to use a specific address/interface
+## for outgoing traffic (IM connections, HTTP(S), etc.), set it here.
+##
+# ClientInterface = 0.0.0.0
 
 ## AuthMode

bitlbee.h

@@ -160 +160 @@
 gboolean bitlbee_shutdown( gpointer data, gint fd, b_input_condition cond );
 
+char *set_eval_root_nick( set_t *set, char *new_nick );
+
 extern global_t global;
 

conf.c

@@ -45 +45 @@
         conf = g_new0( conf_t, 1 );
         
-        conf->iface = NULL;
+        conf->iface_in = NULL;
+        conf->iface_out = NULL;
         conf->port = g_strdup( "6667" );
         conf->nofork = 0;
@@ -82 +83 @@
                 if( opt == 'i' )
                 {
-                        conf->iface = g_strdup( optarg );
+                        conf->iface_in = g_strdup( optarg );
                 }
                 else if( opt == 'p' )
@@ -202 +203 @@
                         else if( g_strcasecmp( ini->key, "daemoninterface" ) == 0 )
                         {
-                                g_free( conf->iface );
-                                conf->iface = g_strdup( ini->value );
+                                g_free( conf->iface_in );
+                                conf->iface_in = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "daemonport" ) == 0 )
@@ -209 +210 @@
                                 g_free( conf->port );
                                 conf->port = g_strdup( ini->value );
+                        }
+                        else if( g_strcasecmp( ini->key, "clientinterface" ) == 0 )
+                        {
+                                g_free( conf->iface_out );
+                                conf->iface_out = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "authmode" ) == 0 )

conf.h

@@ -32 +32 @@
 typedef struct conf
 {
-        char *iface;
+        char *iface_in, *iface_out;
         char *port;
         int nofork;

doc/CHANGES

@@ +1 @@
+Version 1.2.1:
+- Fixed proxy support.
+- Fixed stalling issues while connecting to Jabber when using the OpenSSL
+  module.
+- Fixed problem with GLib and ForkDaemon where processes didn't die when
+  the client disconnects.
+- Fixed handling of "set charset none". (Which pretty much breaks the account
+  completely in 1.2.)
+- You can now automatically identify yourself to BitlBee by setting a server
+  password in your IRC client.
+- Compatible with all crazy kinds of line endings that clients can send.
+
+Finished ...
+
 Version 1.2:
 - Added ForkDaemon mode next to the existing Daemon- and inetd modes. With

doc/user-guide/commands.xml

@@ -589 +589 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="root_nick" type="string" scope="global">
+                <default>root</default>
+
+                <description>
+                        <para>
+                                Normally the "bot" that takes all your BitlBee commands is called "root". If you don't like this name, you can rename it to anything else using the <emphasis>rename</emphasis> command, or by changing this setting.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="save_on_quit" type="boolean" scope="global">
                 <default>true</default>

irc.c

@@ -42 +42 @@
 }
 
+static char *set_eval_charset( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
+        GIConv ic, oc;
+
+        if( g_strcasecmp( value, "none" ) == 0 )
+                value = g_strdup( "utf-8" );
+
+        if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 )
+        {
+                return NULL;
+        }
+        if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 )
+        {
+                g_iconv_close( ic );
+                return NULL;
+        }
+        
+        if( irc->iconv != (GIConv) -1 )
+                g_iconv_close( irc->iconv );
+        if( irc->oconv != (GIConv) -1 )
+                g_iconv_close( irc->oconv );
+        
+        irc->iconv = ic;
+        irc->oconv = oc;
+
+        return value;
+}
+
 irc_t *irc_new( int fd )
 {
@@ -64 +93 @@
         irc->mynick = g_strdup( ROOT_NICK );
         irc->channel = g_strdup( ROOT_CHAN );
+        
+        irc->iconv = (GIConv) -1;
+        irc->oconv = (GIConv) -1;
         
         if( global.conf->hostname )
@@ -119 +151 @@
         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 );
@@ -127 +160 @@
         conf_loaddefaults( irc );
         
+        /* Evaluator sets the iconv/oconv structures. */
+        set_eval_charset( set_find( &irc->set, "charset" ), set_getstr( &irc->set, "charset" ) );
+        
         return( irc );
 }
@@ -164 +200 @@
         if( irc->sendbuffer && !immed )
         {
-                /* We won't read from this socket anymore. Instead, we'll connect a timer
-                   to it that should shut down the connection in a second, just in case
-                   bitlbee_.._write doesn't do it first. */
+                /* Set up a timeout event that should shut down the connection
+                   in a second, just in case ..._write doesn't do it first. */
                 
                 b_event_remove( irc->r_watch_source_id );
-                irc->r_watch_source_id = b_timeout_add( 1000, (b_event_handler) irc_free, irc );
+                irc->r_watch_source_id = 0;
+                
+                b_event_remove( irc->ping_source_id );
+                irc->ping_source_id = b_timeout_add( 1000, (b_event_handler) irc_free, irc );
         }
         else
@@ -185 +223 @@
 
 /* Because we have no garbage collection, this is quite annoying */
-void irc_free(irc_t * irc)
-{
-        account_t *account;
+void irc_free( irc_t * irc )
+{
         user_t *user, *usertmp;
         
@@ -196 +233 @@
                         irc_usermsg( irc, "Error while saving settings!" );
         
-        closesocket( irc->fd );
-        
-        if( irc->ping_source_id > 0 )
-                b_event_remove( irc->ping_source_id );
-        b_event_remove( irc->r_watch_source_id );
-        if( irc->w_watch_source_id > 0 )
-                b_event_remove( irc->w_watch_source_id );
-        
         irc_connection_list = g_slist_remove( irc_connection_list, irc );
         
-        for (account = irc->accounts; account; account = account->next) {
-                if (account->ic) {
-                        imc_logout(account->ic, TRUE);
-                } else if (account->reconnect) {
-                        cancel_auto_reconnect(account);
-                }
-        }
-        
-        g_free(irc->sendbuffer);
-        g_free(irc->readbuffer);
-        
-        g_free(irc->nick);
-        g_free(irc->user);
-        g_free(irc->host);
-        g_free(irc->realname);
-        g_free(irc->password);
-        
-        g_free(irc->myhost);
-        g_free(irc->mynick);
-        
-        g_free(irc->channel);
-        
-        while (irc->queries != NULL)
-                query_del(irc, irc->queries);
-        
-        while (irc->accounts)
-                if (irc->accounts->ic == NULL)
-                        account_del(irc, irc->accounts);
+        while( irc->accounts )
+        {
+                if( irc->accounts->ic )
+                        imc_logout( irc->accounts->ic, FALSE );
+                else if( irc->accounts->reconnect )
+                        cancel_auto_reconnect( irc->accounts );
+                
+                if( irc->accounts->ic == NULL )
+                        account_del( irc, irc->accounts );
                 else
                         /* Nasty hack, but account_del() doesn't work in this
                            case and we don't want infinite loops, do we? ;-) */
                         irc->accounts = irc->accounts->next;
-        
-        while (irc->set)
-                set_del(&irc->set, irc->set->key);
-        
-        if (irc->users != NULL) {
+        }
+        
+        while( irc->queries != NULL )
+                query_del( irc, irc->queries );
+        
+        while( irc->set )
+                set_del( &irc->set, irc->set->key );
+        
+        if (irc->users != NULL)
+        {
                 user = irc->users;
-                while (user != NULL) {
-                        g_free(user->nick);
-                        g_free(user->away);
-                        g_free(user->handle);
-                        if(user->user!=user->nick) g_free(user->user);
-                        if(user->host!=user->nick) g_free(user->host);
-                        if(user->realname!=user->nick) g_free(user->realname);
-                        b_event_remove(user->sendbuf_timer);
+                while( user != NULL )
+                {
+                        g_free( user->nick );
+                        g_free( user->away );
+                        g_free( user->handle );
+                        if( user->user != user->nick ) g_free( user->user );
+                        if( user->host != user->nick ) g_free( user->host );
+                        if( user->realname != user->nick ) g_free( user->realname );
+                        b_event_remove( user->sendbuf_timer );
                                         
                         usertmp = user;
                         user = user->next;
-                        g_free(usertmp);
-                }
-        }
-        
-        g_hash_table_foreach_remove(irc->userhash, irc_free_hashkey, NULL);
-        g_hash_table_destroy(irc->userhash);
-        
-        g_hash_table_foreach_remove(irc->watches, irc_free_hashkey, NULL);
-        g_hash_table_destroy(irc->watches);
-        
-        g_free(irc);
+                        g_free( usertmp );
+                }
+        }
+        
+        if( irc->ping_source_id > 0 )
+                b_event_remove( irc->ping_source_id );
+        if( irc->r_watch_source_id > 0 )
+                b_event_remove( irc->r_watch_source_id );
+        if( irc->w_watch_source_id > 0 )
+                b_event_remove( irc->w_watch_source_id );
+        
+        closesocket( irc->fd );
+        irc->fd = -1;
+        
+        g_hash_table_foreach_remove( irc->userhash, irc_free_hashkey, NULL );
+        g_hash_table_destroy( irc->userhash );
+        
+        g_hash_table_foreach_remove( irc->watches, irc_free_hashkey, NULL );
+        g_hash_table_destroy( irc->watches );
+        
+        if( irc->iconv != (GIConv) -1 )
+                g_iconv_close( irc->iconv );
+        if( irc->oconv != (GIConv) -1 )
+                g_iconv_close( irc->oconv );
+        
+        g_free( irc->sendbuffer );
+        g_free( irc->readbuffer );
+        
+        g_free( irc->nick );
+        g_free( irc->user );
+        g_free( irc->host );
+        g_free( irc->realname );
+        g_free( irc->password );
+        
+        g_free( irc->myhost );
+        g_free( irc->mynick );
+        
+        g_free( irc->channel );
+        
+        g_free( irc->last_target );
+        
+        g_free( irc );
         
         if( global.conf->runmode == RUNMODE_INETD || global.conf->runmode == RUNMODE_FORKDAEMON )
@@ -286 +333 @@
 void irc_process( irc_t *irc )
 {
-        char **lines, *temp, **cmd, *cs;
+        char **lines, *temp, **cmd;
         int i;
 
@@ -295 +342 @@
                 for( i = 0; *lines[i] != '\0'; i ++ )
                 {
-                        char conv[IRC_MAX_LINE+1];
+                        char *conv = NULL;
                         
-                        /* [WvG] Because irc_tokenize splits at every newline, the lines[] list
-                            should end with an empty string. This is why this actually works.
-                            Took me a while to figure out, Maurits. :-P */
+                        /* [WvG] If the last line isn't empty, it's an incomplete line and we
+                           should wait for the rest to come in before processing it. */
                         if( lines[i+1] == NULL )
                         {
@@ -309 +355 @@
                         }
                         
-                        if( ( cs = set_getstr( &irc->set, "charset" ) ) && g_strcasecmp( cs, "none" ) != 0 )
-                        {
-                                conv[IRC_MAX_LINE] = 0;
-                                if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) == -1 )
+                        if( irc->iconv != (GIConv) -1 )
+                        {
+                                gsize bytes_read, bytes_written;
+                                
+                                conv = g_convert_with_iconv( lines[i], -1, irc->iconv,
+                                                             &bytes_read, &bytes_written, NULL );
+                                
+                                if( conv == NULL || bytes_read != strlen( lines[i] ) )
                                 {
                                         /* GLib can do strange things if things are not in the expected charset,
@@ -324 +374 @@
                                                                   "expect by changing the charset setting. See "
                                                                   "`help set charset' for more information. Your "
-                                                                  "message was ignored.", cs );
-                                                *conv = 0;
+                                                                  "message was ignored.",
+                                                                  set_getstr( &irc->set, "charset" ) );
+                                                
+                                                g_free( conv );
+                                                conv = NULL;
                                         }
                                         else
@@ -332 +385 @@
                                                            "Warning: invalid characters received at login time." );
                                                 
-                                                strncpy( conv, lines[i], IRC_MAX_LINE );
+                                                conv = g_strdup( lines[i] );
                                                 for( temp = conv; *temp; temp ++ )
                                                         if( *temp & 0x80 )
@@ -341 +394 @@
                         }
                         
-                        if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
-                                continue;
-                        irc_exec( irc, cmd );
+                        if( lines[i] )
+                        {
+                                if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
+                                        continue;
+                                irc_exec( irc, cmd );
+                                g_free( cmd );
+                        }
                         
-                        g_free( cmd );
+                        g_free( conv );
                         
                         /* Shouldn't really happen, but just in case... */
@@ -369 +426 @@
 char **irc_tokenize( char *buffer )
 {
-        int i, j;
+        int i, j, n = 3;
         char **lines;
 
-        /* Count the number of elements we're gonna need. */
-        for( i = 0, j = 1; buffer[i] != '\0'; i ++ )
-        {
-                if( buffer[i] == '\n' )
-                        if( buffer[i+1] != '\r' && buffer[i+1] != '\n' )
-                                j ++;
-        }
-        
-        /* Allocate j+1 elements. */
-        lines = g_new( char *, j + 1 );
+        /* Allocate n+1 elements. */
+        lines = g_new( char *, n + 1 );
+        
+        lines[0] = buffer;
+        
+        /* Split the buffer in several strings, and accept any kind of line endings,
+         * knowing that ERC on Windows may send something interesting like \r\r\n,
+         * and surely there must be clients that think just \n is enough... */
+        for( i = 0, j = 0; buffer[i] != '\0'; i ++ )
+        {
+                if( buffer[i] == '\r' || buffer[i] == '\n' )
+                {
+                        while( buffer[i] == '\r' || buffer[i] == '\n' )
+                                buffer[i++] = '\0';
+                        
+                        lines[++j] = buffer + i;
+                        
+                        if( j >= n )
+                        {
+                                n *= 2;
+                                lines = g_renew( char *, lines, n + 1 );
+                        }
+
+                        if( buffer[i] == '\0' )
+                                break;
+                }
+        }
         
         /* NULL terminate our list. */ 
-        lines[j] = NULL;
-        
-        lines[0] = buffer;
-        
-        /* Split the buffer in several strings, using \r\n as our seperator, where \r is optional.
-         * Although this is not in the RFC, some braindead ircds (newnet's) use this, so some clients might too. 
-         */
-        for( i = 0, j = 0; buffer[i] != '\0'; i ++)
-        {
-                if( buffer[i] == '\n' )
-                {
-                        buffer[i] = '\0';
-                        
-                        if( i > 0 && buffer[i-1] == '\r' )
-                                buffer[i-1] = '\0';
-                        if( buffer[i+1] != '\r' && buffer[i+1] != '\n' )
-                                lines[++j] = buffer + i + 1;
-                }
-        }
-        
-        return( lines );
+        lines[++j] = NULL;
+        
+        return lines;
 }
 
@@ -538 +594 @@
 
         return;
-
 }
 
@@ -544 +599 @@
 {
         int size;
-        char line[IRC_MAX_LINE+1], *cs;
+        char line[IRC_MAX_LINE+1];
                 
         /* Don't try to write anything new anymore when shutting down. */
@@ -550 +605 @@
                 return;
         
-        line[IRC_MAX_LINE] = 0;
+        memset( line, 0, sizeof( line ) );
         g_vsnprintf( line, IRC_MAX_LINE - 2, format, params );
-        
         strip_newlines( line );
-        if( ( cs = set_getstr( &irc->set, "charset" ) ) &&
-            g_strcasecmp( cs, "none" ) != 0 && g_strcasecmp( cs, "utf-8" ) != 0 )
-        {
-                char conv[IRC_MAX_LINE+1];
-                
-                conv[IRC_MAX_LINE] = 0;
-                if( do_iconv( "UTF-8", cs, line, conv, 0, IRC_MAX_LINE - 2 ) != -1 )
-                        strcpy( line, conv );
-        }
-        strcat( line, "\r\n" );
+        
+        if( irc->oconv != (GIConv) -1 )
+        {
+                gsize bytes_read, bytes_written;
+                char *conv;
+                
+                conv = g_convert_with_iconv( line, -1, irc->oconv,
+                                             &bytes_read, &bytes_written, NULL );
+
+                if( bytes_read == strlen( line ) )
+                        strncpy( line, conv, IRC_MAX_LINE - 2 );
+                
+                g_free( conv );
+        }
+        g_strlcat( line, "\r\n", IRC_MAX_LINE + 1 );
         
         if( irc->sendbuffer != NULL )
@@ -736 +795 @@
         irc_spawn( irc, u );
         
-        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the \x02help\x02 command. Lots of FAQs are answered there." );
+        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\n"
+                          "If you've never used BitlBee before, please do read the help "
+                          "information using the \x02help\x02 command. Lots of FAQs are "
+                          "answered there.\n"
+                          "If you already have an account on this server, just use the "
+                          "\x02identify\x02 command to identify yourself." );
         
         if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )
@@ -742 +806 @@
         
         irc->status |= USTATUS_LOGGED_IN;
+        
+        /* This is for bug #209 (use PASS to identify to NickServ). */
+        if( irc->password != NULL )
+        {
+                char *send_cmd[] = { "identify", g_strdup( irc->password ), NULL };
+                
+                irc_setpass( irc, NULL );
+                root_command( irc, send_cmd );
+                g_free( send_cmd[1] );
+        }
 }
 

irc.h

@@ -61 +61 @@
         char *sendbuffer;
         char *readbuffer;
+        GIConv iconv, oconv;
 
         int sentbytes;
@@ -69 +70 @@
         char *host;
         char *realname;
-        char *password;
+        char *password; /* HACK: Used to save the user's password, but before
+                           logging in, this may contain a password we should
+                           send to identify after USER/NICK are received. */
 
         char umode[8];

irc_commands.c

@@ -30 +30 @@
 static void irc_cmd_pass( irc_t *irc, char **cmd )
 {
-        if( global.conf->auth_pass &&
+        if( irc->status & USTATUS_LOGGED_IN )
+        {
+                char *send_cmd[] = { "identify", cmd[1], NULL };
+                
+                /* We're already logged in, this client seems to send the PASS
+                   command last. (Possibly it won't send it at all if it turns
+                   out we don't require it, which will break this feature.)
+                   Try to identify using the given password. */
+                return root_command( irc, send_cmd );
+        }
+        /* Handling in pre-logged-in state, first see if this server is
+           password-protected: */
+        else if( global.conf->auth_pass &&
             ( strncmp( global.conf->auth_pass, "md5:", 4 ) == 0 ?
                 md5_verify_password( cmd[1], global.conf->auth_pass + 4 ) == 0 :
@@ -38 +50 @@
                 irc_check_login( irc );
         }
-        else
+        else if( global.conf->auth_pass )
         {
                 irc_reply( irc, 464, ":Incorrect password" );
+        }
+        else
+        {
+                /* Remember the password and try to identify after USER/NICK. */
+                irc_setpass( irc, cmd[1] );
+                irc_check_login( irc );
         }
 }
@@ -260 +278 @@
                         if( cmd[1] != irc->last_target )
                         {
-                                if( irc->last_target )
-                                        g_free( irc->last_target );
+                                g_free( irc->last_target );
                                 irc->last_target = g_strdup( cmd[1] );
                         }
@@ -581 +598 @@
 
 static const command_t irc_commands[] = {
-        { "pass",        1, irc_cmd_pass,        IRC_CMD_PRE_LOGIN },
+        { "pass",        1, irc_cmd_pass,        0 },
         { "user",        4, irc_cmd_user,        IRC_CMD_PRE_LOGIN },
         { "nick",        1, irc_cmd_nick,        0 },

lib/arc.h

@@ -31 +31 @@
 };
 
+#ifndef G_GNUC_MALLOC
+#define G_GNUC_MALLOC
+#endif
+
 G_GNUC_MALLOC struct arc_state *arc_keymaker( unsigned char *key, int kl, int cycles );
 unsigned char arc_getbyte( struct arc_state *st );

lib/proxy.c

@@ -114 +114 @@
 {
         struct sockaddr_in *sin;
+        struct sockaddr_in me;
         int fd = -1;
 
@@ -127 +128 @@
 
         sock_make_nonblocking(fd);
+        
+        if( global.conf->iface_out )
+        {
+                me.sin_family = AF_INET;
+                me.sin_port = 0;
+                me.sin_addr.s_addr = inet_addr( global.conf->iface_out );
+                
+                if( bind( fd, (struct sockaddr *) &me, sizeof( me ) ) != 0 )
+                        event_debug( "bind( %d, \"%s\" ) failure\n", fd, global.conf->iface_out );
+        }
         
         event_debug("proxy_connect_none( \"%s\", %d ) = %d\n", host, port, fd);

protocols/jabber/jabber_util.c

@@ -246 +246 @@
 };
 
-static void jabber_buddy_ask_yes( gpointer w, struct jabber_buddy_ask_data *bla )
-{
+static void jabber_buddy_ask_yes( void *data )
+{
+        struct jabber_buddy_ask_data *bla = data;
+        
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         
@@ -257 +259 @@
 }
 
-static void jabber_buddy_ask_no( gpointer w, struct jabber_buddy_ask_data *bla )
-{
+static void jabber_buddy_ask_no( void *data )
+{
+        struct jabber_buddy_ask_data *bla = data;
+        
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         

protocols/msn/msn.h

@@ -29 +29 @@
 #define GROUPCHAT_SWITCHBOARD_MESSAGE "\r\r\rME WANT TALK TO MANY PEOPLE\r\r\r"
 
-#ifdef DEBUG
+#ifdef DEBUG_MSN
 #define debug( text... ) imcb_log( ic, text );
 #else

protocols/msn/msn_util.c

@@ -90 +90 @@
 };
 
-static void msn_buddy_ask_yes( gpointer w, struct msn_buddy_ask_data *bla )
-{
+static void msn_buddy_ask_yes( void *data )
+{
+        struct msn_buddy_ask_data *bla = data;
+        
         msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname );
         
@@ -102 +104 @@
 }
 
-static void msn_buddy_ask_no( gpointer w, struct msn_buddy_ask_data *bla )
-{
+static void msn_buddy_ask_no( void *data )
+{
+        struct msn_buddy_ask_data *bla = data;
+        
         msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname );
         

protocols/msn/ns.c

@@ -178 +178 @@
                         
                         debug( "Connecting to a new switchboard with key %s", cmd[5] );
-                        sb = msn_sb_create( ic, server, port, cmd[5], MSN_SB_NEW );
+
+                        if( ( sb = msn_sb_create( ic, server, port, cmd[5], MSN_SB_NEW ) ) == NULL )
+                        {
+                                /* Although this isn't strictly fatal for the NS connection, it's
+                                   definitely something serious (we ran out of file descriptors?). */
+                                imcb_error( ic, "Could not create new switchboard" );
+                                imc_logout( ic, TRUE );
+                                return( 0 );
+                        }
                         
                         if( md->msgq )
@@ -468 +476 @@
                 debug( "Got a call from %s (session %d). Key = %s", cmd[5], session, cmd[4] );
                 
-                sb = msn_sb_create( ic, server, port, cmd[4], session );
-                sb->who = g_strdup( cmd[5] );
+                if( ( sb = msn_sb_create( ic, server, port, cmd[4], session ) ) == NULL )
+                {
+                        /* Although this isn't strictly fatal for the NS connection, it's
+                           definitely something serious (we ran out of file descriptors?). */
+                        imcb_error( ic, "Could not create new switchboard" );
+                        imc_logout( ic, TRUE );
+                        return( 0 );
+                }
+                else
+                {
+                        sb->who = g_strdup( cmd[5] );
+                }
         }
         else if( strcmp( cmd[0], "ADD" ) == 0 )

protocols/nogaim.c

@@ -343 +343 @@
 /* dialogs.c */
 
-void imcb_ask( struct im_connection *ic, char *msg, void *data, void *doit, void *dont )
+void imcb_ask( struct im_connection *ic, char *msg, void *data,
+               query_callback doit, query_callback dont )
 {
         query_add( ic->irc, ic, msg, doit, dont, data );
@@ -495 +496 @@
 };
 
-void show_got_added_no( gpointer w, struct show_got_added_data *data )
-{
-        g_free( data->handle );
+void show_got_added_no( void *data )
+{
+        g_free( ((struct show_got_added_data*)data)->handle );
         g_free( data );
 }
 
-void show_got_added_yes( gpointer w, struct show_got_added_data *data )
-{
-        data->ic->acc->prpl->add_buddy( data->ic, data->handle, NULL );
-        /* imcb_add_buddy( data->ic, NULL, data->handle, data->handle ); */
-        
-        return show_got_added_no( w, data );
+void show_got_added_yes( void *data )
+{
+        struct show_got_added_data *sga = data;
+        
+        sga->ic->acc->prpl->add_buddy( sga->ic, sga->handle, NULL );
+        /* imcb_add_buddy( sga->ic, NULL, sga->handle, sga->handle ); */
+        
+        return show_got_added_no( data );
 }
 

protocols/nogaim.h

@@ -42 +42 @@
 #include "account.h"
 #include "proxy.h"
+#include "query.h"
 #include "md5.h"
 
@@ -261 +262 @@
  * - 'doit' or 'dont' will be called depending of the answer of the user.
  */
-G_MODULE_EXPORT void imcb_ask( struct im_connection *ic, char *msg, void *data, void *doit, void *dont );
+G_MODULE_EXPORT void imcb_ask( struct im_connection *ic, char *msg, void *data, query_callback doit, query_callback dont );
 G_MODULE_EXPORT void imcb_ask_add( struct im_connection *ic, char *handle, const char *realname );
 

protocols/oscar/oscar.c

@@ -1084 +1084 @@
 }
 
-void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv);
-void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv);
+void oscar_accept_chat(void *data);
+void oscar_reject_chat(void *data);
         
 static int incomingim_chan2(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args) {
@@ -1119 +1119 @@
 }
 
-static void gaim_icq_authgrant(gpointer w, struct icq_auth *data) {
+static void gaim_icq_authgrant(void *data_) {
+        struct icq_auth *data = data_;
         char *uin, message;
         struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
@@ -1134 +1135 @@
 }
 
-static void gaim_icq_authdeny(gpointer w, struct icq_auth *data) {
+static void gaim_icq_authdeny(void *data_) {
+        struct icq_auth *data = data_;
         char *uin, *message;
         struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
@@ -2588 +2590 @@
 }
 
-void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv)
+void oscar_accept_chat(void *data)
 {
+        struct aim_chat_invitation * inv = data;
+        
         oscar_chat_join(inv->ic, inv->name, NULL, NULL);
         g_free(inv->name);
@@ -2595 +2599 @@
 }
 
-void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv)
+void oscar_reject_chat(void *data)
 {
+        struct aim_chat_invitation * inv = data;
+        
         g_free(inv->name);
         g_free(inv);

protocols/yahoo/yahoo.c

@@ -797 +797 @@
 }
 
-static void byahoo_accept_conf( gpointer w, struct byahoo_conf_invitation *inv )
-{
+static void byahoo_accept_conf( void *data )
+{
+        struct byahoo_conf_invitation *inv = data;
+        
         yahoo_conference_logon( inv->yid, NULL, inv->members, inv->name );
         imcb_chat_add_buddy( inv->c, inv->ic->acc->user );
@@ -805 +807 @@
 }
 
-static void byahoo_reject_conf( gpointer w, struct byahoo_conf_invitation *inv )
-{
+static void byahoo_reject_conf( void *data )
+{
+        struct byahoo_conf_invitation *inv = data;
+        
         yahoo_conference_decline( inv->yid, NULL, inv->members, inv->name, "User rejected groupchat" );
         imcb_chat_free( inv->c );

query.c

@@ -30 +30 @@
 static query_t *query_default( irc_t *irc );
 
-query_t *query_add( irc_t *irc, struct im_connection *ic, char *question, void *yes, void *no, void *data )
+query_t *query_add( irc_t *irc, struct im_connection *ic, char *question,
+                    query_callback yes, query_callback no, void *data )
 {
         query_t *q = g_new0( query_t, 1 );
@@ -144 +145 @@
                 else
                         irc_usermsg( irc, "Accepted: %s", q->question );
-                q->yes( NULL, q->data );
+                q->yes( q->data );
         }
         else
@@ -152 +153 @@
                 else
                         irc_usermsg( irc, "Rejected: %s", q->question );
-                q->no( NULL, q->data );
+                q->no( q->data );
         }
         q->data = NULL;

query.h

@@ -27 +27 @@
 #define _QUERY_H
 
+typedef void (*query_callback) ( void *data );
+
 typedef struct query
 {
         struct im_connection *ic;
         char *question;
-        void (* yes) ( gpointer w, void *data );
-        void (* no) ( gpointer w, void *data );
+        query_callback yes, no;
         void *data;
         struct query *next;
 } query_t;
 
-query_t *query_add( irc_t *irc, struct im_connection *ic, char *question, void *yes, void *no, void *data );
+query_t *query_add( irc_t *irc, struct im_connection *ic, char *question,
+                    query_callback yes, query_callback no, void *data );
 void query_del( irc_t *irc, query_t *q );
 void query_del_by_conn( irc_t *irc, struct im_connection *ic );

root_commands.c

@@ -204 +204 @@
 }
 
-void cmd_account_del_yes( gpointer w, void *data )
-{
-        account_t *a = data;
-        irc_t *irc = a->irc;
-        
-        if( a->ic )
-        {
-                irc_usermsg( irc, "Account is still logged in, can't delete" );
-        }
-        else
-        {
-                account_del( irc, a );
-                irc_usermsg( irc, "Account deleted" );
-        }
-}
-
-void cmd_account_del_no( gpointer w, void *data )
-{
+struct cmd_account_del_data
+{
+        account_t *a;
+        irc_t *irc;
+};
+
+void cmd_account_del_yes( void *data )
+{
+        struct cmd_account_del_data *cad = data;
+        account_t *a;
+        
+        for( a = cad->irc->accounts; a && a != cad->a; a = a->next );
+        
+        if( a == NULL )
+        {
+                irc_usermsg( cad->irc, "Account already deleted" );
+        }
+        else if( a->ic )
+        {
+                irc_usermsg( cad->irc, "Account is still logged in, can't delete" );
+        }
+        else
+        {
+                account_del( cad->irc, a );
+                irc_usermsg( cad->irc, "Account deleted" );
+        }
+        g_free( data );
+}
+
+void cmd_account_del_no( void *data )
+{
+        g_free( data );
 }
 
@@ -278 +292 @@
                 else
                 {
+                        struct cmd_account_del_data *cad;
                         char *msg;
+                        
+                        cad = g_malloc( sizeof( struct cmd_account_del_data ) );
+                        cad->a = a;
+                        cad->irc = irc;
                         
                         msg = g_strdup_printf( "If you remove this account (%s(%s)), BitlBee will "
@@ -285 +304 @@
                                                "set' command. Are you sure you want to delete this "
                                                "account?", a->prpl->name, a->user );
-                        query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, a );
+                        query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, cad );
                         g_free( msg );
                 }
@@ -404 +423 @@
                         acc_handle = g_strdup( cmd[2] );
                 
+                if( !acc_handle )
+                {
+                        irc_usermsg( irc, "Not enough parameters given (need %d)", 3 );
+                        return;
+                }
+                
                 if( ( tmp = strchr( acc_handle, '/' ) ) )
                 {
@@ -584 +609 @@
                         g_free( irc->mynick );
                         irc->mynick = g_strdup( cmd[2] );
+                        
+                        if( strcmp( cmd[0], "set_rename" ) != 0 )
+                                set_setstr( &irc->set, "root_nick", cmd[2] );
                 }
                 else if( u->send_handler == buddy_send_handler )
@@ -592 +620 @@
                 irc_usermsg( irc, "Nick successfully changed" );
         }
+}
+
+char *set_eval_root_nick( set_t *set, char *new_nick )
+{
+        irc_t *irc = set->data;
+        
+        if( strcmp( irc->mynick, new_nick ) != 0 )
+        {
+                char *cmd[] = { "set_rename", irc->mynick, new_nick, NULL };
+                
+                cmd_rename( irc, cmd );
+        }
+        
+        return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : NULL;
 }
 

set.c

@@ -230 +230 @@
         return value;
 }
-
-char *set_eval_charset( set_t *set, char *value )
-{
-        GIConv cd;
-
-        if( g_strcasecmp( value, "none" ) == 0 )
-                return value;
-
-        cd = g_iconv_open( "UTF-8", value );
-        if( cd == (GIConv) -1 )
-                return NULL;
-
-        g_iconv_close( cd );
-        return value;
-}

set.h

@@ -97 +97 @@
 char *set_eval_to_char( set_t *set, char *value );
 char *set_eval_ops( set_t *set, char *value );
-char *set_eval_charset( set_t *set, char *value );
 
 #endif /* __SET_H__ */

tests/check_irc.c

@@ -37 +37 @@
         irc = irc_new(g_io_channel_unix_get_fd(ch1));
 
-        fail_unless(g_io_channel_write_chars(ch2, "NICK bla\r\n"
-                        "USER a a a a\r\n", -1, NULL, NULL) == G_IO_STATUS_NORMAL);
+        fail_unless(g_io_channel_write_chars(ch2, "NICK bla\r\r\n"
+                        "USER a a a a\n", -1, NULL, NULL) == G_IO_STATUS_NORMAL);
         fail_unless(g_io_channel_flush(ch2, NULL) == G_IO_STATUS_NORMAL);