Changes in / [568aaf7:703f0f7]

Files:

• .bzrignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• bitlbee.c (modified) (2 diffs)
• bitlbee.h (modified) (4 diffs)
• commands.c (modified) (5 diffs)
• conf.c (modified) (2 diffs)
• conf.h (modified) (1 diff)
• crypting.c (modified) (11 diffs)
• crypting.h (modified) (1 diff)
• irc.c (modified) (4 diffs)
• irc.h (modified) (1 diff)
• nick.c (modified) (6 diffs)
• nick.h (modified) (1 diff)
• protocols/msn/sb.c (modified) (1 diff)
• protocols/nogaim.c (modified) (2 diffs)
• protocols/nogaim.h (modified) (1 diff)
• protocols/oscar/aim.h (modified) (2 diffs)
• protocols/oscar/chat.c (modified) (1 diff)
• protocols/oscar/im.c (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (8 diffs)
• protocols/oscar/tlv.c (modified) (1 diff)
• protocols/proxy.c (modified) (6 diffs)
• protocols/proxy.h (modified) (1 diff)
• protocols/yahoo/yahoo.c (modified) (1 diff)
• storage.c (added)
• storage.h (added)
• storage_text.c (added)
• unix.c (modified) (3 diffs)

.bzrignore

@@ -8 +8 @@
 build-arch-stamp
 tags
+decode
+encode

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o unix.o url.o user.o
+objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o unix.o url.o user.o storage_text.o storage.o
 subdirs = protocols
 

bitlbee.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "commands.h"
-#include "crypting.h"
 #include "protocols/nogaim.h"
 #include "help.h"
@@ -244 +243 @@
 }
 
