Changes in / [96ace1b:728a981]

Files:

• .bzrignore (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (2 diffs)
• help.c (modified) (3 diffs)
• ipc.c (modified) (1 diff)
• irc.c (modified) (1 diff)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (2 diffs)
• protocols/msn/msn.h (modified) (1 diff)
• protocols/msn/msn_util.c (modified) (1 diff)
• protocols/msn/ns.c (modified) (6 diffs)
• protocols/msn/sb.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (11 diffs)
• protocols/oscar/oscar.c (modified) (4 diffs)
• protocols/ssl_openssl.c (modified) (8 diffs)
• query.c (modified) (2 diffs)
• root_commands.c (modified) (4 diffs)
• user.h (modified) (1 diff)

.bzrignore

@@ -11 +11 @@
 encode
 bitlbee.pc
+.gdb_history

doc/user-guide/commands.xml

@@ -197 +197 @@
                 <syntax>block &lt;nick&gt;</syntax>
                 <syntax>block &lt;connection&gt; &lt;handle&gt;</syntax>
+                <syntax>block &lt;connection&gt;</syntax>
 
                 <description>
                         <para>
                                 Puts the specified user on your ignore list. Either specify the user's nick when you have him/her in your contact list or a connection number and a user handle.
+                        </para>
+                        
+                        <para>
+                                When called with only a connection specification as an argument, the command displays the current block list for that connection.
                         </para>
                 </description>
@@ -214 +219 @@
                                 Reverse of block. Unignores the specified user or user handle on specified connection.
                         </para>
+                        
+                        <para>
+                                When called with only a connection specification as an argument, the command displays the current allow list for that connection.
+                        </para>
                 </description>
         </bitlbee-command>

help.c

@@ -116 +116 @@
                 h = h->next;
         }
-        if( h )
+        if( h && h->length > 0 )
         {
                 char *s = g_new( char, h->length + 1 );
@@ -123 +123 @@
                 {
                         g_free( h );
-                        *help=NULL;
-                        return( NULL );
+                        *help = NULL;
+                        return NULL;
                 }
                 mtime = stat->st_mtime;
                 
-                if( mtime > h->mtime ) {
-                        return( NULL );
-                        return( g_strdup( "Help file changed during this session. Please restart to get help back." ) );
-                }
+                if( mtime > h->mtime )
+                        return NULL;
+                
                 s[h->length] = 0;
                 if( h->fd >= 0 )
@@ -142 +141 @@
                         strncpy( s, h->offset.mem_offset, h->length );
                 }
-                return( s );
+                return s;
         }
         
-        return( NULL );
+        return NULL;
 }

ipc.c

@@ -84 +84 @@
 void ipc_master_cmd_restart( irc_t *data, char **cmd )
 {
-        struct bitlbee_child *child = (void*) data;
-        
         if( global.conf->runmode != RUNMODE_FORKDAEMON )
         {

irc.c

@@ -232 +232 @@
         irc_connection_list = g_slist_remove( irc_connection_list, irc );
         
-        for (account = irc->accounts; account; account = account->next)
+        for (account = irc->accounts; account; account = account->next) {
                 if (account->gc)
-                        signoff(account->gc);
+                        account_offline(account->gc);
+                else if (account->reconnect)
+                        g_source_remove(account->reconnect);
+        }
         
         g_free(irc->sendbuffer);

irc.h

@@ -33 +33 @@
 #define IRC_PING_STRING "PinglBee"
 
-#define UMODES "iasw"
+#define UMODES "abisw"
 #define UMODES_PRIV "Ro"
 #define CMODES "nt"

irc_commands.c

@@ -509 +509 @@
         irc->last_pong = gettime();
         irc->pinging = 0;
+}
+
+static void irc_cmd_version( irc_t *irc, char **cmd )
+{
+        irc_reply( irc, 351, "bitlbee-%s. %s :%s/%s ", BITLBEE_VERSION, irc->myhost, ARCH, CPU );
 }
 
@@ -568 +573 @@
         { "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 },
         { "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },

protocols/jabber/jabber.c

@@ -1232 +1232 @@
         }
 
-        x = jutil_presnew(0, NULL, "Online");
-        gjab_send(gjc, x);
-        xmlnode_free(x);
+        account_online(GJ_GC(gjc));
 }
 
@@ -1250 +1248 @@
                 } else {
                         gjab_reqroster(gjc);
-                        account_online(GJ_GC(gjc));
                         
                         ((struct jabber_data *)GJ_GC(gjc)->proto_data)->did_import = TRUE;

protocols/msn/msn.h

@@ -66 +66 @@
         GSList *msgq;
         GSList *switchboards;
+        const struct msn_away_state *away_state;
+        
         int buddycount;
-        const struct msn_away_state *away_state;
+        int groupcount;
+        char **grouplist;
 };
 

