Changes in / [a87e6ba:3ab1d31]

Files:

• Makefile (modified) (1 diff)
• account.c (added)
• account.h (added)
• bitlbee.h (modified) (2 diffs)
• chat.c (added)
• chat.h (added)
• conf.c (modified) (1 diff)
• dcc.c (modified) (12 diffs)
• dcc.h (modified) (1 diff)
• ipc.c (modified) (5 diffs)
• irc.c (modified) (26 diffs)
• irc.h (modified) (6 diffs)
• irc_channel.c (deleted)
• irc_commands.c (modified) (19 diffs)
• irc_im.c (deleted)
• irc_send.c (deleted)
• irc_user.c (deleted)
• nick.c (modified) (3 diffs)
• protocols/Makefile (modified) (1 diff)
• protocols/account.c (deleted)
• protocols/account.h (deleted)
• protocols/bee.c (deleted)
• protocols/bee.h (deleted)
• protocols/bee_ft.c (deleted)
• protocols/bee_user.c (deleted)
• protocols/chat.c (deleted)
• protocols/chat.h (deleted)
• protocols/ft.h (modified) (1 diff)
• protocols/jabber/iq.c (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/jabber_util.c (modified) (3 diffs)
• protocols/jabber/s5bytestream.c (modified) (7 diffs)
• protocols/jabber/si.c (modified) (3 diffs)
• protocols/msn/Makefile (modified) (1 diff)
• protocols/msn/msn.c (modified) (2 diffs)
• protocols/msn/msn_util.c (modified) (1 diff)
• protocols/msn/sb.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (45 diffs)
• protocols/nogaim.h (modified) (4 diffs)
• protocols/oscar/oscar.c (modified) (4 diffs)
• root_commands.c (modified) (25 diffs)
• set.c (modified) (2 diffs)
• storage_xml.c (modified) (8 diffs)
• user.c (added)
• user.h (added)

Makefile

@@ -10 +10 @@
 
 # Program variables
-#objects = bitlbee.o chat.o dcc.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS)
-objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o nick.o root_commands.o set.o storage.o $(STORAGE_OBJS)
+objects = account.o bitlbee.o chat.o dcc.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
 headers = account.h bitlbee.h commands.h conf.h config.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/ftutil.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/ft.h protocols/nogaim.h
 subdirs = lib protocols

bitlbee.h

@@ -124 +124 @@
 #define CONF_FILE_DEF ETCDIR "bitlbee.conf"
 
-#include "bee.h"
 #include "irc.h"
 #include "storage.h"
@@ -159 +158 @@
 gboolean bitlbee_io_current_client_write( gpointer data, gint source, b_input_condition cond );
 
-void root_command_string( irc_t *irc, char *command );
+void root_command_string( irc_t *irc, user_t *u, char *command, int flags );
 void root_command( irc_t *irc, char *command[] );
 gboolean bitlbee_shutdown( gpointer data, gint fd, b_input_condition cond );

conf.c

@@ -369 +369 @@
                 if( g_strcasecmp( ini->section, "defaults" ) == 0 )
                 {
-                        set_t *s = set_find( &irc->b->set, ini->key );
+                        set_t *s = set_find( &irc->set, ini->key );
                         
                         if( s )

dcc.c

@@ -61 +61 @@
 unsigned int receivedchunks=0, receiveddata=0;
 
-void dcc_finish( file_transfer_t *file );
-void dcc_close( file_transfer_t *file );
+static void dcc_finish( file_transfer_t *file );
+static void dcc_close( file_transfer_t *file );
 gboolean dccs_send_proto( gpointer data, gint fd, b_input_condition cond );
-int dccs_send_request( struct dcc_file_transfer *df, irc_user_t *iu, struct sockaddr_storage *saddr );
+int dccs_send_request( struct dcc_file_transfer *df, char *user_nick, struct sockaddr_storage *saddr );
+gboolean dccs_recv_start( file_transfer_t *ft );
 gboolean dccs_recv_proto( gpointer data, gint fd, b_input_condition cond);
 gboolean dccs_recv_write_request( file_transfer_t *ft );
@@ -70 +71 @@
 gboolean dcc_abort( dcc_file_transfer_t *df, char *reason, ... );
 
-dcc_file_transfer_t *dcc_alloc_transfer( const char *file_name, size_t file_size, struct im_connection *ic )
+/* As defined in ft.h */
+file_transfer_t *imcb_file_send_start( struct im_connection *ic, char *handle, char *file_name, size_t file_size )
+{
+        user_t *u = user_findhandle( ic, handle );
+        /* one could handle this more intelligent like imcb_buddy_msg.
+         * can't call it directly though cause it does some wrapping.
+         * Maybe give imcb_buddy_msg a parameter NO_WRAPPING? */
+        if (!u) return NULL;
+
+        return dccs_send_start( ic, u->nick, file_name, file_size );
+};
+
+/* As defined in ft.h */
+void imcb_file_canceled( file_transfer_t *file, char *reason )
+{
+        if( file->canceled )
+                file->canceled( file, reason );
+
+        dcc_close( file );
+}
+
+/* As defined in ft.h */
+gboolean imcb_file_recv_start( file_transfer_t *ft )
+{
+        return dccs_recv_start( ft );
+}
+
+/* As defined in ft.h */
+void imcb_file_finished( file_transfer_t *file )
+{
+        dcc_file_transfer_t *df = file->priv;
+
+        if( file->bytes_transferred >= file->file_size )
+                dcc_finish( file );
+        else
+                df->proto_finished = TRUE;
+}
+
+dcc_file_transfer_t *dcc_alloc_transfer( char *file_name, size_t file_size, struct im_connection *ic )
 {
         file_transfer_t *file = g_new0( file_transfer_t, 1 );
@@ -85 +124 @@
 
 /* This is where the sending magic starts... */
-file_transfer_t *dccs_send_start( struct im_connection *ic, irc_user_t *iu, const char *file_name, size_t file_size )
+file_transfer_t *dccs_send_start( struct im_connection *ic, char *user_nick, char *file_name, size_t file_size )
 {
         file_transfer_t *file;
         dcc_file_transfer_t *df;
-        irc_t *irc = (irc_t *) ic->bee->ui_data;
         struct sockaddr_storage saddr;
         char *errmsg;
@@ -112 +150 @@
         file->status = FT_STATUS_LISTENING;
 
-        if( !dccs_send_request( df, iu, &saddr ) )
+        if( !dccs_send_request( df, user_nick, &saddr ) )
                 return NULL;
 
@@ -118 +156 @@
         df->watch_in = b_input_add( df->fd, GAIM_INPUT_READ, dccs_send_proto, df );
 
-        irc->file_transfers = g_slist_prepend( irc->file_transfers, file );
+        df->ic->irc->file_transfers = g_slist_prepend( df->ic->irc->file_transfers, file );
 
         df->progress_timeout = b_timeout_add( DCC_MAX_STALL * 1000, dcc_progress, df );
@@ -125 +163 @@
                       "Accept the file transfer if you'd like the file. If you don't, "
                       "issue the 'transfers reject' command.",
-                      iu->nick, file_name, file_size / 1024 );
+                      user_nick, file_name, file_size / 1024 );
 
         return file;
@@ -178 +216 @@
 
 /* Creates the "DCC SEND" line and sends it to the server */
-int dccs_send_request( struct dcc_file_transfer *df, irc_user_t *iu, struct sockaddr_storage *saddr )
+int dccs_send_request( struct dcc_file_transfer *df, char *user_nick, struct sockaddr_storage *saddr )
 {
         char ipaddr[INET6_ADDRSTRLEN]; 
@@ -212 +250 @@
                                 df->ft->file_name, ipaddr, port, df->ft->file_size );
         
-        irc_send_msg_raw( iu, "PRIVMSG", iu->irc->user->nick, cmd );
+        if ( !irc_msgfrom( df->ic->irc, user_nick, cmd ) )
+                return dcc_abort( df, "Couldn't send `DCC SEND' message to %s.", user_nick );
 
         g_free( cmd );
@@ -457 +496 @@
  * Cleans up after a transfer.
  */
-void dcc_close( file_transfer_t *file )
+static void dcc_close( file_transfer_t *file )
 {
         dcc_file_transfer_t *df = file->priv;
-        irc_t *irc = (irc_t *) df->ic->bee->ui_data;
 
         if( file->free )
@@ -476 +514 @@
                 b_event_remove( df->progress_timeout );
         
-        irc->file_transfers = g_slist_remove( irc->file_transfers, file );
+        df->ic->irc->file_transfers = g_slist_remove( df->ic->irc->file_transfers, file );
         
         g_free( df );
@@ -506 +544 @@
 file_transfer_t *dcc_request( struct im_connection *ic, char *line )
 {
-        irc_t *irc = (irc_t *) ic->bee->ui_data;
         char *pattern = "SEND"
                 " (([^\"][^ ]*)|\"(([^\"]|\\\")*)\")"
@@ -590 +627 @@
                 g_free( input );
 
-                irc->file_transfers = g_slist_prepend( irc->file_transfers, ft );
+                df->ic->irc->file_transfers = g_slist_prepend( df->ic->irc->file_transfers, ft );
 
                 return ft;

dcc.h

@@ -95 +95 @@
 } dcc_file_transfer_t;
 
-file_transfer_t *dccs_send_start( struct im_connection *ic, irc_user_t *iu, const char *file_name, size_t file_size );
+file_transfer_t *dccs_send_start( struct im_connection *ic, char *user_nick, char *file_name, size_t file_size );
+
 void dcc_canceled( file_transfer_t *file, char *reason );
+
 gboolean dccs_send_write( file_transfer_t *file, char *data, unsigned int data_size );
+
 file_transfer_t *dcc_request( struct im_connection *ic, char *line );
-void dcc_finish( file_transfer_t *file );
-void dcc_close( file_transfer_t *file );
-gboolean dccs_recv_start( file_transfer_t *ft );
-
 #endif

ipc.c

@@ -138 +138 @@
         
         if( strchr( irc->umode, 'w' ) )
-                irc_write( irc, ":%s WALLOPS :%s", irc->root->host, cmd[1] );
+                irc_write( irc, ":%s WALLOPS :%s", irc->myhost, cmd[1] );
 }
 
@@ -147 +147 @@
         
         if( strchr( irc->umode, 's' ) )
-                irc_write( irc, ":%s NOTICE %s :%s", irc->root->host, irc->user->nick, cmd[1] );
+                irc_write( irc, ":%s NOTICE %s :%s", irc->myhost, irc->nick, cmd[1] );
 }
 
@@ -156 +156 @@
         
         if( strchr( irc->umode, 'o' ) )
-                irc_write( irc, ":%s NOTICE %s :*** OperMsg *** %s", irc->root->host, irc->user->nick, cmd[1] );
+                irc_write( irc, ":%s NOTICE %s :*** OperMsg *** %s", irc->myhost, irc->nick, cmd[1] );
 }
 
@@ -176 +176 @@
                 return;
         
-        if( nick_cmp( cmd[1], irc->user->nick ) != 0 )
+        if( nick_cmp( cmd[1], irc->nick ) != 0 )
                 return;         /* It's not for us. */
         
-        irc_write( irc, ":%s!%s@%s KILL %s :%s", irc->root->nick, irc->root->nick, irc->root->host, irc->user->nick, cmd[2] );
+        irc_write( irc, ":%s!%s@%s KILL %s :%s", irc->mynick, irc->mynick, irc->myhost, irc->nick, cmd[2] );
         irc_abort( irc, 0, "Killed by operator: %s", cmd[2] );
 }
@@ -188 +188 @@
                 ipc_to_master_str( "HELLO\r\n" );
         else
-                ipc_to_master_str( "HELLO %s %s :%s\r\n", irc->user->host, irc->user->nick, irc->user->fullname );
+                ipc_to_master_str( "HELLO %s %s :%s\r\n", irc->host, irc->nick, irc->realname );
 }
 

irc.c

@@ -5 +5 @@
   \********************************************************************/
 
-/* The IRC-based UI (for now the only one)                              */
+/* The big hairy IRCd part of the project                               */
 
 /*
@@ -24 +24 @@
 */
 
+#define BITLBEE_CORE
 #include "bitlbee.h"
+#include "sock.h"
 #include "ipc.h"
-
-GSList *irc_connection_list;
-
-static gboolean irc_userping( gpointer _irc, gint fd, b_input_condition cond );
-static char *set_eval_charset( set_t *set, char *value );
+#include "dcc.h"
+
+static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );
+
+GSList *irc_connection_list = NULL;
+
+static char *set_eval_password( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
+        
+        if( irc->status & USTATUS_IDENTIFIED && value )
+        {
+                irc_setpass( irc, value );
+                return NULL;
+        }
+        else
+        {
+                return SET_INVALID;
+        }
+}
+
+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;
+}
+
+static char *set_eval_away_status( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
+        account_t *a;
+        
+        g_free( set->value );
+        set->value = g_strdup( value );
+        
+        for( a = irc->accounts; a; a = a->next )
+        {
+                struct im_connection *ic = a->ic;
+                
+                if( ic && ic->flags & OPT_LOGGED_IN )
+                        imc_away_send_update( ic );
+        }
+        
+        return value;
+}
 
 irc_t *irc_new( int fd )
@@ -37 +102 @@
         struct sockaddr_storage sock;
         socklen_t socklen = sizeof( sock );
-        char *host = NULL, *myhost = NULL;
-        irc_user_t *iu;
         set_t *s;
-        bee_t *b;
         
         irc = g_new0( irc_t, 1 );
@@ -52 +114 @@
         irc->last_pong = gettime();
         
-        irc->nick_user_hash = g_hash_table_new( g_str_hash, g_str_equal );
+        irc->userhash = g_hash_table_new( g_str_hash, g_str_equal );
         irc->watches = g_hash_table_new( g_str_hash, g_str_equal );
+        
+        strcpy( irc->umode, UMODE );
+        irc->mynick = g_strdup( ROOT_NICK );
+        irc->channel = g_strdup( ROOT_CHAN );
         
         irc->iconv = (GIConv) -1;
@@ -60 +126 @@
         if( global.conf->hostname )
         {
-                myhost = g_strdup( global.conf->hostname );
+                irc->myhost = g_strdup( global.conf->hostname );
         }
         else if( getsockname( irc->fd, (struct sockaddr*) &sock, &socklen ) == 0 ) 
@@ -69 +135 @@
                                  NI_MAXHOST, NULL, 0, 0 ) == 0 )
                 {
-                        myhost = g_strdup( ipv6_unwrap( buf ) );
+                        irc->myhost = g_strdup( ipv6_unwrap( buf ) );
                 }
         }
@@ -80 +146 @@
                                  NI_MAXHOST, NULL, 0, 0 ) == 0 )
                 {
-                        host = g_strdup( ipv6_unwrap( buf ) );
-                }
-        }
-        
-        if( host == NULL )
-                host = g_strdup( "localhost.localdomain" );
-        if( myhost == NULL )
-                myhost = g_strdup( "localhost.localdomain" );
+                        irc->host = g_strdup( ipv6_unwrap( buf ) );
+                }
+        }
+        
+        if( irc->host == NULL )
+                irc->host = g_strdup( "localhost.localdomain" );
+        if( irc->myhost == NULL )
+                irc->myhost = g_strdup( "localhost.localdomain" );
         
         if( global.conf->ping_interval > 0 && global.conf->ping_timeout > 0 )
                 irc->ping_source_id = b_timeout_add( global.conf->ping_interval * 1000, irc_userping, irc );
+        
+        irc_write( irc, ":%s NOTICE AUTH :%s", irc->myhost, "BitlBee-IRCd initialized, please go on" );
 
         irc_connection_list = g_slist_append( irc_connection_list, irc );
         