-/* DO NOT USE THIS FUNCTION IN NEW CODE. This 
- * function is here merely because the save/load code still uses 
- * ids rather then names */
-static struct prpl *find_protocol_by_id(int id)
-{
-        switch (id) {
-        case 1: return find_protocol("oscar");
-        case 4: return find_protocol("msn");
-        case 2: return find_protocol("yahoo");
-        case 8: return find_protocol("jabber");
-        default: break;
-        }
-        return NULL;
-}
-
-static int find_protocol_id(const char *name)
-{
-        if (!strcmp(name, "oscar")) return 1;
-        if (!strcmp(name, "msn")) return 4;
-        if (!strcmp(name, "yahoo")) return 2;
-        if (!strcmp(name, "jabber")) return 8;
-
-        return -1;
-}
-
-int bitlbee_load( irc_t *irc, char* password )
-{
-        char s[512];
-        char *line;
-        int proto;
-        char nick[MAX_NICK_LENGTH+1];
-        FILE *fp;
-        user_t *ru = user_find( irc, ROOT_NICK );
-        
-        if( irc->status == USTATUS_IDENTIFIED )
-                return( 1 );
-        
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
-        fp = fopen( s, "r" );
-        if( !fp ) return( 0 );
-        
-        fscanf( fp, "%32[^\n]s", s );
-        if( setpass( irc, password, s ) < 0 )
-        {
-                fclose( fp );
-                return( -1 );
-        }
-        
-        /* Do this now. If the user runs with AuthMode = Registered, the
-           account command will not work otherwise. */
-        irc->status = USTATUS_IDENTIFIED;
-        
-        while( fscanf( fp, "%511[^\n]s", s ) > 0 )
-        {
-                fgetc( fp );
-                line = deobfucrypt( irc, s );
-                root_command_string( irc, ru, line, 0 );
-                g_free( line );
-        }
-        fclose( fp );
-        
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
-        fp = fopen( s, "r" );
-        if( !fp ) return( 0 );
-        while( fscanf( fp, "%s %d %s", s, &proto, nick ) > 0 )
-        {
-                struct prpl *prpl;
-
-                prpl = find_protocol_by_id(proto);
-
-                if (!prpl)
-                        continue;
-
-                http_decode( s );
-                nick_set( irc, s, prpl, nick );
-        }
-        fclose( fp );
-        
-        if( set_getint( irc, "auto_connect" ) )
-        {
-                strcpy( s, "account on" );      /* Can't do this directly because r_c_s alters the string */
-                root_command_string( irc, ru, s, 0 );
-        }
-        
-        return( 1 );
-}
-
-int bitlbee_save( irc_t *irc )
-{
-        char s[512];
-        char path[512], new_path[512];
-        char *line;
-        nick_t *n;
-        set_t *set;
-        mode_t ou = umask( 0077 );
-        account_t *a;
-        FILE *fp;
-        char *hash;
-        
-        /*\
-         *  [SH] Nothing should be saved if no password is set, because the
-         *  password is not set if it was wrong, or if one is not identified
-         *  yet. This means that a malicious user could easily overwrite
-         *  files owned by someone else:
-         *  a Bad Thing, methinks
-        \*/
-
-        /* [WVG] No? Really? */
-
-        /*\
-         *  [SH] Okay, okay, it wasn't really Wilmer who said that, it was
-         *  me. I just thought it was funny.
-        \*/
-        
-        hash = hashpass( irc );
-        if( hash == NULL )
-        {
-                irc_usermsg( irc, "Please register yourself if you want to save your settings." );
-                return( 0 );
-        }
-        
-        g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks~" );
-        fp = fopen( path, "w" );
-        if( !fp ) return( 0 );
-        for( n = irc->nicks; n; n = n->next )
-        {
-                strcpy( s, n->handle );
-                s[169] = 0; /* Prevent any overflow (169 ~ 512 / 3) */
-                http_encode( s );
-                g_snprintf( s + strlen( s ), 510 - strlen( s ), " %d %s", find_protocol_id(n->proto->name), n->nick );
-                if( fprintf( fp, "%s\n", s ) != strlen( s ) + 1 )
-                {
-                        irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
-                        fclose( fp );
-                        return( 0 );
-                }
-        }
-        if( fclose( fp ) != 0 )
-        {
-                irc_usermsg( irc, "fclose() reported an error. Disk full?" );
-                return( 0 );
-        }
-  
-        g_snprintf( new_path, 512, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
-        if( unlink( new_path ) != 0 )
-        {
-                if( errno != ENOENT )
-                {
-                        irc_usermsg( irc, "Error while removing old .nicks file" );
-                        return( 0 );
-                }
-        }
-        if( rename( path, new_path ) != 0 )
-        {
-                irc_usermsg( irc, "Error while renaming new .nicks file" );
-                return( 0 );
-        }
-        
-        g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts~" );
-        fp = fopen( path, "w" );
-        if( !fp ) return( 0 );
-        if( fprintf( fp, "%s", hash ) != strlen( hash ) )
-        {
-                irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
-                fclose( fp );
-                return( 0 );
-        }
-        g_free( hash );
-
-        for( a = irc->accounts; a; a = a->next )
-        {
-                if( !strcmp( a->prpl->name, "oscar" ) )
-                        g_snprintf( s, sizeof( s ), "account add oscar \"%s\" \"%s\" %s", a->user, a->pass, a->server );
-                else
-                        g_snprintf( s, sizeof( s ), "account add %s \"%s\" \"%s\" \"%s\"",
-                                    a->prpl->name, a->user, a->pass, a->server ? a->server : "" );
-                
-                line = obfucrypt( irc, s );
-                if( *line )
-                {
-                        if( fprintf( fp, "%s\n", line ) != strlen( line ) + 1 )
-                        {
-                                irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
-                                fclose( fp );
-                                return( 0 );
-                        }
-                }
-                g_free( line );
-        }
-        
-        for( set = irc->set; set; set = set->next )
-        {
-                if( set->value && set->def )
-                {
-                        g_snprintf( s, sizeof( s ), "set %s \"%s\"", set->key, set->value );
-                        line = obfucrypt( irc, s );
-                        if( *line )
-                        {
-                                if( fprintf( fp, "%s\n", line ) != strlen( line ) + 1 )
-                                {
-                                        irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
-                                        fclose( fp );
-                                        return( 0 );
-                                }
-                        }
-                        g_free( line );
-                }
-        }
-        
-        if( strcmp( irc->mynick, ROOT_NICK ) != 0 )
-        {
-                g_snprintf( s, sizeof( s ), "rename %s %s", ROOT_NICK, irc->mynick );
-                line = obfucrypt( irc, s );
-                if( *line )
-                {
-                        if( fprintf( fp, "%s\n", line ) != strlen( line ) + 1 )
-                        {
-                                irc_usermsg( irc, "fprintf() wrote too little. Disk full?" );
-                                fclose( fp );
-                                return( 0 );
-                        }
-                }
-                g_free( line );
-        }
-        if( fclose( fp ) != 0 )
-        {
-                irc_usermsg( irc, "fclose() reported an error. Disk full?" );
-                return( 0 );
-        }
-        
-        g_snprintf( new_path, 512, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
-        if( unlink( new_path ) != 0 )
-        {
-                if( errno != ENOENT )
-                {
-                        irc_usermsg( irc, "Error while removing old .accounts file" );
-                        return( 0 );
-                }
-        }
-        if( rename( path, new_path ) != 0 )
-        {
-                irc_usermsg( irc, "Error while renaming new .accounts file" );
-                return( 0 );
-        }
-        
-        umask( ou );
-        
-        return( 1 );
-}
-
 void bitlbee_shutdown( gpointer data )
 {

bitlbee.h

@@ -30 +30 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.0"
+#define BITLBEE_VERSION "BZR"
 #define VERSION BITLBEE_VERSION
 
@@ -100 +100 @@
 
 #include "irc.h"
+#include "storage.h"
 #include "set.h"
 #include "protocols/nogaim.h"
@@ -115 +116 @@
         help_t *help;
         conf_t *conf;
+        GList *storage; /* The first backend in the list will be used for saving */
         char *helpfile;
         GMainLoop *loop;
@@ -127 +129 @@
 int root_command_string( irc_t *irc, user_t *u, char *command, int flags );
 int root_command( irc_t *irc, char *command[] );
-int bitlbee_load( irc_t *irc, char *password );
-int bitlbee_save( irc_t *irc );
 void bitlbee_shutdown( gpointer data );
 double gettime( void );

commands.c

@@ -86 +86 @@
 int cmd_identify( irc_t *irc, char **cmd )
 {
-        int checkie = bitlbee_load( irc, cmd[1] );
-        
-        if( checkie == -1 )
-        {
+        storage_status_t status = storage_load( irc->nick, cmd[1], irc );
+        
+        switch (status) {
+        case STORAGE_INVALID_PASSWORD:
                 irc_usermsg( irc, "Incorrect password" );
-        }
-        else if( checkie == 0 )
-        {
+                break;
+        case STORAGE_NO_SUCH_USER:
                 irc_usermsg( irc, "The nick is (probably) not registered" );
-        }
-        else if( checkie == 1 )
-        {
+                break;
+        case STORAGE_OK:
                 irc_usermsg( irc, "Password accepted" );
-        }
-        else
-        {
+                break;
+        default:
                 irc_usermsg( irc, "Something very weird happened" );
-        }
-        
+                break;
+        }
+
         return( 0 );
 }
@@ -110 +108 @@
 int cmd_register( irc_t *irc, char **cmd )
 {
-        int checkie;
-        char path[512];
-        
         if( global.conf->authmode == AUTHMODE_REGISTERED )
         {
@@ -118 +113 @@
                 return( 0 );
         }
-        
-        g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
-        checkie = access( path, F_OK );
-        
-        g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
-        checkie += access( path, F_OK );
-        
-        if( checkie == -2 )
-        {
-                setpassnc( irc, cmd[1] );
-                root_command_string( irc, user_find( irc, irc->mynick ), "save", 0 );
-                irc->status = USTATUS_IDENTIFIED;
-        }
-        else
-        {
-                irc_usermsg( irc, "Nick is already registered" );
+
+        irc_setpass( irc, cmd[1] );
+        switch( storage_save( irc, FALSE )) {
+                case STORAGE_ALREADY_EXISTS:
+                        irc_usermsg( irc, "Nick is already registered" );
+                        break;
+                        
+                case STORAGE_OK:
+                        irc->status = USTATUS_IDENTIFIED;
+                        break;
+
+                default:
+                        irc_usermsg( irc, "Error registering" );
+                        break;
         }
         
@@ -141 +134 @@
 int cmd_drop( irc_t *irc, char **cmd )
 {
-        char s[512];
-        FILE *fp;
-        
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
-        fp = fopen( s, "r" );
-        if( !fp )
-        {
+        storage_status_t status;
+        
+        status = storage_remove (irc->nick, cmd[1]);
+        switch (status) {
+        case STORAGE_NO_SUCH_USER:
                 irc_usermsg( irc, "That account does not exist" );
                 return( 0 );
-        }
-        
-        fscanf( fp, "%32[^\n]s", s );
-        fclose( fp );
-        if( setpass( irc, cmd[1], s ) < 0 )
-        {
-                irc_usermsg( irc, "Incorrect password" );
-                return( 0 );
-        }
-        
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
-        unlink( s );
-        
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
-        unlink( s );
-        
-        setpassnc( irc, NULL );
-        irc_usermsg( irc, "Files belonging to account `%s' removed", irc->nick );
-        
-        return( 0 );
+        case STORAGE_INVALID_PASSWORD:
+                irc_usermsg( irc, "Password invalid" );
+                return( 0 );
+        case STORAGE_OK:
+                irc_setpass( irc, NULL );
+                irc_usermsg( irc, "Account `%s' removed", irc->nick );
+                return( 0 );
+        default:
+                irc_usermsg( irc, "Error: '%d'", status );
+                return( 0 );
+        }
 }
 
@@ -623 +605 @@
 int cmd_save( irc_t *irc, char **cmd )
 {
-        if( bitlbee_save( irc ) )
+        if( storage_save( irc, TRUE ) == STORAGE_OK )
                 irc_usermsg( irc, "Configuration saved" );
         else

conf.c

@@ -50 +50 @@
         conf->nofork = 0;
         conf->verbose = 0;
+        conf->primary_storage = "text";
         conf->runmode = RUNMODE_INETD;
         conf->authmode = AUTHMODE_OPEN;
@@ -198 +199 @@
                                 conf->motdfile = g_strdup( ini->value );
                         }
+                        else if( g_strcasecmp( ini->key, "account_storage" ) == 0 )
+                        {
+                                g_free( conf->primary_storage );
+                                conf->primary_storage = g_strdup( ini->value );
+                        }
+                        else if( g_strcasecmp( ini->key, "account_storage_migrate" ) == 0 )
+                        {
+                                g_strfreev( conf->migrate_storage );
+                                conf->migrate_storage = g_strsplit( ini->value, " \t,;", -1 );
+                        }
                         else if( g_strcasecmp( ini->key, "pinginterval" ) == 0 )
                         {

conf.h

@@ -42 +42 @@
         char *configdir;
         char *motdfile;
+        char *primary_storage;
+        char **migrate_storage;
         int ping_interval;
         int ping_timeout;

crypting.c

@@ -29 +29 @@
    the programs will be built. */
 
-#ifndef CRYPTING_MAIN
-#define BITLBEE_CORE
-#include "bitlbee.h"
-#include "irc.h"
 #include "md5.h"
 #include "crypting.h"
@@ -38 +34 @@
 #include <stdio.h>
 #include <stdlib.h>
-
-#else
-
-typedef struct irc
-{
-        char *password;
-} irc_t;
-
-#define set_add( a, b, c, d )
-#define set_find( a, b ) NULL
-
-#include "md5.h"
-#include "crypting.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#define irc_usermsg
-
-#endif
 
 /*\
@@ -65 +41 @@
 \*/
 
-/* USE WITH CAUTION!
-   Sets pass without checking */
-void setpassnc (irc_t *irc, char *pass) {
-        if (!set_find (irc, "password"))
-                set_add (irc, "password", NULL, passchange);
-        
-        if (irc->password) g_free (irc->password);
-        
-        if (pass) {
-                irc->password = g_strdup (pass);
-                irc_usermsg (irc, "Password successfully changed");
-        } else {
-                irc->password = NULL;
-        }
-}
-
-char *passchange (irc_t *irc, void *set, char *value) {
-        setpassnc (irc, value);
-        return (NULL);
-}
-
-int setpass (irc_t *irc, char *pass, char* md5sum) {
+int checkpass (const char *pass, const char *md5sum)
+{
         md5_state_t md5state;
         md5_byte_t digest[16];
@@ -103 +59 @@
                 if (digits[1] != md5sum[j + 1]) return (-1);
         }
-        
-        /* If pass is correct, we end up here and we set the pass */
-        setpassnc (irc, pass);
-        
-        return (0);
+
+        return( 0 );
 }
 
-char *hashpass (irc_t *irc) {
+
+char *hashpass (const char *password)
+{
         md5_state_t md5state;
         md5_byte_t digest[16];
@@ -117 +72 @@
         char *rv;
         
-        if (irc->password == NULL) return (NULL);
+        if (password == NULL) return (NULL);
         
-        rv = (char *)g_malloc (33);
-        memset (rv, 0, 33);
+        rv = g_new0 (char, 33);
         
         md5_init (&md5state);
-        md5_append (&md5state, (unsigned char *)irc->password, strlen (irc->password));
+        md5_append (&md5state, (const unsigned char *)password, strlen (password));
         md5_finish (&md5state, digest);
         
@@ -135 +89 @@
 }
 
-char *obfucrypt (irc_t *irc, char *line) {
+char *obfucrypt (char *line, const char *password) 
+{
         int i, j;
         char *rv;
         
-        if (irc->password == NULL) return (NULL);
+        if (password == NULL) return (NULL);
         
-        rv = (char *)g_malloc (strlen (line) + 1);
-        memset (rv, '\0', strlen (line) + 1);
+        rv = g_new0 (char, strlen (line) + 1);
         
         i = j = 0;
@@ -148 +102 @@
                 /* Encrypt/obfuscate the line, using the password */
                 if (*(signed char*)line < 0) *line = - (*line);
-                if (((signed char*)irc->password)[i] < 0) irc->password[i] = - irc->password[i];
                 
-                rv[j] = *line + irc->password[i]; /* Overflow intended */
+                rv[j] = *line + password[i]; /* Overflow intended */
                 
                 line++;
-                if (!irc->password[++i]) i = 0;
+                if (!password[++i]) i = 0;
                 j++;
         }
@@ -160 +113 @@
 }
 
-char *deobfucrypt (irc_t *irc, char *line) {
+char *deobfucrypt (char *line, const char *password) 
+{
         int i, j;
         char *rv;
         
-        if (irc->password == NULL) return (NULL);
+        if (password == NULL) return (NULL);
         
-        rv = (char *)g_malloc (strlen (line) + 1);
-        memset (rv, '\0', strlen (line) + 1);
+        rv = g_new0 (char, strlen (line) + 1);
         
         i = j = 0;
         while (*line) {
                 /* Decrypt/deobfuscate the line, using the pass */
-                rv[j] = *line - irc->password[i]; /* Overflow intended */
+                rv[j] = *line - password[i]; /* Overflow intended */
                 
                 line++;
-                if (!irc->password[++i]) i = 0;
+                if (!password[++i]) i = 0;
                 j++;
         }
@@ -189 +142 @@
 int main( int argc, char *argv[] )
 {
-        irc_t *irc = g_malloc( sizeof( irc_t ) );
         char *hash, *action, line[256];
-        char* (*func)( irc_t *, char * );
+        char* (*func)( char *, const char * );
         
         if( argc < 2 )
@@ -201 +153 @@
         }
         
-        memset( irc, 0, sizeof( irc_t ) );
-        irc->password = g_strdup( argv[1] );
-        
-        hash = hashpass( irc );
+        hash = hashpass( argv[1] );
         action = argv[0] + strlen( argv[0] ) - strlen( "encode" );
         
@@ -236 +185 @@
                 fgetc( stdin );
                 
-                out = func( irc, line );
+                out = func( line, argv[1] );
                 printf( "%s\n", out );
                 g_free( out );

crypting.h

@@ -24 +24 @@
 */
 
-void setpassnc (irc_t *irc, char *pass); /* USE WITH CAUTION! */
-char *passchange (irc_t *irc, void *set, char *value);
-int setpass (irc_t *irc, char *pass, char* md5sum);
-char *hashpass (irc_t *irc);
-char *obfucrypt (irc_t *irc, char *line);
-char *deobfucrypt (irc_t *irc, char *line);
+int checkpass (const char *password, const char *md5sum);
+char *hashpass (const char *password);
+char *obfucrypt (char *line, const char *password);
+char *deobfucrypt (char *line, const char *password);

irc.c

@@ -31 +31 @@
 
 GSList *irc_connection_list = NULL;
+
+static char *passchange (irc_t *irc, void *set, char *value) 
+{
+        irc_setpass (irc, value);
+        return (NULL);
+}
 
 irc_t *irc_new( int fd )
@@ -129 +135 @@
         set_add( irc, "to_char", ": ", set_eval_to_char );
         set_add( irc, "typing_notice", "false", set_eval_bool );
+        set_add( irc, "password", NULL, passchange);
         
         conf_loaddefaults( irc );
@@ -154 +161 @@
         
         if( irc->status >= USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
-                if( !bitlbee_save( irc ) )
+                if( storage_save( irc, TRUE ) != STORAGE_OK )
                         irc_usermsg( irc, "Error while saving settings!" );
         
@@ -259 +266 @@
         if( global.conf->runmode == RUNMODE_INETD )
                 g_main_quit( global.loop );
+}
+
+/* USE WITH CAUTION!
+   Sets pass without checking */
+void irc_setpass (irc_t *irc, const char *pass) 
+{
+        if (irc->password) g_free (irc->password);
+        
+        if (pass) {
+                irc->password = g_strdup (pass);
+                irc_usermsg (irc, "Password successfully changed");
+        } else {
+                irc->password = NULL;
+        }
 }
 

irc.h

@@ -137 +137 @@
 void irc_whois( irc_t *irc, char *nick );
 int irc_away( irc_t *irc, char *away );
+void irc_setpass( irc_t *irc, const char *pass ); /* USE WITH CAUTION! */
 
 int irc_send( irc_t *irc, char *nick, char *s, int flags );

nick.c

@@ -27 +27 @@
 #include "bitlbee.h"
 
-void nick_set( irc_t *irc, char *handle, struct prpl *proto, char *nick )
+void nick_set( irc_t *irc, const char *handle, struct prpl *proto, const char *nick )
 {
         nick_t *m = NULL, *n = irc->nicks;
@@ -56 +56 @@
 }
 
-char *nick_get( irc_t *irc, char *handle, struct prpl *proto, const char *realname )
+char *nick_get( irc_t *irc, const char *handle, struct prpl *proto, const char *realname )
 {
         static char nick[MAX_NICK_LENGTH+1];
@@ -129 +129 @@
 }
 
-void nick_del( irc_t *irc, char *nick )
+void nick_del( irc_t *irc, const char *nick )
 {
         nick_t *l = NULL, *n = irc->nicks;
@@ -176 +176 @@
 }
 
-int nick_ok( char *nick )
-{
-        char *s;
+int nick_ok( const char *nick )
+{
+        const char *s;
         
         /* Empty/long nicks are not allowed */
@@ -237 +237 @@
 }
 
-int nick_cmp( char *a, char *b )
+int nick_cmp( const char *a, const char *b )
 {
         char aa[1024] = "", bb[1024] = "";
@@ -253 +253 @@
 }
 
-char *nick_dup( char *nick )
-{
-        char *cp;
-        
-        cp = g_new0 ( char, MAX_NICK_LENGTH + 1 );
-        strncpy( cp, nick, MAX_NICK_LENGTH );
-        
-        return( cp );
-}
+char *nick_dup( const char *nick )
+{
+        return g_strndup( nick, MAX_NICK_LENGTH );
+}

nick.h

@@ -32 +32 @@
 } nick_t;
 
-void nick_set( irc_t *irc, char *handle, struct prpl *proto, char *nick );
-char *nick_get( irc_t *irc, char *handle, struct prpl *proto, const char *realname );
-void nick_del( irc_t *irc, char *nick );
+void nick_set( irc_t *irc, const char *handle, struct prpl *proto, const char *nick );
+char *nick_get( irc_t *irc, const char *handle, struct prpl *proto, const char *realname );
+void nick_del( irc_t *irc, const char *nick );
 void nick_strip( char *nick );
 
-int nick_ok( char *nick );
+int nick_ok( const char *nick );
 int nick_lc( char *nick );
 int nick_uc( char *nick );
-int nick_cmp( char *a, char *b );
-char *nick_dup( char *nick );
+int nick_cmp( const char *a, const char *b );
+char *nick_dup( const char *nick );

protocols/msn/sb.c

@@ -644 +644 @@
                         if( who )
                         {
-                                serv_got_typing( gc, who, 5 );
+                                serv_got_typing( gc, who, 5, 1 );
                                 g_free( who );
                         }

protocols/nogaim.c

@@ -768 +768 @@
 }
 
-void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout )
+void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout, int type )
 {
         user_t *u;
@@ -775 +775 @@
                 return;
         
-        if( ( u = user_findhandle( gc, handle ) ) )
-                irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, "\1TYPING 1\1" );
+        if( ( u = user_findhandle( gc, handle ) ) ) {
+                /* If type is:
+                 * 0: user has stopped typing
+                 * 1: user is actively typing
+                 * 2: user has entered text, but is not actively typing
+                 */
+                if (type == 0 || type == 1 || type == 2) {
+                        char buf[256]; 
+                        g_snprintf(buf, 256, "\1TYPING %d\1", type); 
+                        irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, buf );
+                }
+        }
 }
 

protocols/nogaim.h

@@ -283 +283 @@
 G_MODULE_EXPORT void serv_got_update( struct gaim_connection *gc, char *handle, int loggedin, int evil, time_t signon, time_t idle, int type, guint caps );
 G_MODULE_EXPORT void serv_got_im( struct gaim_connection *gc, char *handle, char *msg, guint32 flags, time_t mtime, gint len );
-G_MODULE_EXPORT void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout );
+G_MODULE_EXPORT void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout, int type );
 G_MODULE_EXPORT void serv_got_chat_invite( struct gaim_connection *gc, char *handle, char *who, char *msg, GList *data );
 G_MODULE_EXPORT struct conversation *serv_got_joined_chat( struct gaim_connection *gc, int id, char *handle );

protocols/oscar/aim.h

@@ -466 +466 @@
 int aim_addtlvtochain_caps(aim_tlvlist_t **list, const guint16 t, const guint32 caps);
 int aim_addtlvtochain_noval(aim_tlvlist_t **list, const guint16 type);
+int aim_addtlvtochain_chatroom(aim_tlvlist_t **list, guint16 type, guint16 exchange, const char *roomname, guint16 instance);
 int aim_addtlvtochain_userinfo(aim_tlvlist_t **list, guint16 type, aim_userinfo_t *ui);
 int aim_addtlvtochain_frozentlvlist(aim_tlvlist_t **list, guint16 type, aim_tlvlist_t **tl);
@@ -572 +573 @@
 };
 
+struct aim_chat_invitation {
+        struct gaim_connection * gc;
+        char * name;
+        guint8 exchange;
+};
 
 #define AIM_VISIBILITYCHANGE_PERMITADD    0x05

protocols/oscar/chat.c

@@ -180 +180 @@
         
         aim_tx_enqueue(sess, fr);
-
-        return 0;
-}
-
-static int aim_addtlvtochain_chatroom(aim_tlvlist_t **list, guint16 type, guint16 exchange, const char *roomname, guint16 instance)
-{
-        guint8 *buf;
-        int buflen;
-        aim_bstream_t bs;
-
-        buflen = 2 + 1 + strlen(roomname) + 2;
-        
-        if (!(buf = g_malloc(buflen)))
-                return 0;
-
-        aim_bstream_init(&bs, buf, buflen);
-
-        aimbs_put16(&bs, exchange);
-        aimbs_put8(&bs, strlen(roomname));
-        aimbs_putraw(&bs, (guint8 *)roomname, strlen(roomname));
-        aimbs_put16(&bs, instance);
-
-        aim_addtlvtochain_raw(list, type, aim_bstream_curpos(&bs), buf);
-
-        g_free(buf);
 
         return 0;

protocols/oscar/im.c

@@ -1369 +1369 @@
 }
 