protocols/msn/msn_util.c

@@ -46 +46 @@
 int msn_logged_in( struct gaim_connection *gc )
 {
-        struct msn_data *md = gc->proto_data;
-        char buf[1024];
-        
         account_online( gc );
-        
-        /* account_online() sets an away state if there is any, so only
-           execute this code if we're not away. */
-        if( md->away_state == msn_away_state_list )
-        {
-                g_snprintf( buf, sizeof( buf ), "CHG %d %s %d\r\n", ++md->trId, md->away_state->code, 0 );
-                return( msn_write( gc, buf, strlen( buf ) ) );
-        }
         
         return( 0 );

protocols/msn/ns.c

@@ -257 +257 @@
                 {
                         md->buddycount = atoi( cmd[3] );
+                        md->groupcount = atoi( cmd[4] );
+                        if( md->groupcount > 0 )
+                                md->grouplist = g_new0( char *, md->groupcount );
                         
                         if( !*cmd[3] || md->buddycount == 0 )
@@ -269 +272 @@
                 }
         }
-        else if( strcmp( cmd[0], "GTC" ) == 0 )
-        {
-        }
-        else if( strcmp( cmd[0], "BLP" ) == 0 )
-        {
-        }
-        else if( strcmp( cmd[0], "PRP" ) == 0 )
-        {
-        }
-        else if( strcmp( cmd[0], "LSG" ) == 0 )
-        {
-        }
         else if( strcmp( cmd[0], "LST" ) == 0 )
         {
@@ -297 +288 @@
                 if( list & 1 ) /* FL */
                 {
-                        add_buddy( gc, NULL, cmd[1], cmd[2] );
+                        char *group = NULL;
+                        int num;
+                        
+                        if( cmd[4] != NULL && sscanf( cmd[4], "%d", &num ) == 1 )
+                                group = md->grouplist[num];
+                        
+                        add_buddy( gc, group, cmd[1], cmd[2] );
                 }
                 if( list & 2 ) /* AL */
@@ -327 +324 @@
                 }
         }
-        else if( strcmp( cmd[0], "BPR" ) == 0 )
-        {
-        }
-        else if( strcmp( cmd[0], "CHG" ) == 0 )
-        {
+        else if( strcmp( cmd[0], "LSG" ) == 0 )
+        {
+                int num;
+                
+                if( num_parts != 4 )
+                {
+                        hide_login_progress_error( gc, "Syntax error" );
+                        signoff( gc );
+                        return( 0 );
+                }
+                
+                http_decode( cmd[2] );
+                num = atoi( cmd[1] );
+                
+                if( num < md->groupcount )
+                        md->grouplist[num] = g_strdup( cmd[2] );
         }
         else if( strcmp( cmd[0], "CHL" ) == 0 )
@@ -357 +365 @@
                 return( msn_write( gc, buf, strlen( buf ) ) );
         }
-        else if( strcmp( cmd[0], "QRY" ) == 0 )
-        {
-        }
-        else if( strcmp( cmd[0], "QNG" ) == 0 )
-        {
-        }
         else if( strcmp( cmd[0], "ILN" ) == 0 )
         {
@@ -478 +480 @@
                         msn_buddy_ask( gc, cmd[4], cmd[5] );
                 }
-        }
-        else if( strcmp( cmd[0], "REM" ) == 0 )
-        {
         }
         else if( strcmp( cmd[0], "OUT" ) == 0 )

protocols/msn/sb.c

@@ -202 +202 @@
         debug( "Destroying switchboard: %s", sb->who ? sb->who : sb->key ? sb->key : "" );
         
-        if( sb->key ) g_free( sb->key );
-        if( sb->who ) g_free( sb->who );
-        
         if( sb->msgq )
         {
@@ -222 +219 @@
                 serv_got_crap( gc, "Warning: Closing down MSN switchboard connection with "
                                    "unsent message to %s, you'll have to resend it.",
-                                   m->who ? m->who : "(unknown)" );
-        }
+                                   sb->who ? sb->who : "(unknown)" );
+        }
+        
+        if( sb->key ) g_free( sb->key );
+        if( sb->who ) g_free( sb->who );
         
         if( sb->chat )