-        b = irc->b = bee_new();
-        b->ui_data = irc;
-        b->ui = &irc_ui_funcs;
-        
-        s = set_add( &b->set, "away_devoice", "true", NULL/*set_eval_away_devoice*/, irc );
-        s = set_add( &b->set, "buddy_sendbuffer", "false", set_eval_bool, irc );
-        s = set_add( &b->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
-        s = set_add( &b->set, "charset", "utf-8", set_eval_charset, irc );
-        //s = set_add( &b->set, "control_channel", irc->channel, NULL/*set_eval_control_channel*/, irc );
-        s = set_add( &b->set, "default_target", "root", NULL, irc );
-        s = set_add( &b->set, "display_namechanges", "false", set_eval_bool, irc );
-        s = set_add( &b->set, "handle_unknown", "root", NULL, irc );
-        s = set_add( &b->set, "lcnicks", "true", set_eval_bool, irc );
-        s = set_add( &b->set, "ops", "both", NULL/*set_eval_ops*/, irc );
-        s = set_add( &b->set, "private", "true", set_eval_bool, irc );
-        s = set_add( &b->set, "query_order", "lifo", NULL, irc );
-        s = set_add( &b->set, "root_nick", ROOT_NICK, NULL/*set_eval_root_nick*/, irc );
-        s = set_add( &b->set, "simulate_netsplit", "true", set_eval_bool, irc );
-        s = set_add( &b->set, "to_char", ": ", set_eval_to_char, irc );
-        s = set_add( &b->set, "typing_notice", "false", set_eval_bool, irc );
-
-        irc->root = iu = irc_user_new( irc, ROOT_NICK );
-        iu->host = g_strdup( myhost );
-        iu->fullname = g_strdup( ROOT_FN );
-        iu->f = &irc_user_root_funcs;
-        
-        iu = irc_user_new( irc, NS_NICK );
-        iu->host = g_strdup( myhost );
-        iu->fullname = g_strdup( ROOT_FN );
-        iu->f = &irc_user_root_funcs;
-        
-        irc->user = g_new0( irc_user_t, 1 );
-        irc->user->host = g_strdup( host );
+        s = set_add( &irc->set, "away", NULL,  set_eval_away_status, irc );
+        s->flags |= SET_NULL_OK;
+        s = set_add( &irc->set, "away_devoice", "true",  set_eval_away_devoice, irc );
+        s = set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "auto_reconnect", "true", 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, "control_channel", irc->channel, set_eval_control_channel, 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, "lcnicks", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "ops", "both", set_eval_ops, 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, "status", NULL,  set_eval_away_status, irc );
+        s->flags |= SET_NULL_OK;
+        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 );
         
         conf_loaddefaults( irc );
         
         /* Evaluator sets the iconv/oconv structures. */
-        set_eval_charset( set_find( &b->set, "charset" ), set_getstr( &b->set, "charset" ) );
-        
-        irc_write( irc, ":%s NOTICE AUTH :%s", irc->root->host, "BitlBee-IRCd initialized, please go on" );
-        
-        g_free( myhost );
-        g_free( host );
-        
-        return irc;
+        set_eval_charset( set_find( &irc->set, "charset" ), set_getstr( &irc->set, "charset" ) );
+        
+        return( irc );
 }
 
@@ -159 +217 @@
                 
                 ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
-                                   irc->user->nick ? irc->user->nick : "(NONE)", irc->root->host, reason );
+                                   irc->nick ? irc->nick : "(NONE)", irc->host, reason );
                 
                 g_free( reason );
@@ -169 +227 @@
                 
                 ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
-                                   irc->user->nick ? irc->user->nick : "(NONE)", irc->root->host, "No reason given" );
+                                   irc->nick ? irc->nick : "(NONE)", irc->host, "No reason given" );
         }
         
@@ -190 +248 @@
 }
 
-static gboolean irc_free_hashkey( gpointer key, gpointer value, gpointer data );
-
+static gboolean irc_free_hashkey( gpointer key, gpointer value, gpointer data )
+{
+        g_free( key );
+        
+        return( TRUE );
+}
+
+/* Because we have no garbage collection, this is quite annoying */
 void irc_free( irc_t * irc )
 {
+        user_t *user, *usertmp;
+        
         log_message( LOGLVL_INFO, "Destroying connection with fd %d", irc->fd );
         
-        /*
-        if( irc->status & USTATUS_IDENTIFIED && set_getbool( &irc->b->set, "save_on_quit" ) ) 
+        if( irc->status & USTATUS_IDENTIFIED && set_getbool( &irc->set, "save_on_quit" ) ) 
                 if( storage_save( irc, NULL, TRUE ) != STORAGE_OK )
                         irc_usermsg( irc, "Error while saving settings!" );
-        */
         
         irc_connection_list = g_slist_remove( irc_connection_list, irc );
         
-        /*
+        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->queries != NULL )
                 query_del( irc, irc->queries );
-        */
-        
-        while( irc->users )
-        {
-                irc_user_t *iu = irc->users->data;
-                irc_user_free( irc, iu->nick );
-        }
-        
-        while( irc->channels )
-                irc_channel_free( irc->channels->data );
+        
+        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 );
+                                        
+                        usertmp = user;
+                        user = user->next;
+                        g_free( usertmp );
+                }
+        }
         
         if( irc->ping_source_id > 0 )
@@ -228 +318 @@
         irc->fd = -1;
         
-        g_hash_table_foreach_remove( irc->nick_user_hash, irc_free_hashkey, NULL );
-        g_hash_table_destroy( irc->nick_user_hash );
+        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 );
@@ -242 +332 @@
         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 );
@@ -254 +355 @@
 }
 
-static gboolean irc_free_hashkey( gpointer key, gpointer value, gpointer data )
-{
-        g_free( key );
-        
-        return( TRUE );
-}
-
 /* USE WITH CAUTION!
    Sets pass without checking */
-void irc_setpass (irc_t *irc, const char *pass)
+void irc_setpass (irc_t *irc, const char *pass) 
 {
         g_free (irc->password);
@@ -274 +368 @@
 }
 
-static char **irc_splitlines( char *buffer );
-
 void irc_process( irc_t *irc )
 {
@@ -283 +375 @@
         if( irc->readbuffer != NULL )
         {
-                lines = irc_splitlines( irc->readbuffer );
+                lines = irc_tokenize( irc->readbuffer );
                 
                 for( i = 0; *lines[i] != '\0'; i ++ )
@@ -320 +412 @@
                                                                   "`help set charset' for more information. Your "
                                                                   "message was ignored.",
-                                                                  set_getstr( &irc->b->set, "charset" ) );
+                                                                  set_getstr( &irc->set, "charset" ) );
                                                 
                                                 g_free( conv );
@@ -327 +419 @@
                                         else
                                         {
-                                                irc_write( irc, ":%s NOTICE AUTH :%s", irc->root->host,
+                                                irc_write( irc, ":%s NOTICE AUTH :%s", irc->myhost,
                                                            "Warning: invalid characters received at login time." );
                                                 
@@ -365 +457 @@
 }
 
-/* Splits a long string into separate lines. The array is NULL-terminated
-   and, unless the string contains an incomplete line at the end, ends with
-   an empty string. Could use g_strsplit() but this one does it in-place.
-   (So yes, it's destructive.) */
-static char **irc_splitlines( char *buffer )
+/* Splits a long string into separate lines. The array is NULL-terminated and, unless the string
+   contains an incomplete line at the end, ends with an empty string. */
+char **irc_tokenize( char *buffer )
 {
         int i, j, n = 3;
@@ -500 +590 @@
 }
 
+void irc_reply( irc_t *irc, int code, char *format, ... )
+{
+        char text[IRC_MAX_LINE];
+        va_list params;
+        
+        va_start( params, format );
+        g_vsnprintf( text, IRC_MAX_LINE, format, params );
+        va_end( params );
+        irc_write( irc, ":%s %03d %s %s", irc->myhost, code, irc->nick?irc->nick:"*", text );
+        
+        return;
+}
+
+int irc_usermsg( irc_t *irc, char *format, ... )
+{
+        char text[1024];
+        va_list params;
+        char is_private = 0;
+        user_t *u;
+        
+        u = user_find( irc, irc->mynick );
+        is_private = u->is_private;
+        
+        va_start( params, format );
+        g_vsnprintf( text, sizeof( text ), format, params );
+        va_end( params );
+        
+        return( irc_msgfrom( irc, u->nick, text ) );
+}
+
 void irc_write( irc_t *irc, char *format, ... ) 
 {
@@ -510 +630 @@
         return;
 }
-
-void irc_write_all( int now, char *format, ... )
-{
-        va_list params;
-        GSList *temp;   
-        
-        va_start( params, format );
-        
-        temp = irc_connection_list;
-        while( temp != NULL )
-        {
-                irc_t *irc = temp->data;
-                
-                if( now )
-                {
-                        g_free( irc->sendbuffer );
-                        irc->sendbuffer = g_strdup( "\r\n" );
-                }
-                irc_vawrite( temp->data, format, params );
-                if( now )
-                {
-                        bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE );
-                }
-                temp = temp->next;
-        }
-        
-        va_end( params );
-        return;
-} 
 
 void irc_vawrite( irc_t *irc, char *format, va_list params )
@@ -595 +686 @@
 }
 
+void irc_write_all( int now, char *format, ... )
+{
+        va_list params;
+        GSList *temp;   
+        
+        va_start( params, format );
+        
+        temp = irc_connection_list;
+        while( temp != NULL )
+        {
+                irc_t *irc = temp->data;
+                
+                if( now )
+                {
+                        g_free( irc->sendbuffer );
+                        irc->sendbuffer = g_strdup( "\r\n" );
+                }
+                irc_vawrite( temp->data, format, params );
+                if( now )
+                {
+                        bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE );
+                }
+                temp = temp->next;
+        }
+        
+        va_end( params );
+        return;
+} 
+
+void irc_names( irc_t *irc, char *channel )
+{
+        user_t *u;
+        char namelist[385] = "";
+        struct groupchat *c = NULL;
+        char *ops = set_getstr( &irc->set, "ops" );
+        
+        /* RFCs say there is no error reply allowed on NAMES, so when the
+           channel is invalid, just give an empty reply. */
+        
+        if( g_strcasecmp( channel, irc->channel ) == 0 )
+        {
+                for( u = irc->users; u; u = u->next ) if( u->online )
+                {
+                        if( strlen( namelist ) + strlen( u->nick ) > sizeof( namelist ) - 4 )
+                        {
+                                irc_reply( irc, 353, "= %s :%s", channel, namelist );
+                                *namelist = 0;
+                        }
+                        
+                        if( u->ic && !u->away && set_getbool( &irc->set, "away_devoice" ) )
+                                strcat( namelist, "+" );
+                        else if( ( strcmp( u->nick, irc->mynick ) == 0 && ( strcmp( ops, "root" ) == 0 || strcmp( ops, "both" ) == 0 ) ) ||
+                                 ( strcmp( u->nick, irc->nick ) == 0 && ( strcmp( ops, "user" ) == 0 || strcmp( ops, "both" ) == 0 ) ) )
+                                strcat( namelist, "@" );
+                        
+                        strcat( namelist, u->nick );
+                        strcat( namelist, " " );
+                }
+        }
+        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
+        {
+                GList *l;
+                
+                /* root and the user aren't in the channel userlist but should
+                   show up in /NAMES, so list them first: */
+                sprintf( namelist, "%s%s %s%s ", strcmp( ops, "root" ) == 0 || strcmp( ops, "both" ) ? "@" : "", irc->mynick,
+                                                 strcmp( ops, "user" ) == 0 || strcmp( ops, "both" ) ? "@" : "", irc->nick );
+                
+                for( l = c->in_room; l; l = l->next ) if( ( u = user_findhandle( c->ic, l->data ) ) )
+                {
+                        if( strlen( namelist ) + strlen( u->nick ) > sizeof( namelist ) - 4 )
+                        {
+                                irc_reply( irc, 353, "= %s :%s", channel, namelist );
+                                *namelist = 0;
+                        }
+                        
+                        strcat( namelist, u->nick );
+                        strcat( namelist, " " );
+                }
+        }
+        
+        if( *namelist )
+                irc_reply( irc, 353, "= %s :%s", channel, namelist );
+        
+        irc_reply( irc, 366, "%s :End of /NAMES list", channel );
+}
+
 int irc_check_login( irc_t *irc )
 {
-        if( irc->user->user && irc->user->nick )
+        if( irc->user && irc->nick )
         {
                 if( global.conf->authmode == AUTHMODE_CLOSED && !( irc->status & USTATUS_AUTHORIZED ) )
                 {
-                        irc_send_num( irc, 464, ":This server is password-protected." );
+                        irc_reply( irc, 464, ":This server is password-protected." );
                         return 0;
                 }
                 else
                 {
-                        irc_channel_t *ic;
-                        irc_user_t *iu = irc->user;
-                        
-                        irc->user = irc_user_new( irc, iu->nick );
-                        irc->user->user = iu->user;
-                        irc->user->host = iu->host;
-                        irc->user->fullname = iu->fullname;
-                        irc->user->f = &irc_user_self_funcs;
-                        g_free( iu->nick );
-                        g_free( iu );
-                        
-                        if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )
-                                ipc_to_master_str( "CLIENT %s %s :%s\r\n", irc->user->host, irc->user->nick, irc->user->fullname );
-                        
-                        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_send_login( irc );
-                        
-                        irc->umode[0] = '\0';
-                        irc_umode_set( irc, "+" UMODE, TRUE );
-                        
-                        ic = irc_channel_new( irc, ROOT_CHAN );
-                        irc_channel_set_topic( ic, CONTROL_TOPIC, irc->root );
-                        irc_channel_add_user( ic, irc->user );
-                        
-                        irc->last_root_cmd = g_strdup( ROOT_CHAN );
-                        
+                        irc_login( irc );
                         return 1;
                 }
@@ -653 +795 @@
 }
 