+
+static void incomingim_ch2_chat_free(aim_session_t *sess, struct aim_incomingim_ch2_args *args)
+{
+
+        /* XXX aim_chat_roominfo_free() */
+        g_free(args->info.chat.roominfo.name);
+
+        return;
+}
+
+static void incomingim_ch2_chat(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args, aim_bstream_t *servdata)
+{
+
+        /*
+         * Chat room info.
+         */
+        if (servdata)
+                aim_chat_readroominfo(servdata, &args->info.chat.roominfo);
+
+        args->destructor = (void *)incomingim_ch2_chat_free;
+
+        return;
+}
+
 static void incomingim_ch2_icqserverrelay_free(aim_session_t *sess, struct aim_incomingim_ch2_args *args)
 {
@@ -1617 +1641 @@
         if (args.reqclass & AIM_CAPS_ICQSERVERRELAY)
                 incomingim_ch2_icqserverrelay(sess, mod, rx, snac, userinfo, &args, sdbsptr);
+        else if (args.reqclass & AIM_CAPS_CHAT)
+                incomingim_ch2_chat(sess, mod, rx, snac, userinfo, &args, sdbsptr);
 
 

protocols/oscar/oscar.c

@@ -62 +62 @@
    static int gaim_caps = AIM_CAPS_UTF8; */
 
-static int gaim_caps = AIM_CAPS_INTEROP | AIM_CAPS_ICHAT | AIM_CAPS_ICQSERVERRELAY;
+static int gaim_caps = AIM_CAPS_INTEROP | AIM_CAPS_ICHAT | AIM_CAPS_ICQSERVERRELAY | AIM_CAPS_CHAT;
 static guint8 gaim_features[] = {0x01, 0x01, 0x01, 0x02};
 
@@ -156 +156 @@
 }
 