protocols/nogaim.c

@@ -14 +14 @@
  * (except for the function names).
  *
- * Copyright 2002-2004 Wilmer van der Gaast <lintux@lintux.cx>
+ * Copyright 2002-2006 Wilmer van der Gaast <wilmer@gaast.net> and others
  */
 
@@ -39 +39 @@
 #include <iconv.h>
 
-static char *proto_away_alias[7][5] =
+static char *proto_away_alias[8][5] =
 {
         { "Away from computer", "Away", "Extended away", NULL },
@@ -47 +47 @@
         { "On the phone", "Phone", "On phone", NULL },
         { "Out to lunch", "Lunch", "Food", NULL },
+        { "Invisible", "Hidden" },
         { NULL }
 };
@@ -305 +306 @@
 {
         va_list params;
-        char text[1024], buf[1024], acc_id[33];
+        char text[1024], buf[1024], *acc_id;
         char *msg;
         account_t *a;
@@ -330 +331 @@
         /* If we found one, add the screenname to the acc_id. */
         if( a )
-                g_snprintf( acc_id, 32, "%s(%s)", gc->prpl->name, gc->username );
+                acc_id = g_strdup_printf( "%s(%s)", gc->prpl->name, gc->username );
         else
-                g_snprintf( acc_id, 32, "%s", gc->prpl->name );
+                acc_id = g_strdup( gc->prpl->name );
         
         irc_usermsg( gc->irc, "%s - %s", acc_id, msg );
+        
+        g_free( acc_id );
 }
 
@@ -352 +355 @@
         
         /* MSN servers sometimes redirect you to a different server and do
-           the whole login sequence again, so subsequent calls to this
+           the whole login sequence again, so these "late" calls to this
            function should be handled correctly. (IOW, ignored) */
         if( gc->flags & OPT_LOGGED_IN )
@@ -364 +367 @@
         gc->flags |= OPT_LOGGED_IN;
         
-        if( u && u->away ) proto_away( gc, u->away );
-        
-        if( !strcmp(gc->prpl->name, "icq") )
+        /* Also necessary when we're not away, at least for some of the
+           protocols. */
+        proto_away( gc, u->away );
+        
+        if( strcmp( gc->prpl->name, "ICQ" ) == 0 )
         {
                 for( u = gc->irc->users; u; u = u->next )
@@ -470 +475 @@
 /* list.c */
 
-int bud_list_cache_exists( struct gaim_connection *gc )
-{
-        return( 0 );
-}
-
-void do_import( struct gaim_connection *gc, void *null )
-{
-        return;
-}
-
 void add_buddy( struct gaim_connection *gc, char *group, char *handle, char *realname )
 {
@@ -531 +526 @@
         u->gc = gc;
         u->handle = g_strdup( handle );
+        if( group ) u->group = g_strdup( group );
         u->send_handler = buddy_send_handler;
         u->last_typing_notice = 0;
@@ -552 +548 @@
         
         return( b );
-}
-
-void do_export( struct gaim_connection *gc )
-{
-        return;
 }
 
@@ -882 +873 @@
         
         return( c );
-}
-
-void serv_finish_login( struct gaim_connection *gc )
-{
-        return;
 }
 

protocols/oscar/oscar.c

@@ -356 +356 @@
         if (isdigit(*user->username)) {
                 odata->icq = TRUE;
-                /* this is odd but it's necessary for a proper do_import and do_export */
+                /* This is odd but it's necessary for a proper do_import and do_export.
+                   We don't do those anymore, but let's stick with it, just in case
+                   it accidentally fixes something else too... */
                 gc->password[8] = 0;
         } else {
@@ -1148 +1150 @@
                 reason = msg + 6;
         
-        dialog_msg = g_strdup_printf("The user %u wants to add you to their buddy list for the following reason:\n\n%s", uin, reason ? reason : "No reason given.");
+        dialog_msg = g_strdup_printf("The user %u wants to add you to their buddy list for the following reason: %s", uin, reason ? reason : "No reason given.");
         data->gc = gc;
         data->uin = uin;
@@ -1737 +1739 @@
         odata->rights.maxdenies = (guint)maxdenies;
 
-//      serv_finish_login(gc);
-
-        if (bud_list_cache_exists(gc))
-                do_import(gc, NULL);
-
         aim_clientready(sess, fr->conn);
 
@@ -2096 +2093 @@
         } /* End of for loop */
 