-void irc_umode_set( irc_t *irc, const char *s, gboolean allow_priv )
+void irc_login( irc_t *irc )
+{
+        user_t *u;
+        
+        irc_reply( irc,   1, ":Welcome to the BitlBee gateway, %s", irc->nick );
+        irc_reply( irc,   2, ":Host %s is running BitlBee " BITLBEE_VERSION " " ARCH "/" CPU ".", irc->myhost );
+        irc_reply( irc,   3, ":%s", IRCD_INFO );
+        irc_reply( irc,   4, "%s %s %s %s", irc->myhost, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES );
+        irc_reply( irc,   5, "PREFIX=(ov)@+ CHANTYPES=%s CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee "
+                             "CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server",
+                             CTYPES, CMODES, MAX_NICK_LENGTH - 1 );
+        irc_motd( irc );
+        irc->umode[0] = '\0';
+        irc_umode_set( irc, "+" UMODE, 1 );
+
+        u = user_add( irc, irc->mynick );
+        u->host = g_strdup( irc->myhost );
+        u->realname = g_strdup( ROOT_FN );
+        u->online = 1;
+        u->send_handler = root_command_string;
+        u->is_private = 0; /* [SH] The channel is root's personal playground. */
+        irc_spawn( irc, u );
+        
+        u = user_add( irc, NS_NICK );
+        u->host = g_strdup( irc->myhost );
+        u->realname = g_strdup( ROOT_FN );
+        u->online = 0;
+        u->send_handler = root_command_string;
+        u->is_private = 1; /* [SH] NickServ is not in the channel, so should always /query. */
+        
+        u = user_add( irc, irc->nick );
+        u->user = g_strdup( irc->user );
+        u->host = g_strdup( irc->host );
+        u->realname = g_strdup( irc->realname );
+        u->online = 1;
+        irc_spawn( irc, u );
+        
+        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 )
+                ipc_to_master_str( "CLIENT %s %s :%s\r\n", irc->host, irc->nick, irc->realname );
+        
+        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] );
+        }
+}
+
+void irc_motd( irc_t *irc )
+{
+        int fd;
+        
+        fd = open( global.conf->motdfile, O_RDONLY );
+        if( fd == -1 )
+        {
+                irc_reply( irc, 422, ":We don't need MOTDs." );
+        }
+        else
+        {
+                char linebuf[80];       /* Max. line length for MOTD's is 79 chars. It's what most IRC networks seem to do. */
+                char *add, max;
+                int len;
+                
+                linebuf[79] = len = 0;
+                max = sizeof( linebuf ) - 1;
+                
+                irc_reply( irc, 375, ":- %s Message Of The Day - ", irc->myhost );
+                while( read( fd, linebuf + len, 1 ) == 1 )
+                {
+                        if( linebuf[len] == '\n' || len == max )
+                        {
+                                linebuf[len] = 0;
+                                irc_reply( irc, 372, ":- %s", linebuf );
+                                len = 0;
+                        }
+                        else if( linebuf[len] == '%' )
+                        {
+                                read( fd, linebuf + len, 1 );
+                                if( linebuf[len] == 'h' )
+                                        add = irc->myhost;
+                                else if( linebuf[len] == 'v' )
+                                        add = BITLBEE_VERSION;
+                                else if( linebuf[len] == 'n' )
+                                        add = irc->nick;
+                                else
+                                        add = "%";
+                                
+                                strncpy( linebuf + len, add, max - len );
+                                while( linebuf[++len] );
+                        }
+                        else if( len < max )
+                        {
+                                len ++;
+                        }
+                }
+                irc_reply( irc, 376, ":End of MOTD" );
+                close( fd );
+        }
+}
+
+void irc_topic( irc_t *irc, char *channel )
+{
+        struct groupchat *c = irc_chat_by_channel( irc, channel );
+        
+        if( c && c->topic )
+                irc_reply( irc, 332, "%s :%s", channel, c->topic );
+        else if( g_strcasecmp( channel, irc->channel ) == 0 )
+                irc_reply( irc, 332, "%s :%s", channel, CONTROL_TOPIC );
+        else
+                irc_reply( irc, 331, "%s :No topic for this channel", channel );
+}
+
+void irc_umode_set( irc_t *irc, char *s, int allow_priv )
 {
         /* allow_priv: Set to 0 if s contains user input, 1 if you want
            to set a "privileged" mode (+o, +R, etc). */
-        char m[128], st = 1;
-        const char *t;
+        char m[256], st = 1, *t;
         int i;
         char changes[512], *p, st2 = 2;
@@ -666 +931 @@
         
         for( t = irc->umode; *t; t ++ )
-                if( *t < sizeof( m ) )
-                        m[(int)*t] = 1;
-        
+                m[(int)*t] = 1;
+
         p = changes;
         for( t = s; *t; t ++ )
@@ -674 +938 @@
                 if( *t == '+' || *t == '-' )
                         st = *t == '+';
-                else if( ( st == 0 && ( !strchr( UMODES_KEEP, *t ) || allow_priv ) ) ||
-                         ( st == 1 && strchr( UMODES, *t ) ) ||
-                         ( st == 1 && allow_priv && strchr( UMODES_PRIV, *t ) ) )
+                else if( st == 0 || ( strchr( UMODES, *t ) || ( allow_priv && strchr( UMODES_PRIV, *t ) ) ) )
                 {
                         if( m[(int)*t] != st)
@@ -693 +955 @@
         memset( irc->umode, 0, sizeof( irc->umode ) );
         
-        for( i = 'A'; i <= 'z' && strlen( irc->umode ) < ( sizeof( irc->umode ) - 1 ); i ++ )
+        for( i = 0; i < 256 && strlen( irc->umode ) < ( sizeof( irc->umode ) - 1 ); i ++ )
                 if( m[i] )
                         irc->umode[strlen(irc->umode)] = i;
         
         if( badflag )
-                irc_send_num( irc, 501, ":Unknown MODE flag" );
+                irc_reply( irc, 501, ":Unknown MODE flag" );
+        /* Deliberately no !user@host on the prefix here */
         if( *changes )
-                irc_write( irc, ":%s!%s@%s MODE %s :%s", irc->user->nick,
-                           irc->user->user, irc->user->host, irc->user->nick,
-                           changes );
-}
-
+                irc_write( irc, ":%s MODE %s %s", irc->nick, irc->nick, changes );
+}
+
+void irc_spawn( irc_t *irc, user_t *u )
+{
+        irc_join( irc, u, irc->channel );
+}
+
+void irc_join( irc_t *irc, user_t *u, char *channel )
+{
+        char *nick;
+        
+        if( ( g_strcasecmp( channel, irc->channel ) != 0 ) || user_find( irc, irc->nick ) )
+                irc_write( irc, ":%s!%s@%s JOIN :%s", u->nick, u->user, u->host, channel );
+        
+        if( nick_cmp( u->nick, irc->nick ) == 0 )
+        {
+                irc_write( irc, ":%s MODE %s +%s", irc->myhost, channel, CMODE );
+                irc_names( irc, channel );
+                irc_topic( irc, channel );
+        }
+        
+        nick = g_strdup( u->nick );
+        nick_lc( nick );
+        if( g_hash_table_lookup( irc->watches, nick ) )
+        {
+                irc_reply( irc, 600, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "logged online" );
+        }
+        g_free( nick );
+}
+
+void irc_part( irc_t *irc, user_t *u, char *channel )
+{
+        irc_write( irc, ":%s!%s@%s PART %s :%s", u->nick, u->user, u->host, channel, "" );
+}
+
+void irc_kick( irc_t *irc, user_t *u, char *channel, user_t *kicker )
+{
+        irc_write( irc, ":%s!%s@%s KICK %s %s :%s", kicker->nick, kicker->user, kicker->host, channel, u->nick, "" );
+}
+
+void irc_kill( irc_t *irc, user_t *u )
+{
+        char *nick, *s;
+        char reason[128];
+        
+        if( u->ic && u->ic->flags & OPT_LOGGING_OUT && set_getbool( &irc->set, "simulate_netsplit" ) )
+        {
+                if( u->ic->acc->server )
+                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
+                                    u->ic->acc->server );
+                else if( ( s = strchr( u->ic->acc->user, '@' ) ) )
+                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
+                                    s + 1 );
+                else
+                        g_snprintf( reason, sizeof( reason ), "%s %s.%s", irc->myhost,
+                                    u->ic->acc->prpl->name, irc->myhost );
+                
+                /* proto_opt might contain garbage after the : */
+                if( ( s = strchr( reason, ':' ) ) )
+                        *s = 0;
+        }
+        else
+        {
+                strcpy( reason, "Leaving..." );
+        }
+        
+        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, reason );
+        
+        nick = g_strdup( u->nick );
+        nick_lc( nick );
+        if( g_hash_table_lookup( irc->watches, nick ) )
+        {
+                irc_reply( irc, 601, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "logged offline" );
+        }
+        g_free( nick );
+}
+
+int irc_send( irc_t *irc, char *nick, char *s, int flags )
+{
+        struct groupchat *c = NULL;
+        user_t *u = NULL;
+        
+        if( strchr( CTYPES, *nick ) )
+        {
+                if( !( c = irc_chat_by_channel( irc, nick ) ) )
+                {
+                        irc_reply( irc, 403, "%s :Channel does not exist", nick );
+                        return( 0 );
+                }
+        }
+        else
+        {
+                u = user_find( irc, nick );
+                
+                if( !u )
+                {
+                        if( irc->is_private )
+                                irc_reply( irc, 401, "%s :Nick does not exist", nick );
+                        else
+                                irc_usermsg( irc, "Nick `%s' does not exist!", nick );
+                        return( 0 );
+                }
+        }
+        
+        if( *s == 1 && s[strlen(s)-1] == 1 )
+        {
+                if( g_strncasecmp( s + 1, "ACTION", 6 ) == 0 )
+                {
+                        if( s[7] == ' ' ) s ++;
+                        s += 3;
+                        *(s++) = '/';
+                        *(s++) = 'm';
+                        *(s++) = 'e';
+                        *(s++) = ' ';
+                        s -= 4;
+                        s[strlen(s)-1] = 0;
+                }
+                else if( g_strncasecmp( s + 1, "VERSION", 7 ) == 0 )
+                {
+                        u = user_find( irc, irc->mynick );
+                        irc_privmsg( irc, u, "NOTICE", irc->nick, "", "\001VERSION BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\001" );
+                        return( 1 );
+                }
+                else if( g_strncasecmp( s + 1, "PING", 4 ) == 0 )
+                {
+                        u = user_find( irc, irc->mynick );
+                        irc_privmsg( irc, u, "NOTICE", irc->nick, "", s );
+                        return( 1 );
+                }
+                else if( g_strncasecmp( s + 1, "TYPING", 6 ) == 0 )
+                {
+                        if( u && u->ic && u->ic->acc->prpl->send_typing && strlen( s ) >= 10 )
+                        {
+                                time_t current_typing_notice = time( NULL );
+                                
+                                if( current_typing_notice - u->last_typing_notice >= 5 )
+                                {
+                                        u->ic->acc->prpl->send_typing( u->ic, u->handle, ( s[8] - '0' ) << 8 );
+                                        u->last_typing_notice = current_typing_notice;
+                                }
+                        }
+                        return( 1 );
+                }
+                else if( g_strncasecmp( s + 1, "DCC", 3 ) == 0 )
+                {
+                        if( u && u->ic && u->ic->acc->prpl->transfer_request )
+                        {
+                                file_transfer_t *ft = dcc_request( u->ic, s + 5 );
+                                if ( ft )
+                                        u->ic->acc->prpl->transfer_request( u->ic, ft, u->handle );
+                        }
+                        return( 1 );
+                }               
+                else
+                {
+                        irc_usermsg( irc, "Supported CTCPs are ACTION, VERSION, PING, TYPING, DCC" );
+                        return( 0 );
+                }
+        }
+        
+        if( u )
+        {
+                /* For the next message, we probably do have to send new notices... */
+                u->last_typing_notice = 0;
+                u->is_private = irc->is_private;
+                
+                if( u->is_private )
+                {
+                        if( !u->online )
+                                irc_reply( irc, 301, "%s :%s", u->nick, "User is offline" );
+                        else if( u->away )
+                                irc_reply( irc, 301, "%s :%s", u->nick, u->away );
+                }
+                
+                if( u->send_handler )
+                {
+                        u->send_handler( irc, u, s, flags );
+                        return 1;
+                }
+        }
+        else if( c && c->ic && c->ic->acc && c->ic->acc->prpl )
+        {
+                return( imc_chat_msg( c, s, 0 ) );
+        }
+        
+        return( 0 );
+}
+
+static gboolean buddy_send_handler_delayed( gpointer data, gint fd, b_input_condition cond )
+{
+        user_t *u = data;
+        
+        /* Shouldn't happen, but just to be sure. */
+        if( u->sendbuf_len < 2 )
+                return FALSE;
+        
+        u->sendbuf[u->sendbuf_len-2] = 0; /* Cut off the last newline */
+        imc_buddy_msg( u->ic, u->handle, u->sendbuf, u->sendbuf_flags );
+        
+        g_free( u->sendbuf );
+        u->sendbuf = NULL;
+        u->sendbuf_len = 0;
+        u->sendbuf_timer = 0;
+        u->sendbuf_flags = 0;
+        
+        return FALSE;
+}
+
+void buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags )
+{
+        if( !u || !u->ic ) return;
+        
+        if( set_getbool( &irc->set, "buddy_sendbuffer" ) && set_getint( &irc->set, "buddy_sendbuffer_delay" ) > 0 )
+        {
+                int delay;
+                
+                if( u->sendbuf_len > 0 && u->sendbuf_flags != flags)
+                {
+                        /* Flush the buffer */
+                        b_event_remove( u->sendbuf_timer );
+                        buddy_send_handler_delayed( u, -1, 0 );
+                }
+
+                if( u->sendbuf_len == 0 )
+                {
+                        u->sendbuf_len = strlen( msg ) + 2;
+                        u->sendbuf = g_new( char, u->sendbuf_len );
+                        u->sendbuf[0] = 0;
+                        u->sendbuf_flags = flags;
+                }
+                else
+                {
+                        u->sendbuf_len += strlen( msg ) + 1;
+                        u->sendbuf = g_renew( char, u->sendbuf, u->sendbuf_len );
+                }
+                
+                strcat( u->sendbuf, msg );
+                strcat( u->sendbuf, "\n" );
+                
+                delay = set_getint( &irc->set, "buddy_sendbuffer_delay" );
+                if( delay <= 5 )
+                        delay *= 1000;
+                
+                if( u->sendbuf_timer > 0 )
+                        b_event_remove( u->sendbuf_timer );
+                u->sendbuf_timer = b_timeout_add( delay, buddy_send_handler_delayed, u );
+        }
+        else
+        {
+                imc_buddy_msg( u->ic, u->handle, msg, flags );
+        }
+}
+
+int irc_privmsg( irc_t *irc, user_t *u, char *type, char *to, char *prefix, char *msg )
+{
+        char last = 0;
+        char *s = msg, *line = msg;
+        
+        /* The almighty linesplitter .. woohoo!! */
+        while( !last )
+        {
+                if( *s == '\r' && *(s+1) == '\n' )
+                        *(s++) = 0;
+                if( *s == '\n' )
+                {
+                        last = s[1] == 0;
+                        *s = 0;
+                }
+                else
+                {
+                        last = s[0] == 0;
+                }
+                if( *s == 0 )
+                {
+                        if( g_strncasecmp( line, "/me ", 4 ) == 0 && ( !prefix || !*prefix ) && g_strcasecmp( type, "PRIVMSG" ) == 0 )
+                        {
+                                irc_write( irc, ":%s!%s@%s %s %s :\001ACTION %s\001", u->nick, u->user, u->host,
+                                           type, to, line + 4 );
+                        }
+                        else
+                        {
+                                irc_write( irc, ":%s!%s@%s %s %s :%s%s", u->nick, u->user, u->host,
+                                           type, to, prefix ? prefix : "", line );
+                        }
+                        line = s + 1;
+                }
+                s ++;
+        }
+        
+        return( 1 );
+}
+
+int irc_msgfrom( irc_t *irc, char *nick, char *msg )
+{
+        user_t *u = user_find( irc, nick );
+        static char *prefix = NULL;
+        
+        if( !u ) return( 0 );
+        if( prefix && *prefix ) g_free( prefix );
+        
+        if( !u->is_private && nick_cmp( u->nick, irc->mynick ) != 0 )
+        {
+                int len = strlen( irc->nick) + 3;
+                prefix = g_new (char, len );
+                g_snprintf( prefix, len, "%s%s", irc->nick, set_getstr( &irc->set, "to_char" ) );
+                prefix[len-1] = 0;
+        }
+        else
+        {
+                prefix = "";
+        }
+        
+        return( irc_privmsg( irc, u, "PRIVMSG", u->is_private ? irc->nick : irc->channel, prefix, msg ) );
+}
+
+int irc_noticefrom( irc_t *irc, char *nick, char *msg )
+{
+        user_t *u = user_find( irc, nick );
+        
+        if( u )
+                return( irc_privmsg( irc, u, "NOTICE", irc->nick, "", msg ) );
+        else
+                return( 0 );
+}
 
 /* Returns 0 if everything seems to be okay, a number >0 when there was a
@@ -742 +1325 @@
 }
 
-
-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;
-}
+struct groupchat *irc_chat_by_channel( irc_t *irc, char *channel )
+{
+        struct groupchat *c;
+        account_t *a;
+        
+        /* This finds the connection which has a conversation which belongs to this channel */
+        for( a = irc->accounts; a; a = a->next )
+        {
+                if( a->ic == NULL )
+                        continue;
+                
+                c = a->ic->groupchats;
+                while( c )
+                {
+                        if( c->channel && g_strcasecmp( c->channel, channel ) == 0 )
+                                return c;
+                        
+                        c = c->next;
+                }
+        }
+        
+        return NULL;
+}

irc.h

@@ -5 +5 @@
   \********************************************************************/
 