-#if 0
 static struct chat_connection *find_oscar_chat(struct gaim_connection *gc, int id) {
         GSList *g = ((struct oscar_data *)gc->proto_data)->oscar_chats;
@@ -171 +170 @@
         return c;
 }
-#endif
+
 
 static struct chat_connection *find_oscar_chat_by_conn(struct gaim_connection *gc,
@@ -1074 +1073 @@
 }
 
+void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv);
+void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv);
+        
 static int incomingim_chan2(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args) {
-#if 0
         struct gaim_connection *gc = sess->aux_data;
-#endif
 
         if (args->status != AIM_RENDEZVOUS_PROPOSE)
                 return 1;
-#if 0
+
         if (args->reqclass & AIM_CAPS_CHAT) {
                 char *name = extract_name(args->info.chat.roominfo.name);
@@ -1089 +1089 @@
                 *exch = args->info.chat.roominfo.exchange;
                 m = g_list_append(m, exch);
-                serv_got_chat_invite(gc,
-                                     name ? name : args->info.chat.roominfo.name,
-                                     userinfo->sn,
-                                     (char *)args->msg,
-                                     m);
+
+                char txt[1024];
+
+                g_snprintf( txt, 1024, "Got an invitation to chatroom %s from %s: %s", name, userinfo->sn, args->msg );
+
+                struct aim_chat_invitation * inv = g_new0(struct aim_chat_invitation, 1);
+
+                inv->gc = gc;
+                inv->exchange = *exch;
+                inv->name = g_strdup(name);
+                
+                do_ask_dialog( gc, txt, inv, oscar_accept_chat, oscar_reject_chat);
+        
                 if (name)
                         g_free(name);
         }
-#endif
+
         return 1;
 }