-        if (tmp)
-                do_export(gc);
         aim_ssi_enable(sess, fr->conn);
         

protocols/ssl_openssl.c

@@ -5 +5 @@
   \********************************************************************/
 
-/* SSL module - OpenTLS version                                          */
+/* SSL module - OpenSSL version                                         */
 
 /*
@@ -41 +41 @@
 struct scd
 {
-        SslInputFunction func;
+        ssl_input_function func;
         gpointer data;
         int fd;
         gboolean established;
         
+        int inpa;
+        int lasterr;            /* Necessary for SSL_get_error */
         SSL *ssl;
         SSL_CTX *ssl_ctx;
@@ -54 +56 @@
 
 
-void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );
@@ -93 +95 @@
 }
 
+static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond );
+
 static void ssl_connected( gpointer data, gint source, GaimInputCondition cond )
 {
@@ -98 +102 @@
         
         if( source == -1 )
-                goto ssl_connected_failure;
-        
+                return ssl_handshake( data, -1, cond );
+        
+        /* Make it non-blocking at least during the handshake... */
+        sock_make_nonblocking( conn->fd );
         SSL_set_fd( conn->ssl, conn->fd );
         
-        if( SSL_connect( conn->ssl ) < 0 )
-                goto ssl_connected_failure;
+        return ssl_handshake( data, source, cond );
+}       
+
+static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond )
+{
+        struct scd *conn = data;
+        int st;
+        
+        if( conn->inpa != -1 )
+        {
+                gaim_input_remove( conn->inpa );
+                conn->inpa = -1;
+        }
+        
+        if( ( st = SSL_connect( conn->ssl ) ) < 0 )
+        {
+                conn->lasterr = SSL_get_error( conn->ssl, st );
+                if( conn->lasterr != SSL_ERROR_WANT_READ && conn->lasterr != SSL_ERROR_WANT_WRITE )
+                        goto ssl_connected_failure;
+                
+                conn->inpa = gaim_input_add( conn->fd, ssl_getdirection( conn ), ssl_handshake, data );
+                return;
+        }
         
         conn->established = TRUE;
+        sock_make_blocking( conn->fd );         /* For now... */
         conn->func( conn->data, conn, cond );
         return;
@@ -127 +155 @@
 int ssl_read( void *conn, char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
-                return( 0 );
-        
-        return( SSL_read( ((struct scd*)conn)->ssl, buf, len ) );
+        {
+                ssl_errno = SSL_NOHANDSHAKE;
+                return -1;
+        }
+        
+        st = SSL_read( ((struct scd*)conn)->ssl, buf, len );
+        
+        ssl_errno = SSL_OK;
+        if( st <= 0 )
+        {
+                ((struct scd*)conn)->lasterr = SSL_get_error( ((struct scd*)conn)->ssl, st );
+                if( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_READ || ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE )
+                        ssl_errno = SSL_AGAIN;
+        }
+        
+        return st;
 }
 
 int ssl_write( void *conn, const char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
-                return( 0 );
-        
-        return( SSL_write( ((struct scd*)conn)->ssl, buf, len ) );
+        {
+                ssl_errno = SSL_NOHANDSHAKE;
+                return -1;
+        }
+        
+        st = SSL_write( ((struct scd*)conn)->ssl, buf, len );
+        
+        ssl_errno = SSL_OK;
+        if( st <= 0 )
+        {
+                ((struct scd*)conn)->lasterr = SSL_get_error( ((struct scd*)conn)->ssl, st );
+                if( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_READ || ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE )
+                        ssl_errno = SSL_AGAIN;
+        }
+        
+        return st;
 }
 
@@ -144 +202 @@
 {
         struct scd *conn = conn_;
+        
+        if( conn->inpa != -1 )
+                gaim_input_remove( conn->inpa );
         
         if( conn->established )
@@ -159 +220 @@
         return( ((struct scd*)conn)->fd );
 }
+
+GaimInputCondition ssl_getdirection( void *conn )
+{
+        return( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE ? GAIM_INPUT_WRITE : GAIM_INPUT_READ );
+}

query.c

@@ -39 +39 @@
         q->no = no;
         q->data = data;
+        
+        if( strchr( irc->umode, 'b' ) != NULL )
+        {
+                char *s;
+                
+                /* At least for the machine-parseable version, get rid of
+                   newlines to make "parsing" easier. */
+                for( s = q->question; *s; s ++ )
+                        if( *s == '\r' || *s == '\n' )
+                                *s = ' ';
+        }
         
         if( irc->queries )
@@ -127 +138 @@
                 disp = 1;
         }