-/* The IRC-based UI (for now the only one)                              */
+/* The big hairy IRCd part of the project                               */
 
 /*
@@ -33 +33 @@
 #define IRC_PING_STRING "PinglBee"
 
-#define UMODES "abisw"     /* Allowed umodes (although they mostly do nothing) */
-#define UMODES_PRIV "Ro"   /* Allowed, but not by user directly */
-#define UMODES_KEEP "R"    /* Don't allow unsetting using /MODE */
-#define CMODES "nt"        /* Allowed modes */
-#define CMODE "t"          /* Default mode */
-#define UMODE "s"          /* Default mode */
-
-#define CTYPES "&#"        /* Valid channel name prefixes */
+#define UMODES "abisw"
+#define UMODES_PRIV "Ro"
+#define CMODES "nt"
+#define CMODE "t"
+#define UMODE "s"
+#define CTYPES "&#"
 
 typedef enum
@@ -50 +48 @@
         USTATUS_SHUTDOWN = 8
 } irc_status_t;
-
-struct irc_user;
 
 typedef struct irc
@@ -63 +59 @@
         GIConv iconv, oconv;
 
-        struct irc_user *root;
-        struct irc_user *user;
-        
-        char *last_root_cmd;
+        int sentbytes;
+        time_t oldtime;
 
+        char *nick;
+        char *user;
+        char *host;
+        char *realname;
         char *password; /* HACK: Used to save the user's password, but before
                            logging in, this may contain a password we should
@@ -74 +72 @@
         char umode[8];
         
+        char *myhost;
+        char *mynick;
+
+        char *channel;
+        int c_id;
+
+        char is_private;                /* Not too nice... */
+        char *last_target;
+        
         struct query *queries;
+        struct account *accounts;
         GSList *file_transfers;
+        struct chat *chatrooms;
         
-        GSList *users, *channels;
-        GHashTable *nick_user_hash;
+        struct __USER *users;
+        GHashTable *userhash;
         GHashTable *watches;
+        struct __NICK *nicks;
+        struct set *set;
 
         gint r_watch_source_id;
         gint w_watch_source_id;
         gint ping_source_id;
-        
-        struct bee *b;
 } irc_t;
 
-typedef enum
-{
-        IRC_USER_PRIVATE = 1,
-} irc_user_flags_t;
+#include "user.h"
 
-typedef struct irc_user
-{
-        irc_t *irc;
-        
-        char *nick;
-        char *user;
-        char *host;
-        char *fullname;
-        
-        /* Nickname in lowercase for case sensitive searches */
-        char *key;
-        
-        irc_user_flags_t flags;
-        
-        char *sendbuf;
-        int sendbuf_len;
-        guint sendbuf_timer;
-        //int sendbuf_flags;
-        
-        struct bee_user *bu;
-        
-        const struct irc_user_funcs *f;
-} irc_user_t;
-
-struct irc_user_funcs
-{
-        gboolean (*privmsg)( irc_user_t *iu, const char *msg );
-};
-
-extern const struct irc_user_funcs irc_user_root_funcs;
-extern const struct irc_user_funcs irc_user_self_funcs;
-
-typedef enum
-{
-        IRC_CHANNEL_JOINED = 1,
-} irc_channel_flags_t;
-
-typedef struct irc_channel
-{
-        irc_t *irc;
-        char *name;
-        char mode[8];
-        int flags;
-        
-        char *topic;
-        char *topic_who;
-        time_t topic_time;
-        
-        GSList *users;
-        struct set *set;
-        
-        const struct irc_channel_funcs *f;
-} irc_channel_t;
-
-struct irc_channel_funcs
-{
-        gboolean (*privmsg)( irc_channel_t *iu, const char *msg );
-};
-
-extern const struct bee_ui_funcs irc_ui_funcs;
-
-/* irc.c */
 extern GSList *irc_connection_list;
 
@@ -160 +104 @@
 void irc_abort( irc_t *irc, int immed, char *format, ... ) G_GNUC_PRINTF( 3, 4 );
 void irc_free( irc_t *irc );
-void irc_setpass (irc_t *irc, const char *pass);
 
+void irc_exec( irc_t *irc, char **cmd );
 void irc_process( irc_t *irc );
 char **irc_parse_line( char *line );
 char *irc_build_line( char **cmd );
 
+void irc_vawrite( irc_t *irc, char *format, va_list params );
 void irc_write( irc_t *irc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
 void irc_write_all( int now, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
-void irc_vawrite( irc_t *irc, char *format, va_list params );
+void irc_reply( irc_t *irc, int code, char *format, ... ) G_GNUC_PRINTF( 3, 4 );
+G_MODULE_EXPORT int irc_usermsg( irc_t *irc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
+char **irc_tokenize( char *buffer );
 
+void irc_login( irc_t *irc );
 int irc_check_login( irc_t *irc );
+void irc_motd( irc_t *irc );
+void irc_names( irc_t *irc, char *channel );
+void irc_topic( irc_t *irc, char *channel );
+void irc_umode_set( irc_t *irc, char *s, int allow_priv );
+void irc_who( irc_t *irc, char *channel );
+void irc_spawn( irc_t *irc, user_t *u );
+void irc_join( irc_t *irc, user_t *u, char *channel );
+void irc_part( irc_t *irc, user_t *u, char *channel );
+void irc_kick( irc_t *irc, user_t *u, char *channel, user_t *kicker );
+void irc_kill( irc_t *irc, user_t *u );
+void irc_invite( irc_t *irc, char *nick, char *channel );
+void irc_whois( irc_t *irc, char *nick );
+void irc_setpass( irc_t *irc, const char *pass ); /* USE WITH CAUTION! */
 
-void irc_umode_set( irc_t *irc, const char *s, gboolean allow_priv );
+int irc_send( irc_t *irc, char *nick, char *s, int flags );
+int irc_privmsg( irc_t *irc, user_t *u, char *type, char *to, char *prefix, char *msg );
+int irc_msgfrom( irc_t *irc, char *nick, char *msg );
+int irc_noticefrom( irc_t *irc, char *nick, char *msg );
 
-/* irc_channel.c */
-irc_channel_t *irc_channel_new( irc_t *irc, const char *name );
-irc_channel_t *irc_channel_by_name( irc_t *irc, const char *name );
-int irc_channel_free( irc_channel_t *ic );
-int irc_channel_add_user( irc_channel_t *ic, irc_user_t *iu );
-int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu );
-gboolean irc_channel_has_user( irc_channel_t *ic, irc_user_t *iu );
-int irc_channel_set_topic( irc_channel_t *ic, const char *topic, const irc_user_t *who );
-gboolean irc_channel_name_ok( const char *name );
-
-/* irc_commands.c */
-void irc_exec( irc_t *irc, char **cmd );
-
-/* irc_send.c */
-void irc_send_num( irc_t *irc, int code, char *format, ... ) G_GNUC_PRINTF( 3, 4 );
-void irc_send_login( irc_t *irc );
-void irc_send_motd( irc_t *irc );
-void irc_usermsg( irc_t *irc, char *format, ... );
-void irc_send_join( irc_channel_t *ic, irc_user_t *iu );
-void irc_send_part( irc_channel_t *ic, irc_user_t *iu, const char *reason );
-void irc_send_names( irc_channel_t *ic );
-void irc_send_topic( irc_channel_t *ic, gboolean topic_change );
-void irc_send_whois( irc_user_t *iu );
-void irc_send_who( irc_t *irc, GSList *l, const char *channel );
-void irc_send_msg( irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix );
-void irc_send_msg_raw( irc_user_t *iu, const char *type, const char *dst, const char *msg );
-void irc_send_nick( irc_user_t *iu, const char *new );
-
-/* irc_user.c */
-irc_user_t *irc_user_new( irc_t *irc, const char *nick );
-int irc_user_free( irc_t *irc, const char *nick );
-irc_user_t *irc_user_by_name( irc_t *irc, const char *nick );
-int irc_user_set_nick( irc_user_t *iu, const char *new );
-gint irc_user_cmp( gconstpointer a_, gconstpointer b_ );
+void buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags );
+struct groupchat *irc_chat_by_channel( irc_t *irc, char *channel );
 
 #endif

irc_commands.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2010 Wilmer van der Gaast and others                *
+  * Copyright 2002-2006 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -53 +53 @@
         else if( global.conf->auth_pass )
         {
-                irc_send_num( irc, 464, ":Incorrect password" );
+                irc_reply( irc, 464, ":Incorrect password" );
         }
         else
         {
                 /* Remember the password and try to identify after USER/NICK. */
-                /*irc_setpass( irc, cmd[1] ); */
+                irc_setpass( irc, cmd[1] );
                 irc_check_login( irc );
         }
@@ -65 +65 @@
 static void irc_cmd_user( irc_t *irc, char **cmd )
 {
-        irc->user->user = g_strdup( cmd[1] );
-        irc->user->fullname = g_strdup( cmd[4] );
+        irc->user = g_strdup( cmd[1] );
+        irc->realname = g_strdup( cmd[4] );
         
         irc_check_login( irc );
@@ -73 +73 @@
 static void irc_cmd_nick( irc_t *irc, char **cmd )
 {
-        if( irc->user->nick )
-        {
-                irc_send_num( irc, 438, ":The hand of the deity is upon thee, thy nick may not change" );
-        }
-        else if( irc_user_by_name( irc, cmd[1] ) )
-        {
-                irc_send_num( irc, 433, ":This nick is already in use" );
+        if( irc->nick )
+        {
+                irc_reply( irc, 438, ":The hand of the deity is upon thee, thy nick may not change" );
+        }
+        /* This is not clean, but for now it'll have to be like this... */
+        else if( ( nick_cmp( cmd[1], irc->mynick ) == 0 ) || ( nick_cmp( cmd[1], NS_NICK ) == 0 ) )
+        {
+                irc_reply( irc, 433, ":This nick is already in use" );
         }
         else if( !nick_ok( cmd[1] ) )
         {
                 /* [SH] Invalid characters. */
-                irc_send_num( irc, 432, ":This nick contains invalid characters" );
-        }
-        else
-        {
-                irc->user->nick = g_strdup( cmd[1] );
+                irc_reply( irc, 432, ":This nick contains invalid characters" );
+        }
+        else
+        {
+                irc->nick = g_strdup( cmd[1] );
                 
                 irc_check_login( irc );
@@ -104 +105 @@
 static void irc_cmd_ping( irc_t *irc, char **cmd )
 {
-        irc_write( irc, ":%s PONG %s :%s", irc->root->host,
-                   irc->root->host, cmd[1]?cmd[1]:irc->root->host );
-}
-
-static void irc_cmd_pong( irc_t *irc, char **cmd )
-{
-        /* We could check the value we get back from the user, but in
-           fact we don't care, we're just happy s/he's still alive. */
-        irc->last_pong = gettime();
-        irc->pinging = 0;
-}
-
-static void irc_cmd_join( irc_t *irc, char **cmd )
-{
-        irc_channel_t *ic;
-        
-        if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL )
-                ic = irc_channel_new( irc, cmd[1] );
-        
-        if( ic == NULL )
-                irc_send_num( irc, 479, "%s :Invalid channel name", cmd[1] );
-        
-        if( ic->flags & IRC_CHANNEL_JOINED )
-                return; /* Dude, you're already there...
-                           RFC doesn't have any reply for that though? */
-        
-        irc_channel_add_user( ic, irc->user );
-}
-
-static void irc_cmd_names( irc_t *irc, char **cmd )
-{
-        irc_channel_t *ic;
-        
-        if( cmd[1] && ( ic = irc_channel_by_name( irc, cmd[1] ) ) )
-                irc_send_names( ic );
-        /* With no args, we should show /names of all chans. Make the code
-           below work well if necessary.
-        else
-        {
-                GSList *l;
-                
-                for( l = irc->channels; l; l = l->next )
-                        irc_send_names( l->data );
-        }
-        */
-}
-
-static void irc_cmd_part( irc_t *irc, char **cmd )
-{
-        irc_channel_t *ic;
-        
-        if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL )
-        {
-                irc_send_num( irc, 403, "%s :No such channel", cmd[1] );
-        }
-        else if( !irc_channel_del_user( ic, irc->user ) )
-        {
-                irc_send_num( irc, 442, "%s :You're not on that channel", cmd[1] );
-        }
-}
-
-static void irc_cmd_whois( irc_t *irc, char **cmd )
-{
-        char *nick = cmd[1];
-        irc_user_t *iu = irc_user_by_name( irc, nick );
-        
-        if( iu )
-                irc_send_whois( iu );
-        else
-                irc_send_num( irc, 401, "%s :Nick does not exist", nick );
-}
-
-static void irc_cmd_whowas( irc_t *irc, char **cmd )
-{
-        /* For some reason irssi tries a whowas when whois fails. We can
-           ignore this, but then the user never gets a "user not found"
-           message from irssi which is a bit annoying. So just respond
-           with not-found and irssi users will get better error messages */
-        
-        irc_send_num( irc, 406, "%s :Nick does not exist", cmd[1] );
-        irc_send_num( irc, 369, "%s :End of WHOWAS", cmd[1] );
-}
-
-static void irc_cmd_motd( irc_t *irc, char **cmd )
-{
-        irc_send_motd( irc );
+        irc_write( irc, ":%s PONG %s :%s", irc->myhost, irc->myhost, cmd[1]?cmd[1]:irc->myhost );
+}
+
+static void irc_cmd_oper( irc_t *irc, char **cmd )
+{
+        if( global.conf->oper_pass &&
+            ( strncmp( global.conf->oper_pass, "md5:", 4 ) == 0 ?
+                md5_verify_password( cmd[2], global.conf->oper_pass + 4 ) == 0 :
+                strcmp( cmd[2], global.conf->oper_pass ) == 0 ) )
+        {
+                irc_umode_set( irc, "+o", 1 );
+                irc_reply( irc, 381, ":Password accepted" );
+        }
+        else
+        {
+                irc_reply( irc, 432, ":Incorrect password" );
+        }
 }
 
 static void irc_cmd_mode( irc_t *irc, char **cmd )
 {
-        if( irc_channel_name_ok( cmd[1] ) )
-        {
-                irc_channel_t *ic;
-                
-                if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL )
-                        irc_send_num( irc, 403, "%s :No such channel", cmd[1] );
-                else if( cmd[2] )
+        if( strchr( CTYPES, *cmd[1] ) )
+        {
+                if( cmd[2] )
                 {
                         if( *cmd[2] == '+' || *cmd[2] == '-' )
-                                irc_send_num( irc, 477, "%s :Can't change channel modes", cmd[1] );
+                                irc_reply( irc, 477, "%s :Can't change channel modes", cmd[1] );
                         else if( *cmd[2] == 'b' )
-                                irc_send_num( irc, 368, "%s :No bans possible", cmd[1] );
+                                irc_reply( irc, 368, "%s :No bans possible", cmd[1] );
                 }
                 else
-                        irc_send_num( irc, 324, "%s +%s", cmd[1], ic->mode );
-        }
-        else
-        {
-                if( nick_cmp( cmd[1], irc->user->nick ) == 0 )
+                        irc_reply( irc, 324, "%s +%s", cmd[1], CMODE );
+        }
+        else
+        {
+                if( nick_cmp( cmd[1], irc->nick ) == 0 )
                 {
                         if( cmd[2] )
                                 irc_umode_set( irc, cmd[2], 0 );
                         else
-                                irc_send_num( irc, 221, "+%s", irc->umode );
+                                irc_reply( irc, 221, "+%s", irc->umode );
                 }
                 else
-                        irc_send_num( irc, 502, ":Don't touch their modes" );
-        }
-}
-
-static void irc_cmd_who( irc_t *irc, char **cmd )
-{
-        char *channel = cmd[1];
-        irc_channel_t *ic;
-        
-        if( !channel || *channel == '0' || *channel == '*' || !*channel )
-                irc_send_who( irc, irc->users, "**" );
-        else if( ( ic = irc_channel_by_name( irc, channel ) ) )
-                irc_send_who( irc, ic->users, channel );
-        else
-                irc_send_num( irc, 403, "%s :No such channel", channel );
+                        irc_reply( irc, 502, ":Don't touch their modes" );
+        }
+}
+
+static void irc_cmd_names( irc_t *irc, char **cmd )
+{
+        irc_names( irc, cmd[1]?cmd[1]:irc->channel );
+}
+
+static void irc_cmd_part( irc_t *irc, char **cmd )
+{
+        struct groupchat *c;
+        
+        if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
+        {
+                user_t *u = user_find( irc, irc->nick );
+                
+                /* Not allowed to leave control channel */
+                irc_part( irc, u, irc->channel );
+                irc_join( irc, u, irc->channel );
+        }
+        else if( ( c = irc_chat_by_channel( irc, cmd[1] ) ) )
+        {
+                user_t *u = user_find( irc, irc->nick );
+                
+                irc_part( irc, u, c->channel );
+                
+                if( c->ic )
+                {
+                        c->joined = 0;
+                        c->ic->acc->prpl->chat_leave( c );
+                }
+        }
+        else
+        {
+                irc_reply( irc, 403, "%s :No such channel", cmd[1] );
+        }
+}
+
+static void irc_cmd_join( irc_t *irc, char **cmd )
+{
+        if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
+                ; /* Dude, you're already there...
+                     RFC doesn't have any reply for that though? */
+        else if( cmd[1] )
+        {
+                struct chat *c;
+                
+                if( strchr( CTYPES, cmd[1][0] ) == NULL || cmd[1][1] == 0 )
+                        irc_reply( irc, 479, "%s :Invalid channel name", cmd[1] );
+                else if( ( c = chat_bychannel( irc, cmd[1] ) ) && c->acc && c->acc->ic )
+                        chat_join( irc, c, cmd[2] );
+                else
+                        irc_reply( irc, 403, "%s :No such channel", cmd[1] );
+        }
+}
+
+static void irc_cmd_invite( irc_t *irc, char **cmd )
+{
+        char *nick = cmd[1], *channel = cmd[2];
+        struct groupchat *c = irc_chat_by_channel( irc, channel );
+        user_t *u = user_find( irc, nick );
+        
+        if( u && c && ( u->ic == c->ic ) )
+                if( c->ic && c->ic->acc->prpl->chat_invite )
+                {
+                        c->ic->acc->prpl->chat_invite( c, u->handle, NULL );
+                        irc_reply( irc, 341, "%s %s", nick, channel );
+                        return;
+                }
+        
+        irc_reply( irc, 482, "%s :Invite impossible; User/Channel non-existent or incompatible", channel );
 }
 
 static void irc_cmd_privmsg( irc_t *irc, char **cmd )
 {
-        irc_channel_t *ic;
-        irc_user_t *iu;
-        
-        if( !cmd[2] ) 
-        {
-                irc_send_num( irc, 412, ":No text to send" );
-        }
-        else if( irc_channel_name_ok( cmd[1] ) &&
-                 ( ic = irc_channel_by_name( irc, cmd[1] ) ) )
-        {
-                if( ic->f->privmsg )
-                        ic->f->privmsg( ic, cmd[2] );
-        }
-        else if( ( iu = irc_user_by_name( irc, cmd[1] ) ) )
-        {
-                if( iu->f->privmsg )
-                        iu->f->privmsg( iu, cmd[2] );
-        }
-        else
-        {
-                irc_send_num( irc, 401, "%s :No such nick/channel", cmd[1] );
-        }
-
-
-#if 0
-        else if( irc->nick && g_strcasecmp( cmd[1], irc->nick ) == 0 ) 
-        {
+        if ( !cmd[2] ) 
+        {
+                irc_reply( irc, 412, ":No text to send" );
+        }
+        else if ( irc->nick && g_strcasecmp( cmd[1], irc->nick ) == 0 ) 
+        {
+                irc_write( irc, ":%s!%s@%s %s %s :%s", irc->nick, irc->user, irc->host, cmd[0], cmd[1], cmd[2] ); 
         }
         else 
@@ -306 +271 @@
                 irc_send( irc, cmd[1], cmd[2], ( g_strcasecmp( cmd[0], "NOTICE" ) == 0 ) ? OPT_AWAY : 0 );
         }
-#endif
-}
-
-static void irc_cmd_nickserv( irc_t *irc, char **cmd )
-{
-        /* [SH] This aliases the NickServ command to PRIVMSG root */
-        /* [TV] This aliases the NS command to PRIVMSG root as well */
-        root_command( irc, cmd + 1 );
-}
-
-
-
-#if 0
-//#if 0
-static void irc_cmd_oper( irc_t *irc, char **cmd )
-{
-        if( global.conf->oper_pass &&
-            ( strncmp( global.conf->oper_pass, "md5:", 4 ) == 0 ?
-                md5_verify_password( cmd[2], global.conf->oper_pass + 4 ) == 0 :
-                strcmp( cmd[2], global.conf->oper_pass ) == 0 ) )
-        {
-                irc_umode_set( irc, "+o", 1 );
-                irc_send_num( irc, 381, ":Password accepted" );
-        }
-        else
-        {
-                irc_send_num( irc, 432, ":Incorrect password" );
-        }
-}
-
-static void irc_cmd_invite( irc_t *irc, char **cmd )
-{
-        char *nick = cmd[1], *channel = cmd[2];
-        struct groupchat *c = irc_chat_by_channel( irc, channel );
-        user_t *u = user_find( irc, nick );
-        
-        if( u && c && ( u->ic == c->ic ) )
-                if( c->ic && c->ic->acc->prpl->chat_invite )
-                {
-                        c->ic->acc->prpl->chat_invite( c, u->handle, NULL );
-                        irc_send_num( irc, 341, "%s %s", nick, channel );
-                        return;
-                }
-        
-        irc_send_num( irc, 482, "%s :Invite impossible; User/Channel non-existent or incompatible", channel );
+}
+
+static void irc_cmd_who( irc_t *irc, char **cmd )
+{
+        char *channel = cmd[1];
+        user_t *u = irc->users;
+        struct groupchat *c;
+        GList *l;
+        
+        if( !channel || *channel == '0' || *channel == '*' || !*channel )
+                while( u )
+                {
+                        irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", u->online ? irc->channel : "*", u->user, u->host, irc->myhost, u->nick, u->online ? ( u->away ? 'G' : 'H' ) : 'G', u->realname );
+                        u = u->next;
+                }
+        else if( g_strcasecmp( channel, irc->channel ) == 0 )
+                while( u )
+                {
+                        if( u->online )
+                                irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->away ? 'G' : 'H', u->realname );
+                        u = u->next;
+                }
+        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
+                for( l = c->in_room; l; l = l->next )
+                {
+                        if( ( u = user_findhandle( c->ic, l->data ) ) )
+                                irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->away ? 'G' : 'H', u->realname );
+                }
+        else if( ( u = user_find( irc, channel ) ) )
+                irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->online ? ( u->away ? 'G' : 'H' ) : 'G', u->realname );
+        
+        irc_reply( irc, 315, "%s :End of /WHO list", channel?channel:"**" );
 }
 