@@ -2441 +2449 @@
         type2 = va_arg(ap, int);
         va_end(ap);
-
-        if(type2 == 0x0001 || type2 == 0x0002)
-                serv_got_typing(gc, sn, 0);
-
+    
+        if(type2 == 0x0002) {
+                /* User is typing */
+                serv_got_typing(gc, sn, 0, 1);
+        } 
+        else if (type2 == 0x0001) {
+                /* User has typed something, but is not actively typing (stale) */
+                serv_got_typing(gc, sn, 0, 2);
+        }
+        else {
+                /* User has stopped typing */
+                serv_got_typing(gc, sn, 0, 0);
+        }        
+        
         return 1;
 }
@@ -2482 +2500 @@
 }
 
+int oscar_chat_send(struct gaim_connection * gc, int id, char *message)
+{
+        struct oscar_data * od = (struct oscar_data*)gc->proto_data;
+        struct chat_connection * ccon;
+        
+        if(!(ccon = find_oscar_chat(gc, id)))
+                return -1;
+        
+        int ret;
+        guint8 len = strlen(message);
+        char *s;
+                
+        for (s = message; *s; s++)
+                if (*s & 128)
+                        break;
+                
+        /* Message contains high ASCII chars, time for some translation! */
+        if (*s) {
+                s = g_malloc(BUF_LONG);
+                /* Try if we can put it in an ISO8859-1 string first.
+                   If we can't, fall back to UTF16. */
+                if ((ret = do_iconv("UTF-8", "ISO8859-1", message, s, len, BUF_LONG)) >= 0) {
+                        len = ret;
+                } else if ((ret = do_iconv("UTF-8", "UNICODEBIG", message, s, len, BUF_LONG)) >= 0) {
+                        len = ret;
+                } else {
+                        /* OOF, translation failed... Oh well.. */
+                        g_free( s );
+                        s = message;
+                }
+        } else {
+                s = message;
+        }
+                
+        ret = aim_chat_send_im(od->sess, ccon->conn, AIM_CHATFLAGS_NOREFLECT, s, len);
+                
+        if (s != message) {     
+                g_free(s);
+  }
+  
+  return (ret >= 0);
+}
+
+void oscar_chat_invite(struct gaim_connection * gc, int id, char *message, char *who)
+{
+        struct oscar_data * od = (struct oscar_data *)gc->proto_data;
+        struct chat_connection *ccon = find_oscar_chat(gc, id);
+        
+        if (ccon == NULL)
+                return;
+        
+        aim_chat_invite(od->sess, od->conn, who, message ? message : "",
+                                        ccon->exchange, ccon->name, 0x0);
+}
+
+void oscar_chat_kill(struct gaim_connection *gc, struct chat_connection *cc)
+{
+        struct oscar_data *od = (struct oscar_data *)gc->proto_data;
+
+        /* Notify the conversation window that we've left the chat */
+        serv_got_chat_left(gc, cc->id);
+
+        /* Destroy the chat_connection */
+        od->oscar_chats = g_slist_remove(od->oscar_chats, cc);
+        if (cc->inpa > 0)
+                gaim_input_remove(cc->inpa);
+        aim_conn_kill(od->sess, &cc->conn);
+        g_free(cc->name);
+        g_free(cc->show);
+        g_free(cc);
+}
+
+void oscar_chat_leave(struct gaim_connection * gc, int id)
+{
+        struct chat_connection * ccon = find_oscar_chat(gc, id);
+
+        if(ccon == NULL)
+                return;
+
+        oscar_chat_kill(gc, ccon);
+}
+
+int oscar_chat_join(struct gaim_connection * gc, char * name)
+{
+    struct oscar_data * od = (struct oscar_data *)gc->proto_data;
+        
+        aim_conn_t * cur;
+
+        if((cur = aim_getconn_type(od->sess, AIM_CONN_TYPE_CHATNAV))) {
+        
+                return (aim_chatnav_createroom(od->sess, cur, name, 4) == 0);
+        
+        } else {
+                struct create_room * cr = g_new0(struct create_room, 1);
+                cr->exchange = 4;
+                cr->name = g_strdup(name);
+                od->create_rooms = g_slist_append(od->create_rooms, cr);
+                aim_reqservice(od->sess, od->conn, AIM_CONN_TYPE_CHATNAV);
+                return 1;
+        }
+}
+
+int oscar_chat_open(struct gaim_connection * gc, char *who)
+{
+        struct oscar_data * od = (struct oscar_data *)gc->proto_data;
+
+        static int chat_id = 0;
+        char * chatname = g_new0(char, strlen(gc->username)+4);
+        g_snprintf(chatname, strlen(gc->username) + 4, "%s%d", gc->username, chat_id++);
+  
+        int ret = oscar_chat_join(gc, chatname);
+
+        aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);
+
+        g_free(chatname);
+        
+        return ret;
+}
+
+void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv)
+{
+        oscar_chat_join(inv->gc, inv->name);
+        g_free(inv->name);
+        g_free(inv);
+}
+
+void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv)
+{
+        g_free(inv->name);
+        g_free(inv);
+}
+
 void oscar_init() 
 {
@@ -2495 +2645 @@
         ret->add_buddy = oscar_add_buddy;
         ret->remove_buddy = oscar_remove_buddy;
+        ret->chat_send = oscar_chat_send;
+        ret->chat_invite = oscar_chat_invite;
+        ret->chat_leave = oscar_chat_leave;
+        ret->chat_open = oscar_chat_open;
         ret->add_permit = oscar_add_permit;
         ret->add_deny = oscar_add_deny;

protocols/oscar/tlv.c

@@ -340 +340 @@
 }
 