-        //Using irc_usermsg instead of serv_got_crap because \x02A is a char too, so a SPACE is needed. 
         if( ans )
         {

root_commands.c

@@ -484 +484 @@
         account_t *a;
         
-        if( !cmd[2] )
+        if( !cmd[2] && ( a = account_get( irc, cmd[1] ) ) && a->gc )
+        {
+                char *format;
+                GSList *l;
+                
+                if( strchr( irc->umode, 'b' ) != NULL )
+                        format = "%s\t%s";
+                else
+                        format = "%-32.32  %-16.16s";
+                
+                irc_usermsg( irc, format, "Handle", "Nickname" );
+                for( l = a->gc->deny; l; l = l->next )
+                {
+                        user_t *u = user_findhandle( a->gc, l->data );
+                        irc_usermsg( irc, format, l->data, u ? u->nick : "(none)" );
+                }
+                irc_usermsg( irc, "End of list." );
+                
+                return;
+        }
+        else if( !cmd[2] )
         {
                 user_t *u = user_find( irc, cmd[1] );
@@ -523 +543 @@
         account_t *a;
         
-        if( !cmd[2] )
+        if( !cmd[2] && ( a = account_get( irc, cmd[1] ) ) && a->gc )
+        {
+                char *format;
+                GSList *l;
+                
+                if( strchr( irc->umode, 'b' ) != NULL )
+                        format = "%s\t%s";
+                else
+                        format = "%-32.32  %-16.16s";
+                
+                irc_usermsg( irc, format, "Handle", "Nickname" );
+                for( l = a->gc->deny; l; l = l->next )
+                {
+                        user_t *u = user_findhandle( a->gc, l->data );
+                        irc_usermsg( irc, format, l->data, u ? u->nick : "(none)" );
+                }
+                irc_usermsg( irc, "End of list." );
+                
+                return;
+        }
+        else if( !cmd[2] )
         {
                 user_t *u = user_find( irc, cmd[1] );
@@ -635 +675 @@
         int online = 0, away = 0, offline = 0;
         user_t *u;
-        char s[64];
+        char s[256];
+        char *format;
         int n_online = 0, n_away = 0, n_offline = 0;
         
@@ -649 +690 @@
                 online =  away = 1;
         
-        irc_usermsg( irc, "%-16.16s  %-40.40s  %s", "Nick", "User/Host/Network", "Status" );
-        
-        if( online == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && u->online && !u->away )
-        {
-                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
-                irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, "Online" );
+        if( strchr( irc->umode, 'b' ) != NULL )
+                format = "%s\t%s\t%s";
+        else
+                format = "%-16.16s  %-40.40s  %s";
+        
+        irc_usermsg( irc, format, "Nick", "User/Host/Network", "Status" );
+        
+        for( u = irc->users; u; u = u->next ) if( u->gc && u->online && !u->away )
+        {
+                if( online == 1 )
+                {
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        irc_usermsg( irc, format, u->nick, s, "Online" );
+                }
+                
                 n_online ++;
         }
 
-        if( away == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && u->online && u->away )
-        {
-                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
-                irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, u->away );
+        for( u = irc->users; u; u = u->next ) if( u->gc && u->online && u->away )
+        {
+                if( away == 1 )
+                {
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        irc_usermsg( irc, format, u->nick, s, u->away );
+                }
                 n_away ++;
         }
         
-        if( offline == 1 ) for( u = irc->users; u; u = u->next ) if( u->gc && !u->online )
-        {
-                g_snprintf( s, 63, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
-                irc_usermsg( irc, "%-16.16s  %-40.40s  %s", u->nick, s, "Offline" );
+        for( u = irc->users; u; u = u->next ) if( u->gc && !u->online )
+        {
+                if( offline == 1 )
+                {
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->gc->user->prpl->name );
+                        irc_usermsg( irc, format, u->nick, s, "Offline" );
+                }
                 n_offline ++;
         }

user.h

@@ -37 +37 @@
         
         char *handle;
+        char *group;
         struct gaim_connection *gc;