@@ -368 +320 @@
                 {
                         if( u->online && u->away )
-                                irc_send_num( irc, 302, ":%s=-%s@%s", u->nick, u->user, u->host );
+                                irc_reply( irc, 302, ":%s=-%s@%s", u->nick, u->user, u->host );
                         else
-                                irc_send_num( irc, 302, ":%s=+%s@%s", u->nick, u->user, u->host );
+                                irc_reply( irc, 302, ":%s=+%s@%s", u->nick, u->user, u->host );
                 }
 }
@@ -425 +377 @@
                 buff[strlen(buff)-1] = '\0';
         
-        irc_send_num( irc, 303, ":%s", buff );
+        irc_reply( irc, 303, ":%s", buff );
 }
 
@@ -454 +406 @@
                         
                         if( u && u->online )
-                                irc_send_num( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "is online" );
+                                irc_reply( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "is online" );
                         else
-                                irc_send_num( irc, 605, "%s %s %s %d :%s", nick, "*", "*", (int) time( NULL ), "is offline" );
+                                irc_reply( irc, 605, "%s %s %s %d :%s", nick, "*", "*", (int) time( NULL ), "is offline" );
                 }
                 else if( cmd[i][0] == '-' )
@@ -467 +419 @@
                                 g_free( okey );
                                 
-                                irc_send_num( irc, 602, "%s %s %s %d :%s", nick, "*", "*", 0, "Stopped watching" );
+                                irc_reply( irc, 602, "%s %s %s %d :%s", nick, "*", "*", 0, "Stopped watching" );
                         }
                 }
@@ -511 +463 @@
                 u->away[j] = 0;
                 
-                irc_send_num( irc, 306, ":You're now away: %s", u->away );
+                irc_reply( irc, 306, ":You're now away: %s", u->away );
                 /* irc_umode_set( irc, irc->myhost, "+a" ); */
         }
@@ -519 +471 @@
                 u->away = NULL;
                 /* irc_umode_set( irc, irc->myhost, "-a" ); */
-                irc_send_num( irc, 305, ":Welcome back" );
+                irc_reply( irc, 305, ":Welcome back" );
         }
         
@@ -525 +477 @@
 }
 
+static void irc_cmd_whois( irc_t *irc, char **cmd )
+{
+        char *nick = cmd[1];
+        user_t *u = user_find( irc, nick );
+        
+        if( u )
+        {
+                irc_reply( irc, 311, "%s %s %s * :%s", u->nick, u->user, u->host, u->realname );
+                
+                if( u->ic )
+                        irc_reply( irc, 312, "%s %s.%s :%s network", u->nick, u->ic->acc->user,
+                                   u->ic->acc->server && *u->ic->acc->server ? u->ic->acc->server : "",
+                                   u->ic->acc->prpl->name );
+                else
+                        irc_reply( irc, 312, "%s %s :%s", u->nick, irc->myhost, IRCD_INFO );
+                
+                if( !u->online )
+                        irc_reply( irc, 301, "%s :%s", u->nick, "User is offline" );
+                else if( u->away )
+                        irc_reply( irc, 301, "%s :%s", u->nick, u->away );
+                if( u->status_msg )
+                        irc_reply( irc, 333, "%s :Status: %s", u->nick, u->status_msg );
+                
+                irc_reply( irc, 318, "%s :End of /WHOIS list", nick );
+        }
+        else
+        {
+                irc_reply( irc, 401, "%s :Nick does not exist", nick );
+        }
+}
+
+static void irc_cmd_whowas( irc_t *irc, char **cmd )
+{
+        /* For some reason irssi tries a whowas when whois fails. We can
+           ignore this, but then the user never gets a "user not found"
+           message from irssi which is a bit annoying. So just respond
+           with not-found and irssi users will get better error messages */
+        
+        irc_reply( irc, 406, "%s :Nick does not exist", cmd[1] );
+        irc_reply( irc, 369, "%s :End of WHOWAS", cmd[1] );
+}
+
+static void irc_cmd_nickserv( irc_t *irc, char **cmd )
+{
+        /* [SH] This aliases the NickServ command to PRIVMSG root */
+        /* [TV] This aliases the NS command to PRIVMSG root as well */
+        root_command( irc, cmd + 1 );
+}
+
+static void irc_cmd_motd( irc_t *irc, char **cmd )
+{
+        irc_motd( irc );
+}
+
+static void irc_cmd_pong( irc_t *irc, char **cmd )
+{
+        /* We could check the value we get back from the user, but in
+           fact we don't care, we're just happy he's still alive. */
+        irc->last_pong = gettime();
+        irc->pinging = 0;
+}
+
 static void irc_cmd_version( irc_t *irc, char **cmd )
 {
-        irc_send_num( irc, 351, "bitlbee-%s. %s :%s/%s ", BITLBEE_VERSION, irc->myhost, ARCH, CPU );
+        irc_reply( irc, 351, "bitlbee-%s. %s :%s/%s ", BITLBEE_VERSION, irc->myhost, ARCH, CPU );
 }
 
@@ -558 +572 @@
                 ipc_to_master( cmd );
         