+int aim_addtlvtochain_chatroom(aim_tlvlist_t **list, guint16 type, guint16 exchange, const char *roomname, guint16 instance)
+{
+        guint8 *buf;
+        int buflen;
+        aim_bstream_t bs;
+
+        buflen = 2 + 1 + strlen(roomname) + 2;
+        
+        if (!(buf = g_malloc(buflen)))
+                return 0;
+
+        aim_bstream_init(&bs, buf, buflen);
+
+        aimbs_put16(&bs, exchange);
+        aimbs_put8(&bs, strlen(roomname));
+        aimbs_putraw(&bs, (guint8 *)roomname, strlen(roomname));
+        aimbs_put16(&bs, instance);
+
+        aim_addtlvtochain_raw(list, type, aim_bstream_curpos(&bs), buf);
+
+        g_free(buf);
+
+        return 0;
+}
+
 /**
  * aim_writetlvchain - Write a TLV chain into a data buffer.

protocols/proxy.c

@@ -73 +73 @@
 
 
-static struct sockaddr_in *gaim_gethostbyname(char *host, int port)
+static struct sockaddr_in *gaim_gethostbyname(const char *host, int port)
 {
         static struct sockaddr_in sin;
@@ -144 +144 @@
 }
 
-static int proxy_connect_none(char *host, unsigned short port, struct PHB *phb)
+static int proxy_connect_none(const char *host, unsigned short port, struct PHB *phb)
 {
         struct sockaddr_in *sin;
@@ -271 +271 @@
 }
 
-static int proxy_connect_http(char *host, unsigned short port, struct PHB *phb)
+static int proxy_connect_http(const char *host, unsigned short port, struct PHB *phb)
 {
         phb->host = g_strdup(host);
@@ -355 +355 @@
 }
 
-static int proxy_connect_socks4(char *host, unsigned short port, struct PHB *phb)
+static int proxy_connect_socks4(const char *host, unsigned short port, struct PHB *phb)
 {
         phb->host = g_strdup(host);
@@ -537 +537 @@
 }
 
-static int proxy_connect_socks5(char *host, unsigned short port, struct PHB *phb)
+static int proxy_connect_socks5(const char *host, unsigned short port, struct PHB *phb)
 {
         phb->host = g_strdup(host);
@@ -578 +578 @@
 }
 
-int proxy_connect(char *host, int port, GaimInputFunction func, gpointer data)
+int proxy_connect(const char *host, int port, GaimInputFunction func, gpointer data)
 {
         struct PHB *phb;

protocols/proxy.h

@@ -56 +56 @@
 G_MODULE_EXPORT void gaim_input_remove(gint);
 
-G_MODULE_EXPORT int proxy_connect(char *host, int port, GaimInputFunction func, gpointer data);
+G_MODULE_EXPORT int proxy_connect(const char *host, int port, GaimInputFunction func, gpointer data);
 
 #endif /* _PROXY_H_ */