-        irc_send_num( irc, 382, "%s :Rehashing", global.conf_file );
-}
-#endif
+        irc_reply( irc, 382, "%s :Rehashing", global.conf_file );
+}
 
 static const command_t irc_commands[] = {
@@ -568 +581 @@
         { "quit",        0, irc_cmd_quit,        0 },
         { "ping",        0, irc_cmd_ping,        0 },
-        { "pong",        0, irc_cmd_pong,        IRC_CMD_LOGGED_IN },
+        { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
+        { "mode",        1, irc_cmd_mode,        IRC_CMD_LOGGED_IN },
+        { "names",       0, irc_cmd_names,       IRC_CMD_LOGGED_IN },
+        { "part",        1, irc_cmd_part,        IRC_CMD_LOGGED_IN },
         { "join",        1, irc_cmd_join,        IRC_CMD_LOGGED_IN },
-        { "names",       1, irc_cmd_names,       IRC_CMD_LOGGED_IN },
-        { "part",        1, irc_cmd_part,        IRC_CMD_LOGGED_IN },
-        { "whois",       1, irc_cmd_whois,       IRC_CMD_LOGGED_IN },
-        { "whowas",      1, irc_cmd_whowas,      IRC_CMD_LOGGED_IN },
-        { "motd",        0, irc_cmd_motd,        IRC_CMD_LOGGED_IN },
-        { "mode",        1, irc_cmd_mode,        IRC_CMD_LOGGED_IN },
+        { "invite",      2, irc_cmd_invite,      IRC_CMD_LOGGED_IN },
+        { "privmsg",     1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
+        { "notice",      1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
         { "who",         0, irc_cmd_who,         IRC_CMD_LOGGED_IN },
-        { "privmsg",     1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
-        { "nickserv",    1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
-        { "ns",          1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
-#if 0
-        { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
-        { "invite",      2, irc_cmd_invite,      IRC_CMD_LOGGED_IN },
-        { "notice",      1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
         { "userhost",    1, irc_cmd_userhost,    IRC_CMD_LOGGED_IN },
         { "ison",        1, irc_cmd_ison,        IRC_CMD_LOGGED_IN },
@@ -589 +595 @@
         { "topic",       1, irc_cmd_topic,       IRC_CMD_LOGGED_IN },
         { "away",        0, irc_cmd_away,        IRC_CMD_LOGGED_IN },
+        { "whois",       1, irc_cmd_whois,       IRC_CMD_LOGGED_IN },
+        { "whowas",      1, irc_cmd_whowas,      IRC_CMD_LOGGED_IN },
+        { "nickserv",    1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
+        { "ns",          1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
+        { "motd",        0, irc_cmd_motd,        IRC_CMD_LOGGED_IN },
+        { "pong",        0, irc_cmd_pong,        IRC_CMD_LOGGED_IN },
         { "version",     0, irc_cmd_version,     IRC_CMD_LOGGED_IN },
         { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
@@ -598 +610 @@
         { "restart",     0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "kill",        2, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
-#endif
         { NULL }
 };
@@ -617 +628 @@
                         if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status & USTATUS_LOGGED_IN )
                         {
-                                irc_send_num( irc, 462, ":Only allowed before logging in" );
+                                irc_reply( irc, 462, ":Only allowed before logging in" );
                         }
                         else if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && !( irc->status & USTATUS_LOGGED_IN ) )
                         {
-                                irc_send_num( irc, 451, ":Register first" );
+                                irc_reply( irc, 451, ":Register first" );
                         }
                         else if( irc_commands[i].flags & IRC_CMD_OPER_ONLY && !strchr( irc->umode, 'o' ) )
                         {
-                                irc_send_num( irc, 481, ":Permission denied - You're not an IRC operator" );
+                                irc_reply( irc, 481, ":Permission denied - You're not an IRC operator" );
                         }
                         else if( n_arg < irc_commands[i].required_parameters )
                         {
-                                irc_send_num( irc, 461, "%s :Need more parameters", cmd[0] );
+                                irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
                         }
                         else if( irc_commands[i].flags & IRC_CMD_TO_MASTER )
@@ -646 +657 @@
         
         if( irc->status >= USTATUS_LOGGED_IN )
-                irc_send_num( irc, 421, "%s :Unknown command", cmd[0] );
-}
+                irc_reply( irc, 421, "%s :Unknown command", cmd[0] );
+}

nick.c

@@ -78 +78 @@
                 
                 nick_strip( nick );
-                if( set_getbool( &acc->bee->set, "lcnicks" ) )
+                if( set_getbool( &acc->irc->set, "lcnicks" ) )
                         nick_lc( nick );
         }
@@ -92 +92 @@
 void nick_dedupe( account_t *acc, const char *handle, char nick[MAX_NICK_LENGTH+1] )
 {
-        irc_t *irc = (irc_t*) acc->bee->ui_data;
         int inf_protection = 256;
         
         /* Now, find out if the nick is already in use at the moment, and make
            subtle changes to make it unique. */
-        while( !nick_ok( nick ) || irc_user_by_name( irc, nick ) )
+        while( !nick_ok( nick ) || user_find( acc->irc, nick ) )
         {
                 if( strlen( nick ) < ( MAX_NICK_LENGTH - 1 ) )
@@ -113 +112 @@
                         int i;
                         
-                        irc_usermsg( irc, "Warning: Almost had an infinite loop in nick_get()! "
-                                          "This used to be a fatal BitlBee bug, but we tried to fix it. "
-                                          "This message should *never* appear anymore. "
-                                          "If it does, please *do* send us a bug report! "
-                                          "Please send all the following lines in your report:" );
-                        
-                        irc_usermsg( irc, "Trying to get a sane nick for handle %s", handle );
+                        irc_usermsg( acc->irc, "Warning: Almost had an infinite loop in nick_get()! "
+                                               "This used to be a fatal BitlBee bug, but we tried to fix it. "
+                                               "This message should *never* appear anymore. "
+                                               "If it does, please *do* send us a bug report! "
+                                               "Please send all the following lines in your report:" );
+                        
+                        irc_usermsg( acc->irc, "Trying to get a sane nick for handle %s", handle );
                         for( i = 0; i < MAX_NICK_LENGTH; i ++ )
-                                irc_usermsg( irc, "Char %d: %c/%d", i, nick[i], nick[i] );
-                        
-                        irc_usermsg( irc, "FAILED. Returning an insane nick now. Things might break. "
-                                          "Good luck, and please don't forget to paste the lines up here "
-                                          "in #bitlbee on OFTC or in a mail to wilmer@gaast.net" );
+                                irc_usermsg( acc->irc, "Char %d: %c/%d", i, nick[i], nick[i] );
+                        
+                        irc_usermsg( acc->irc, "FAILED. Returning an insane nick now. Things might break. "
+                                               "Good luck, and please don't forget to paste the lines up here "
+                                               "in #bitlbee on OFTC or in a mail to wilmer@gaast.net" );
                         
                         g_snprintf( nick, MAX_NICK_LENGTH + 1, "xx%x", rand() );

protocols/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = account.o bee.o bee_ft.o bee_user.o nogaim.o
-
+objects = nogaim.o
 
 # [SH] The next two lines should contain the directory name (in $(subdirs))

protocols/ft.h

@@ -168 +168 @@
  * the canceled() and free() callbacks given in file will be called by this function.
  */
-void imcb_file_canceled( struct im_connection *ic, file_transfer_t *file, char *reason );
+void imcb_file_canceled( file_transfer_t *file, char *reason );
 
-gboolean imcb_file_recv_start( struct im_connection *ic, file_transfer_t *ft );
+gboolean imcb_file_recv_start( file_transfer_t *ft );
 
-void imcb_file_finished( struct im_connection *ic, file_transfer_t *file );
+void imcb_file_finished( file_transfer_t *file );
 #endif

protocols/jabber/iq.c

@@ -392 +392 @@
                         if( ( strcmp( sub, "both" ) == 0 || strcmp( sub, "to" ) == 0 ) )
                         {
-                                if( initial || bee_user_by_handle( ic->bee, ic, jid ) == NULL )
+                                if( initial || imcb_find_buddy( ic, jid ) == NULL )
                                         imcb_add_buddy( ic, jid, ( group && group->text_len ) ?
                                                                    group->text : NULL );
@@ -590 +590 @@
             strcmp( s, "result" ) == 0 )
         {
-                if( bee_user_by_handle( ic->bee, ic, jid ) == NULL )
+                if( imcb_find_buddy( ic, jid ) == NULL )
                         imcb_add_buddy( ic, jid, NULL );
         }

protocols/jabber/jabber.c

@@ -267 +267 @@
         
         while( jd->filetransfers )
-                imcb_file_canceled( ic, ( ( struct jabber_transfer *) jd->filetransfers->data )->ft, "Logging out" );
+                imcb_file_canceled( ( ( struct jabber_transfer *) jd->filetransfers->data )->ft, "Logging out" );
 
         while( jd->streamhosts )

protocols/jabber/jabber_util.c

@@ -279 +279 @@
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         
-        imcb_ask_add( bla->ic, bla->handle, NULL );
+        if( imcb_find_buddy( bla->ic, bla->handle ) == NULL )
+                imcb_ask_add( bla->ic, bla->handle, NULL );
         
         g_free( bla->handle );
@@ -461 +462 @@
                 
                 if( bud == NULL && ( flags & GET_BUDDY_CREAT ) &&
-                    ( bare_exists || bee_user_by_handle( ic->bee, ic, jid ) ) )
+                    ( bare_exists || imcb_find_buddy( ic, jid ) ) )
                 {
                         *s = '/';
@@ -482 +483 @@
                 if( bud == NULL )
                         /* No match. Create it now? */
-                        return ( ( flags & GET_BUDDY_CREAT ) &&
-                                 bee_user_by_handle( ic->bee, ic, jid_ ) ) ?
+                        return ( ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid_ ) ) ?
                                    jabber_buddy_add( ic, jid_ ) : NULL;
                 else if( bud->resource && ( flags & GET_BUDDY_EXACT ) )

protocols/jabber/s5bytestream.c

@@ -567 +567 @@
         xt_free_node( reply );
 
-        imcb_file_canceled( tf->ic, tf->ft, "couldn't connect to any streamhosts" );
+        imcb_file_canceled( tf->ft, "couldn't connect to any streamhosts" );
 
         bt->tf->watch_in = 0;
@@ -604 +604 @@
                 
         if( !jabber_write_packet( tf->ic, reply ) )
-                imcb_file_canceled( tf->ic, tf->ft, "Error transmitting bytestream response" );
+                imcb_file_canceled( tf->ft, "Error transmitting bytestream response" );
         xt_free_node( reply );
 }
@@ -644 +644 @@
 
         if( tf->bytesread >= tf->ft->file_size )
-                imcb_file_finished( tf->ic, tf->ft );
+                imcb_file_finished( tf->ft );
 
         tf->ft->write( tf->ft, tf->ft->buffer, ret );   
@@ -660 +660 @@
         if( tf->watch_in )
         {
-                imcb_file_canceled( tf->ic, ft, "BUG in jabber file transfer: write_request called when already watching for input" );
+                imcb_file_canceled( ft, "BUG in jabber file transfer: write_request called when already watching for input" );
                 return FALSE;
         }
@@ -706 +706 @@
 
         if( tf->byteswritten >= ft->file_size )
-                imcb_file_finished( tf->ic, ft );
+                imcb_file_finished( ft );
         else
                 bt->tf->watch_out = b_input_add( tf->fd, GAIM_INPUT_WRITE, jabber_bs_send_can_write, bt );
@@ -1006 +1006 @@
 
         if( !jabber_write_packet( tf->ic, iq ) )
-                imcb_file_canceled( tf->ic, tf->ft, "Error transmitting bytestream request" );
+                imcb_file_canceled( tf->ft, "Error transmitting bytestream request" );
         return TRUE;
 }
@@ -1021 +1021 @@
 
         if( jd->streamhosts==NULL ) /* we're done here unless we have a proxy to try */
-                imcb_file_canceled( tf->ic, tf->ft, error );
+                imcb_file_canceled( tf->ft, error );
 
         /* MUST always return FALSE! */

protocols/jabber/si.c

@@ -91 +91 @@
 
         if( !foundft )
-                imcb_file_canceled( tf->ic, tf->ft, "Buddy's client doesn't feature file transfers" );
+                imcb_file_canceled( tf->ft, "Buddy's client doesn't feature file transfers" );
         else if( !foundbt )
-                imcb_file_canceled( tf->ic, tf->ft, "Buddy's client doesn't feature byte streams (required)" );
+                imcb_file_canceled( tf->ft, "Buddy's client doesn't feature byte streams (required)" );
         else if( !foundsi )
-                imcb_file_canceled( tf->ic, tf->ft, "Buddy's client doesn't feature stream initiation (required)" );
+                imcb_file_canceled( tf->ft, "Buddy's client doesn't feature stream initiation (required)" );
                 
         return foundft && foundbt && foundsi;
@@ -109 +109 @@
 
         /* and start the receive logic */
-        imcb_file_recv_start( tf->ic, tf->ft );
+        imcb_file_recv_start( tf->ft );
 
 }
@@ -156 +156 @@
         if( bud == NULL )
         {
-                imcb_file_canceled( ic, ft, "Couldn't find buddy (BUG?)" );
+                imcb_file_canceled( ft, "Couldn't find buddy (BUG?)" );
                 return;
         }

protocols/msn/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
+objects = invitation.o msn.o msn_util.o ns.o passport.o sb.o tables.o
 
 CFLAGS += -Wall

protocols/msn/msn.c

@@ -81 +81 @@
         if( md )
         {
-                /** Disabling MSN ft support for now.
                 while( md->filetransfers ) {
                         imcb_file_canceled( md->filetransfers->data, "Closing connection" );
                 }
-                */
                 
                 if( md->fd >= 0 )
@@ -346 +344 @@
         ret->send_typing = msn_send_typing;
         ret->handle_cmp = g_strcasecmp;
-        //ret->transfer_request = msn_ftp_transfer_request;
+        ret->transfer_request = msn_ftp_transfer_request;
 
         register_protocol(ret);

protocols/msn/msn_util.c

@@ -96 +96 @@
         msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname );
         
-        imcb_ask_add( bla->ic, bla->handle, NULL );
+        if( imcb_find_buddy( bla->ic, bla->handle ) == NULL )
+                imcb_ask_add( bla->ic, bla->handle, NULL );
         
         g_free( bla->handle );

protocols/msn/sb.c

@@ -691 +691 @@
                         }
                 }
-#if 0
-                // Disable MSN ft support for now.
                 else if( g_strncasecmp( ct, "text/x-msmsgsinvite", 19 ) == 0 )
                 {
@@ -725 +723 @@
                         g_free( command );
                 }
-#endif
                 else if( g_strncasecmp( ct, "application/x-msnmsgrp2p", 24 ) == 0 ) 
                 {

protocols/nogaim.c

@@ -38 +38 @@
 #include "chat.h"
 
+static int remove_chat_buddy_silent( struct groupchat *b, const char *handle );
+
 GSList *connections;
 
@@ -89 +91 @@
 }
 #endif
+
+/* nogaim.c */
 
 GList *protocols = NULL;
@@ -121 +125 @@
 }
 
+/* nogaim.c */
 void nogaim_init()
 {
@@ -151 +156 @@
 GSList *get_connections() { return connections; }
 
+/* multi.c */
+
 struct im_connection *imcb_new( account_t *acc )
 {
@@ -157 +164 @@
         ic = g_new0( struct im_connection, 1 );
         
-        ic->bee = acc->bee;
+        ic->irc = acc->irc;
         ic->acc = acc;
         acc->ic = ic;
@@ -171 +178 @@
         
         /* Destroy the pointer to this connection from the account list */
-        for( a = ic->bee->accounts; a; a = a->next )
+        for( a = ic->irc->accounts; a; a = a->next )
                 if( a->ic == ic )
                 {
@@ -192 +199 @@
         va_end( params );
 
-        if( ( g_strcasecmp( set_getstr( &ic->bee->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->bee->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
                 strip_html( text );
         
         /* Try to find a different connection on the same protocol. */
-        for( a = ic->bee->accounts; a; a = a->next )
+        for( a = ic->irc->accounts; a; a = a->next )
                 if( a->prpl == ic->acc->prpl && a->ic != ic )
                         break;
@@ -203 +210 @@
         /* If we found one, include the screenname in the message. */
         if( a )
-                /* FIXME(wilmer): ui_log callback or so */
-                irc_usermsg( ic->bee->ui_data, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text );
+                irc_usermsg( ic->irc, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text );
         else
-                irc_usermsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text );
+                irc_usermsg( ic->irc, "%s - %s", ic->acc->prpl->name, text );
         
         g_free( text );
@@ -257 +263 @@
 void imcb_connected( struct im_connection *ic )
 {
+        irc_t *irc = ic->irc;
+        struct chat *c;
+        user_t *u;
+        
         /* MSN servers sometimes redirect you to a different server and do
            the whole login sequence again, so these "late" calls to this
@@ -263 +273 @@
                 return;
         
+        u = user_find( ic->irc, ic->irc->nick );
+        
         imcb_log( ic, "Logged in" );
         
@@ -275 +287 @@
         ic->acc->auto_reconnect_delay = 0;
         
-        /*
         for( c = irc->chatrooms; c; c = c->next )
         {
@@ -284 +295 @@
                         chat_join( irc, c, NULL );
         }
-        */
 }
 
@@ -292 +302 @@
         
         a->reconnect = 0;
-        account_on( a->bee, a );
+        account_on( a->irc, a );
         
         return( FALSE );        /* Only have to run the timeout once */
@@ -305 +315 @@
 void imc_logout( struct im_connection *ic, int allow_reconnect )
 {
-        bee_t *bee = ic->bee;
+        irc_t *irc = ic->irc;
+        user_t *t, *u;
         account_t *a;
-        GSList *l;
         int delay;
         
@@ -327 +337 @@
         ic->away = NULL;
         
-        for( l = bee->users; l; l = l->next )
-        {
-                bee_user_t *bu = l->data;
-                
-                if( bu->ic == ic )
-                        bee_user_free( bee, ic, bu->handle );
-        }
-        
-        //query_del_by_conn( ic->irc, ic );
-        
-        for( a = bee->accounts; a; a = a->next )
+        u = irc->users;
+        while( u )
+        {
+                if( u->ic == ic )
+                {
+                        t = u->next;
+                        user_del( irc, u->nick );
+                        u = t;
+                }
+                else
+                        u = u->next;
+        }
+        
+        query_del_by_conn( ic->irc, ic );
+        
+        for( a = irc->accounts; a; a = a->next )
                 if( a->ic == ic )
                         break;
@@ -345 +360 @@
                 /* Uhm... This is very sick. */
         }
-        else if( allow_reconnect && set_getbool( &bee->set, "auto_reconnect" ) &&
+        else if( allow_reconnect && set_getbool( &irc->set, "auto_reconnect" ) &&
                  set_getbool( &a->set, "auto_reconnect" ) &&
                  ( delay = account_reconnect_delay( a ) ) > 0 )
@@ -356 +371 @@
 }
 
+
+/* dialogs.c */
+
 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 );
-}
+        query_add( ic->irc, ic, msg, doit, dont, data );
+}
+
+
+/* list.c */
 
 void imcb_add_buddy( struct im_connection *ic, const char *handle, const char *group )
 {
-        bee_user_t *bu;
-        bee_t *bee = ic->bee;
-        
-        if( bee_user_by_handle( bee, ic, handle ) )
-        {
-                if( set_getbool( &bee->set, "debug" ) )
+        user_t *u;
+        char nick[MAX_NICK_LENGTH+1], *s;
+        irc_t *irc = ic->irc;
+        
+        if( user_findhandle( ic, handle ) )
+        {
+                if( set_getbool( &irc->set, "debug" ) )
                         imcb_log( ic, "User already exists, ignoring add request: %s", handle );
                 
@@ -380 +402 @@
         }
         
-        bu = bee_user_new( bee, ic, handle );
-        bu->group = g_strdup( group );
-}
-
-void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *fullname )
-{
-        bee_t *bee = ic->bee;
-        bee_user_t *bu = bee_user_by_handle( bee, ic, handle );
-        
-        if( !bu || !fullname ) return;
-        
-        if( !bu->fullname || strcmp( bu->fullname, fullname ) != 0 )
-        {
-                g_free( bu->fullname );
-                bu->fullname = g_strdup( fullname );
-                
-                if( bee->ui->user_fullname )
-                        bee->ui->user_fullname( bee, bu );
+        memset( nick, 0, MAX_NICK_LENGTH + 1 );
+        strcpy( nick, nick_get( ic->acc, handle ) );
+        
+        u = user_add( ic->irc, nick );
+        
+//      if( !realname || !*realname ) realname = nick;
+//      u->realname = g_strdup( realname );
+        
+        if( ( s = strchr( handle, '@' ) ) )
+        {
+                u->host = g_strdup( s + 1 );
+                u->user = g_strndup( handle, s - handle );
+        }
+        else if( ic->acc->server )
+        {
+                u->host = g_strdup( ic->acc->server );
+                u->user = g_strdup( handle );
+                
+                /* s/ /_/ ... important for AOL screennames */
+                for( s = u->user; *s; s ++ )
+                        if( *s == ' ' )
+                                *s = '_';
+        }
+        else
+        {
+                u->host = g_strdup( ic->acc->prpl->name );
+                u->user = g_strdup( handle );
+        }
+        
+        u->ic = ic;
+        u->handle = g_strdup( handle );
+        if( group ) u->group = g_strdup( group );
+        u->send_handler = buddy_send_handler;
+        u->last_typing_notice = 0;
+}
+
+struct buddy *imcb_find_buddy( struct im_connection *ic, char *handle )
+{
+        static struct buddy b[1];
+        user_t *u;
+        
+        u = user_findhandle( ic, handle );
+        
+        if( !u )
+                return( NULL );
+        
+        memset( b, 0, sizeof( b ) );
+        strncpy( b->name, handle, 80 );
+        strncpy( b->show, u->realname, BUDDY_ALIAS_MAXLEN );
+        b->present = u->online;
+        b->ic = u->ic;
+        
+        return( b );
+}
+
+void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *realname )
+{
+        user_t *u = user_findhandle( ic, handle );
+        char *set;
+        
+        if( !u || !realname ) return;
+        
+        if( g_strcasecmp( u->realname, realname ) != 0 )
+        {
+                if( u->realname != u->nick ) g_free( u->realname );
+                
+                u->realname = g_strdup( realname );
+                
+                if( ( ic->flags & OPT_LOGGED_IN ) && set_getbool( &ic->irc->set, "display_namechanges" ) )
+                        imcb_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
+        }
+        
+        set = set_getstr( &ic->acc->set, "nick_source" );
+        if( strcmp( set, "handle" ) != 0 )
+        {
+                char *name = g_strdup( realname );
+                
+                if( strcmp( set, "first_name" ) == 0 )
+                {
+                        int i;
+                        for( i = 0; name[i] && !isspace( name[i] ); i ++ ) {}
+                        name[i] = '\0';
+                }
+                
+                imcb_buddy_nick_hint( ic, handle, name );
+                
+                g_free( name );
         }
 }
@@ -403 +494 @@
 void imcb_remove_buddy( struct im_connection *ic, const char *handle, char *group )
 {
-        bee_user_free( ic->bee, ic, handle );
+        user_t *u;
+        
+        if( ( u = user_findhandle( ic, handle ) ) )
+                user_del( ic->irc, u->nick );
 }
 
@@ -410 +504 @@
 void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick )
 {
-#if 0
         user_t *u = user_findhandle( ic, handle );
         char newnick[MAX_NICK_LENGTH+1], *orig_nick;
@@ -425 +518 @@
                 /* Some processing to make sure this string is a valid IRC nickname. */
                 nick_strip( newnick );
-                if( set_getbool( &ic->bee->set, "lcnicks" ) )
+                if( set_getbool( &ic->irc->set, "lcnicks" ) )
                         nick_lc( newnick );
                 
@@ -442 +535 @@
                 }
         }
-#endif
 }
 
@@ -452 +544 @@
 };
 
-#if 0
 static void imcb_ask_auth_cb_no( void *data )
 {
@@ -472 +563 @@
         g_free( cbd );
 }
-#endif
 
 void imcb_ask_auth( struct im_connection *ic, const char *handle, const char *realname )
 {
-#if 0
         struct imcb_ask_cb_data *data = g_new0( struct imcb_ask_cb_data, 1 );
         char *s, *realname_ = NULL;
@@ -491 +580 @@
         data->handle = g_strdup( handle );
         query_add( ic->irc, ic, s, imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, data );
-#endif
-}
-
-
-#if 0
+}
+
+
 static void imcb_ask_add_cb_no( void *data )
 {
@@ -510 +597 @@
         return imcb_ask_add_cb_no( data );
 }
-#endif
 
 void imcb_ask_add( struct im_connection *ic, const char *handle, const char *realname )
 {
-#if 0
         struct imcb_ask_cb_data *data = g_new0( struct imcb_ask_cb_data, 1 );
         char *s;
@@ -527 +612 @@
         data->handle = g_strdup( handle );
         query_add( ic->irc, ic, s, imcb_ask_add_cb_yes, imcb_ask_add_cb_no, data );
-#endif
+}
+
+
+/* server.c */                    
+
+void imcb_buddy_status( struct im_connection *ic, const char *handle, int flags, const char *state, const char *message )
+{
+        user_t *u;
+        int oa, oo;
+        
+        u = user_findhandle( ic, (char*) handle );
+        
+        if( !u )
+        {
+                if( g_strcasecmp( set_getstr( &ic->irc->set, "handle_unknown" ), "add" ) == 0 )
+                {
+                        imcb_add_buddy( ic, (char*) handle, NULL );
+                        u = user_findhandle( ic, (char*) handle );
+                }
+                else
+                {
+                        if( set_getbool( &ic->irc->set, "debug" ) || g_strcasecmp( set_getstr( &ic->irc->set, "handle_unknown" ), "ignore" ) != 0 )
+                        {
+                                imcb_log( ic, "imcb_buddy_status() for unknown handle %s:", handle );
+                                imcb_log( ic, "flags = %d, state = %s, message = %s", flags,
+                                          state ? state : "NULL", message ? message : "NULL" );
+                        }
+                        
+                        return;
+                }
+        }
+        
+        oa = u->away != NULL;
+        oo = u->online;
+        
+        g_free( u->away );
+        g_free( u->status_msg );
+        u->away = u->status_msg = NULL;
+        
+        if( ( flags & OPT_LOGGED_IN ) && !u->online )
+        {
+                irc_spawn( ic->irc, u );
+                u->online = 1;
+        }
+        else if( !( flags & OPT_LOGGED_IN ) && u->online )
+        {
+                struct groupchat *c;
+                
+                irc_kill( ic->irc, u );
+                u->online = 0;
+                
+                /* Remove him/her from the groupchats to prevent PART messages after he/she QUIT already */
+                for( c = ic->groupchats; c; c = c->next )
+                        remove_chat_buddy_silent( c, handle );
+        }
+        
+        if( flags & OPT_AWAY )
+        {
+                if( state && message )
+                {
+                        u->away = g_strdup_printf( "%s (%s)", state, message );
+                }
+                else if( state )
+                {
+                        u->away = g_strdup( state );
+                }
+                else if( message )
+                {
+                        u->away = g_strdup( message );
+                }
+                else
+                {
+                        u->away = g_strdup( "Away" );
+                }
+        }
+        else
+        {
+                u->status_msg = g_strdup( message );
+        }
+        
+        /* LISPy... */
+        if( ( set_getbool( &ic->irc->set, "away_devoice" ) ) &&         /* Don't do a thing when user doesn't want it */
+            ( u->online ) &&                                            /* Don't touch offline people */
+            ( ( ( u->online != oo ) && !u->away ) ||                    /* Voice joining people */
+              ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* (De)voice people changing state */
+        {
+                char *from;
+                
+                if( set_getbool( &ic->irc->set, "simulate_netsplit" ) )
+                {
+                        from = g_strdup( ic->irc->myhost );
+                }
+                else
+                {
+                        from = g_strdup_printf( "%s!%s@%s", ic->irc->mynick, ic->irc->mynick,
+                                                            ic->irc->myhost );
+                }
+                irc_write( ic->irc, ":%s MODE %s %cv %s", from, ic->irc->channel,
+                                                          u->away?'-':'+', u->nick );
+                g_free( from );
+        }
+}
+
+void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at )
+{
+        irc_t *irc = ic->irc;
+        char *wrapped;
+        user_t *u;
+        
+        u = user_findhandle( ic, handle );
+        
+        if( !u )
+        {
+                char *h = set_getstr( &irc->set, "handle_unknown" );
+                
+                if( g_strcasecmp( h, "ignore" ) == 0 )
+                {
+                        if( set_getbool( &irc->set, "debug" ) )
+                                imcb_log( ic, "Ignoring message from unknown handle %s", handle );
+                        
+                        return;
+                }
+                else if( g_strncasecmp( h, "add", 3 ) == 0 )
+                {
+                        int private = set_getbool( &irc->set, "private" );
+                        
+                        if( h[3] )
+                        {
+                                if( g_strcasecmp( h + 3, "_private" ) == 0 )
+                                        private = 1;
+                                else if( g_strcasecmp( h + 3, "_channel" ) == 0 )
+                                        private = 0;
+                        }
+                        
+                        imcb_add_buddy( ic, handle, NULL );
+                        u = user_findhandle( ic, handle );
+                        u->is_private = private;
+                }
+                else
+                {
+                        imcb_log( ic, "Message from unknown handle %s:", handle );
+                        u = user_find( irc, irc->mynick );
+                }
+        }
+        
+        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
+                strip_html( msg );
+
+        wrapped = word_wrap( msg, 425 );
+        irc_msgfrom( irc, u->nick, wrapped );
+        g_free( wrapped );
 }
 
 void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags )
 {
-#if 0
         user_t *u;
         
-        if( !set_getbool( &ic->bee->set, "typing_notice" ) )
+        if( !set_getbool( &ic->irc->set, "typing_notice" ) )
                 return;
         
@@ -545 +780 @@
                 irc_privmsg( ic->irc, u, "PRIVMSG", ic->irc->nick, NULL, buf );
         }
-#endif
-}
-
-struct bee_user *imcb_buddy_by_handle( struct im_connection *ic, const char *handle )
-{
-        return bee_user_by_handle( ic->bee, ic, handle );
 }
 
 struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle )
 {
-#if 0
         struct groupchat *c;
         
@@ -573 +801 @@
         c->topic = g_strdup_printf( "BitlBee groupchat: \"%s\". Please keep in mind that root-commands won't work here. Have fun!", c->title );
         
-        if( set_getbool( &ic->bee->set, "debug" ) )
+        if( set_getbool( &ic->irc->set, "debug" ) )
                 imcb_log( ic, "Creating new conversation: (id=%p,handle=%s)", c, handle );
         
         return c;
-#endif
-        return NULL;
 }
 
 void imcb_chat_free( struct groupchat *c )
 {
-#if 0
         struct im_connection *ic = c->ic;
         struct groupchat *l;
         GList *ir;
         
-        if( set_getbool( &ic->bee->set, "debug" ) )
+        if( set_getbool( &ic->irc->set, "debug" ) )
                 imcb_log( ic, "You were removed from conversation %p", c );
         
@@ -621 +846 @@
                 g_free( c );
         }
-#endif
 }
 
 void imcb_chat_msg( struct groupchat *c, const char *who, char *msg, uint32_t flags, time_t sent_at )
 {
-#if 0
         struct im_connection *ic = c->ic;
         char *wrapped;
@@ -637 +860 @@
         u = user_findhandle( ic, who );
         
-        if( ( g_strcasecmp( set_getstr( &ic->bee->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->bee->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
                 strip_html( msg );
         
@@ -651 +874 @@
         }
         g_free( wrapped );
-#endif
 }
 
 void imcb_chat_log( struct groupchat *c, char *format, ... )
 {
-#if 0
         irc_t *irc = c->ic->irc;
         va_list params;
@@ -671 +892 @@
         
         g_free( text );
-#endif
 }
 
 void imcb_chat_topic( struct groupchat *c, char *who, char *topic, time_t set_at )
 {
-#if 0
         struct im_connection *ic = c->ic;
         user_t *u = NULL;
@@ -687 +906 @@
                 u = user_findhandle( ic, who );
         
-        if( ( g_strcasecmp( set_getstr( &ic->bee->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->bee->set, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &ic->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->irc->set, "strip_html" ) ) )
                 strip_html( topic );
         
@@ -696 +915 @@
         if( c->joined && u )
                 irc_write( ic->irc, ":%s!%s@%s TOPIC %s :%s", u->nick, u->user, u->host, c->channel, topic );
-#endif
-}
+}
+
+
+/* buddy_chat.c */
 
 void imcb_chat_add_buddy( struct groupchat *b, const char *handle )
 {
-#if 0
         user_t *u = user_findhandle( b->ic, handle );
         int me = 0;
         
-        if( set_getbool( &b->ic->bee->set, "debug" ) )
+        if( set_getbool( &b->ic->irc->set, "debug" ) )
                 imcb_log( b->ic, "User %s added to conversation %p", handle, b );
         
@@ -732 +952 @@
                 b->in_room = g_list_append( b->in_room, g_strdup( handle ) );
         }
-#endif
 }
 
@@ -738 +957 @@
 void imcb_chat_remove_buddy( struct groupchat *b, const char *handle, const char *reason )
 {
-#if 0
         user_t *u;
         int me = 0;
         
-        if( set_getbool( &b->ic->bee->set, "debug" ) )
+        if( set_getbool( &b->ic->irc->set, "debug" ) )
                 imcb_log( b->ic, "User %s removed from conversation %p (%s)", handle, b, reason ? reason : "" );
         
@@ -762 +980 @@
         if( me || ( remove_chat_buddy_silent( b, handle ) && b->joined && u ) )
                 irc_part( b->ic->irc, u, b->channel );
-#endif
-}
-
-#if 0
+}
+
 static int remove_chat_buddy_silent( struct groupchat *b, const char *handle )
 {
@@ -784 +1000 @@
         }
         
-        return 0;
-}
-#endif
+        return( 0 );
+}
 
 
 /* Misc. BitlBee stuff which shouldn't really be here */
-#if 0
+
 char *set_eval_away_devoice( set_t *set, char *value )
 {
@@ -803 +1018 @@
         /* Horror.... */
         
-        if( st != set_getbool( &irc->b->set, "away_devoice" ) )
+        if( st != set_getbool( &irc->set, "away_devoice" ) )
         {
                 char list[80] = "";
@@ -845 +1060 @@
         return value;
 }
-#endif
+
 
 
@@ -852 +1067 @@
    them all from some wrappers. We'll start to define some down here: */
 
-int imc_chat_msg( struct groupchat *c, char *msg, int flags )
+int imc_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags )
 {
         char *buf = NULL;
-        
-        if( ( c->ic->flags & OPT_DOES_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
+        int st;
+        
+        if( ( ic->flags & OPT_DOES_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
         {
                 buf = escape_html( msg );
@@ -862 +1078 @@
         }
         
+        st = ic->acc->prpl->buddy_msg( ic, handle, msg, flags );
+        g_free( buf );
+        
+        return st;
+}
+
+int imc_chat_msg( struct groupchat *c, char *msg, int flags )
+{
+        char *buf = NULL;
+        
+        if( ( c->ic->flags & OPT_DOES_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
+        {
+                buf = escape_html( msg );
+                msg = buf;
+        }
+        
         c->ic->acc->prpl->chat_msg( c, msg, flags );
         g_free( buf );
@@ -875 +1107 @@
         
         away = set_getstr( &ic->acc->set, "away" ) ?
-             : set_getstr( &ic->bee->set, "away" );
+             : set_getstr( &ic->irc->set, "away" );
         if( away && *away )
         {
@@ -886 +1118 @@
                 away = NULL;
                 msg = set_getstr( &ic->acc->set, "status" ) ?
-                    : set_getstr( &ic->bee->set, "status" );
+                    : set_getstr( &ic->irc->set, "status" );
         }
         

protocols/nogaim.h

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2010 Wilmer van der Gaast and others                *
+  * Copyright 2002-2004 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -87 +87 @@
         
         /* BitlBee */
-        bee_t *bee;
+        irc_t *irc;
         
         struct groupchat *groupchats;
@@ -286 +286 @@
 G_MODULE_EXPORT void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick );
 
+/* Buddy activity */
+/* To manipulate the status of a handle.
+ * - flags can be |='d with OPT_* constants. You will need at least:
+ *   OPT_LOGGED_IN and OPT_AWAY.
+ * - 'state' and 'message' can be NULL */
+G_MODULE_EXPORT void imcb_buddy_status( struct im_connection *ic, const char *handle, int flags, const char *state, const char *message );
+/* Not implemented yet! */ G_MODULE_EXPORT void imcb_buddy_times( struct im_connection *ic, const char *handle, time_t login, time_t idle );
+/* Call when a handle says something. 'flags' and 'sent_at may be just 0. */
+G_MODULE_EXPORT void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at );
 G_MODULE_EXPORT void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags );
-G_MODULE_EXPORT struct bee_user *imcb_buddy_by_handle( struct im_connection *ic, const char *handle );
 G_MODULE_EXPORT void imcb_clean_handle( struct im_connection *ic, char *handle );
 
@@ -312 +320 @@
 /* Actions, or whatever. */
 int imc_away_send_update( struct im_connection *ic );
+int imc_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags );
 int imc_chat_msg( struct groupchat *c, char *msg, int flags );
 

protocols/oscar/oscar.c

@@ -1190 +1190 @@
         aim_ssi_auth_reply(od->sess, od->conn, uin, 1, "");
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
-        imcb_ask_add(data->ic, uin, NULL);
+        if(imcb_find_buddy(data->ic, uin) == NULL)
+                imcb_ask_add(data->ic, uin, NULL);
         
         g_free(uin);
@@ -1951 +1952 @@
         struct oscar_data *odata = (struct oscar_data *)g->proto_data;
         if (odata->icq) {
-                /** FIXME(wilmer): Hmm, lost the ability to get away msgs here, do we care to get that back?
                 struct buddy *budlight = imcb_find_buddy(g, who);
                 if (budlight)
@@ -1957 +1957 @@
                                 if (budlight->caps & AIM_CAPS_ICQSERVERRELAY)
                                         aim_send_im_ch2_geticqmessage(odata->sess, who, (budlight->uc & 0xff80) >> 7);
-                */
         } else
                 aim_getinfo(odata->sess, odata->conn, who, AIM_GETINFO_AWAYMESSAGE);
@@ -2095 +2094 @@
                 switch (curitem->type) {
                         case 0x0000: /* Buddy */
-                                if ((curitem->name) && (!imcb_buddy_by_handle(ic, nrm))) {
+                                if ((curitem->name) && (!imcb_find_buddy(ic, nrm))) {
                                         char *realname = NULL;
 

root_commands.c

@@ -32 +32 @@
 #include <string.h>
 
-void root_command_string( irc_t *irc, char *command )
+void root_command_string( irc_t *irc, user_t *u, char *command, int flags )
 {
         char *cmd[IRC_MAX_ARGS];
@@ -161 +161 @@
                 irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "+R", 1 );
-                if( set_getbool( &irc->b->set, "auto_connect" ) )
+                if( set_getbool( &irc->set, "auto_connect" ) )
                         cmd_account( irc, account_on );
                 break;
@@ -201 +201 @@
         storage_status_t status;
         
-        status = storage_remove (irc->user->nick, cmd[1]);
+        status = storage_remove (irc->nick, cmd[1]);
         switch (status) {
         case STORAGE_NO_SUCH_USER:
@@ -213 +213 @@
                 irc->status &= ~USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "-R", 1 );
-                irc_usermsg( irc, "Account `%s' removed", irc->user->nick );
+                irc_usermsg( irc, "Account `%s' removed", irc->nick );
                 break;
         default:
@@ -221 +221 @@
 }
 
-static void cmd_save( irc_t *irc, char **cmd )
-{
-        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
-                irc_usermsg( irc, "Configuration could not be saved!" );
-}
-
 struct cmd_account_del_data
 {
@@ -242 +232 @@
         account_t *a;
         
-        for( a = cad->irc->b->accounts; a && a != cad->a; a = a->next );
+        for( a = cad->irc->accounts; a && a != cad->a; a = a->next );
         
         if( a == NULL )
@@ -254 +244 @@
         else
         {
-                account_del( cad->irc->b, a );
+                account_del( cad->irc, a );
                 irc_usermsg( cad->irc, "Account deleted" );
         }
@@ -295 +285 @@
                 set_name = set_full;
                 
-                head = &irc->b->set;
+                head = &irc->set;
         }
         else 
@@ -366 +356 @@
         account_t *a;
         
-        if( ( a = account_get( irc->b, id ) ) )
+        if( ( a = account_get( irc, id ) ) )
                 return &a->set;
         else
@@ -414 +404 @@
                 }
 
-                a = account_add( irc->b, prpl, cmd[3], cmd[4] );
+                a = account_add( irc, prpl, cmd[3], cmd[4] );
                 if( cmd[5] )
                 {
@@ -428 +418 @@
                 MIN_ARGS( 2 );
 
-                if( !( a = account_get( irc->b, cmd[2] ) ) )
+                if( !( a = account_get( irc, cmd[2] ) ) )
                 {
                         irc_usermsg( irc, "Invalid account" );
@@ -450 +440 @@
                                                "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, cad );
+                        query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, cad );
                         g_free( msg );
                 }
@@ -461 +451 @@
                         irc_usermsg( irc, "Account list:" );
                 
-                for( a = irc->b->accounts; a; a = a->next )
+                for( a = irc->accounts; a; a = a->next )
                 {
                         char *con;
@@ -484 +474 @@
                 if( cmd[2] )
                 {
-                        if( ( a = account_get( irc->b, cmd[2] ) ) )
+                        if( ( a = account_get( irc, cmd[2] ) ) )
                         {
                                 if( a->ic )
@@ -493 +483 @@
                                 else
                                 {
-                                        account_on( irc->b, a );
+                                        account_on( irc, a );
                                 }
                         }
@@ -504 +494 @@
                 else
                 {
-                        if ( irc->b->accounts )
-                        {
+                        if ( irc->accounts ) {
                                 irc_usermsg( irc, "Trying to get all accounts connected..." );
                         
-                                for( a = irc->b->accounts; a; a = a->next )
+                                for( a = irc->accounts; a; a = a->next )
                                         if( !a->ic && a->auto_connect )
-                                                account_on( irc->b, a );
+                                                account_on( irc, a );
                         } 
                         else
@@ -524 +513 @@
                         irc_usermsg( irc, "Deactivating all active (re)connections..." );
                         
-                        for( a = irc->b->accounts; a; a = a->next )
+                        for( a = irc->accounts; a; a = a->next )
                         {
                                 if( a->ic )
-                                        account_off( irc->b, a );
+                                        account_off( irc, a );
                                 else if( a->reconnect )
                                         cancel_auto_reconnect( a );
                         }
                 }
-                else if( ( a = account_get( irc->b, cmd[2] ) ) )
+                else if( ( a = account_get( irc, cmd[2] ) ) )
                 {
                         if( a->ic )
                         {
-                                account_off( irc->b, a );
+                                account_off( irc, a );
                         }
                         else if( a->reconnect )
@@ -567 +556 @@
 }
 
-#if 0
 static void cmd_add( irc_t *irc, char **cmd )
 {
@@ -656 +644 @@
         }
 }
-#endif
 
 static void cmd_rename( irc_t *irc, char **cmd )
 {
-        irc_user_t *iu;
-        
-        iu = irc_user_by_name( irc, cmd[1] );
-        
-        if( iu == NULL )
+        user_t *u;
+        
+        if( g_strcasecmp( cmd[1], irc->nick ) == 0 )
+        {
+                irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] );
+        }
+        else if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
+        {
+                if( strchr( CTYPES, cmd[2][0] ) && nick_ok( cmd[2] + 1 ) )
+                {
+                        u = user_find( irc, irc->nick );
+                        
+                        irc_part( irc, u, irc->channel );
+                        g_free( irc->channel );
+                        irc->channel = g_strdup( cmd[2] );
+                        irc_join( irc, u, irc->channel );
+                        
+                        if( strcmp( cmd[0], "set_rename" ) != 0 )
+                                set_setstr( &irc->set, "control_channel", cmd[2] );
+                }
+        }
+        else if( user_find( irc, cmd[2] ) && ( nick_cmp( cmd[1], cmd[2] ) != 0 ) )
+        {
+                irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );
+        }
+        else if( !nick_ok( cmd[2] ) )
+        {
+                irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
+        }
+        else if( !( u = user_find( irc, cmd[1] ) ) )
         {
                 irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
         }
-        else if( iu == irc->user )
-        {
-                irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] );
-        }
-        else if( !nick_ok( cmd[2] ) )
-        {
-                irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
-        }
-        else if( irc_user_by_name( irc, cmd[2] ) )
-        {
-                irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );
-        }
-        else
-        {
-                if( !irc_user_set_nick( iu, cmd[2] ) )
-                {
-                        irc_usermsg( irc, "Error while changing nick" );
-                        return;
-                }
-                
-                if( iu == irc->root )
-                {
+        else
+        {
+                user_rename( irc, cmd[1], cmd[2] );
+                irc_write( irc, ":%s!%s@%s NICK %s", cmd[1], u->user, u->host, cmd[2] );
+                if( g_strcasecmp( cmd[1], irc->mynick ) == 0 )
+                {
+                        g_free( irc->mynick );
+                        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->b->set, "root_nick", cmd[2] );
-                }
-                else if( iu->bu )
-                {
-                        nick_set( iu->bu->ic->acc, iu->bu->handle, cmd[2] );
+                                set_setstr( &irc->set, "root_nick", cmd[2] );
+                }
+                else if( u->send_handler == buddy_send_handler )
+                {
+                        nick_set( u->ic->acc, u->handle, cmd[2] );
                 }
                 
@@ -704 +703 @@
 }
 
-#if 0
 char *set_eval_root_nick( set_t *set, char *new_nick )
 {
@@ -915 +913 @@
 {
         cmd_set_real( irc, cmd, NULL, NULL );
+}
+
+static void cmd_save( irc_t *irc, char **cmd )
+{
+        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
+                irc_usermsg( irc, "Configuration could not be saved!" );
 }
 
@@ -982 +990 @@
 }
 
+static void cmd_nick( irc_t *irc, char **cmd ) 
+{
+        account_t *a;
+
+        if( !cmd[1] || !( a = account_get( irc, cmd[1] ) ) )
+        {
+                irc_usermsg( irc, "Invalid account");
+        }
+        else if( !( a->ic && ( a->ic->flags & OPT_LOGGED_IN ) ) )
+        {
+                irc_usermsg( irc, "That account is not on-line" );
+        }
+        else if ( !cmd[2] ) 
+        {
+                irc_usermsg( irc, "Your name is `%s'" , a->ic->displayname ? a->ic->displayname : "NULL" );
+        }
+        else if ( !a->prpl->set_my_name ) 
+        {
+                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+        }
+        else
+        {
+                irc_usermsg( irc, "Setting your name to `%s'", cmd[2] );
+                
+                a->prpl->set_my_name( a->ic, cmd[2] );
+        }
+}
+
 static void cmd_qlist( irc_t *irc, char **cmd )
 {
@@ -1000 +1036 @@
                 else
                         irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
+}
+
+static void cmd_join_chat( irc_t *irc, char **cmd )
+{
+        irc_usermsg( irc, "This command is now obsolete. "
+                          "Please try the `chat' command instead." );
 }
 
@@ -1175 +1217 @@
         }
 }
-#endif
 
 const command_t commands[] = {
         { "help",           0, cmd_help,           0 }, 
-        { "account",        1, cmd_account,        0 },
         { "identify",       1, cmd_identify,       0 },
         { "register",       1, cmd_register,       0 },
         { "drop",           1, cmd_drop,           0 },
-        { "save",           0, cmd_save,           0 },
-#if 0
+        { "account",        1, cmd_account,        0 },
         { "add",            2, cmd_add,            0 },
         { "info",           1, cmd_info,           0 },
-#endif
         { "rename",         2, cmd_rename,         0 },
-#if 0
         { "remove",         1, cmd_remove,         0 },
         { "block",          1, cmd_block,          0 },
         { "allow",          1, cmd_allow,          0 },
+        { "save",           0, cmd_save,           0 },
         { "set",            0, cmd_set,            0 },
         { "yes",            0, cmd_yesno,          0 },
@@ -1202 +1240 @@
         { "chat",           1, cmd_chat,           0 },
         { "transfer",       0, cmd_transfer,       0 },
-#endif
         { NULL }
 };

set.c

@@ -225 +225 @@
 }
 
-/*
 char *set_eval_ops( set_t *set, char *value )
 {
@@ -247 +246 @@
         return value;
 }
-*/

storage_xml.c

@@ -147 +147 @@
                                          arc_decode( pass_cr, pass_len, &password, xd->given_pass ) )
                 {
-                        xd->current_account = account_add( irc->b, prpl, handle, password );
+                        xd->current_account = account_add( irc, prpl, handle, password );
                         if( server )
                                 set_setstr( &xd->current_account->set, "server", server );
@@ -181 +181 @@
                                 xd->current_set_head = &xd->current_account->set;
                         else
-                                xd->current_set_head = &xd->irc->b->set;
+                                xd->current_set_head = &xd->irc->set;
                         
                         xd->current_setting = g_strdup( setting );
@@ -215 +215 @@
                 if( xd->current_account && handle && channel )
                 {
-                        //xd->current_chat = chat_add( xd->irc, xd->current_account, handle, channel );
+                        xd->current_chat = chat_add( xd->irc, xd->current_account, handle, channel );
                 }
                 else
@@ -353 +353 @@
 static storage_status_t xml_load( irc_t *irc, const char *password )
 {
-        return xml_load_real( irc, irc->user->nick, password, XML_PASS_UNKNOWN );
+        return xml_load_real( irc, irc->nick, password, XML_PASS_UNKNOWN );
 }
 
@@ -396 +396 @@
         md5_state_t md5_state;
         
-        path2 = g_strdup( irc->user->nick );
+        path2 = g_strdup( irc->nick );
         nick_lc( path2 );
         g_snprintf( path, sizeof( path ) - 2, "%s%s%s", global.conf->configdir, path2, ".xml" );
@@ -422 +422 @@
         pass_buf = base64_encode( pass_md5, 21 );
         
-        if( !xml_printf( fd, 0, "<user nick=\"%s\" password=\"%s\" version=\"%d\">\n", irc->user->nick, pass_buf, XML_FORMAT_VERSION ) )
+        if( !xml_printf( fd, 0, "<user nick=\"%s\" password=\"%s\" version=\"%d\">\n", irc->nick, pass_buf, XML_FORMAT_VERSION ) )
                 goto write_error;
         
         g_free( pass_buf );
         
-        for( set = irc->b->set; set; set = set->next )
+        for( set = irc->set; set; set = set->next )
                 if( set->value )
                         if( !xml_printf( fd, 1, "<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
                                 goto write_error;
         
-        for( acc = irc->b->accounts; acc; acc = acc->next )
+        for( acc = irc->accounts; acc; acc = acc->next )
         {
                 unsigned char *pass_cr;
@@ -470 +470 @@
                         goto write_error;
                 
-#if 0
                 for( c = irc->chatrooms; c; c = c->next )
                 {
@@ -489 +488 @@
                                 goto write_error;
                 }
-#endif
                 
                 if( !xml_printf( fd, 1, "</account>\n" ) )