protocols/yahoo/yahoo.c

@@ -635 +635 @@
 {
         struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        
-        serv_got_typing( gc, who, 1 );
+        if (stat == 1) {
+                /* User is typing */
+                serv_got_typing( gc, who, 1, 1 );
+        }
+        else {
+                /* User stopped typing */
+                serv_got_typing( gc, who, 1, 0 );
+        }
 }
 

unix.c

@@ -53 +53 @@
         
         global.helpfile = g_strdup( HELP_FILE );
-        
+
         global.conf = conf_load( argc, argv );
         if( global.conf == NULL )
                 return( 1 );
-        
+
+
         if( global.conf->runmode == RUNMODE_INETD )
         {
@@ -71 +72 @@
         if( i != 0 )
                 return( i );
+
+        global.storage = storage_init( global.conf->primary_storage, 
+                                                                   global.conf->migrate_storage );
+        if ( global.storage == NULL) {
+                log_message( LOGLVL_ERROR, "Unable to load storage backend '%s'", global.conf->primary_storage );
+                return( 1 );
+        }
+        
         
         /* Catch some signals to tell the user what's happening before quitting */
@@ -88 +97 @@
         if( !getuid() || !geteuid() )
                 log_message( LOGLVL_WARNING, "BitlBee is running with root privileges. Why?" );
-        if( access( global.conf->configdir, F_OK ) != 0 )
-                log_message( LOGLVL_WARNING, "The configuration directory %s does not exist. Configuration won't be saved.", CONFIG );
-        else if( access( global.conf->configdir, R_OK ) != 0 || access( global.conf->configdir, W_OK ) != 0 )
-                log_message( LOGLVL_WARNING, "Permission problem: Can't read/write from/to %s.", global.conf->configdir );
         if( help_init( &(global.help) ) == NULL )
                 log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );