Changeset eda54e4

Timestamp:

2007-10-12T00:08:58Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a6df0b5

Parents:

82135c7 (diff), d444c09 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from devel.

Files:

• Makefile (modified) (1 diff)
• configure (modified) (4 diffs)
• doc/CHANGES (modified) (2 diffs)
• doc/user-guide/commands.xml (modified) (1 diff)
• irc.c (modified) (3 diffs)
• lib/Makefile (modified) (1 diff)
• lib/arc.c (moved) (moved from lib/rc4.c) (10 diffs)
• lib/arc.h (moved) (moved from lib/rc4.h) (3 diffs)
• lib/base64.c (modified) (1 diff)
• lib/base64.h (modified) (1 diff)
• lib/misc.c (modified) (1 diff)
• lib/misc.h (modified) (1 diff)
• lib/ssl_bogus.c (modified) (1 diff)
• protocols/jabber/sasl.c (modified) (3 diffs)
• protocols/nogaim.c (modified) (6 diffs)
• protocols/nogaim.h (modified) (8 diffs)
• root_commands.c (modified) (1 diff)
• storage_xml.c (modified) (6 diffs)
• tests/Makefile (modified) (1 diff)
• tests/check.c (modified) (2 diffs)
• tests/check_arc.c (added)
• tests/check_util.c (modified) (2 diffs)
• unix.c (modified) (1 diff)

Makefile

@@ -11 +11 @@
 # Program variables
 objects = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o user.o
-headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ini.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h url.h user.h protocols/http_client.h protocols/md5.h protocols/nogaim.h protocols/proxy.h protocols/sha.h protocols/ssl_client.h
+headers = account.h bitlbee.h commands.h conf.h config.h crypting.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/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha.h lib/ssl_client.h lib/url.h protocols/nogaim.h
 subdirs = lib protocols
 

configure

@@ -29 +29 @@
 strip=1
 gcov=0
+plugins=1
 ipv6=1
 
@@ -69 +70 @@
 --strip=0/1     Disable/enable binary stripping         $strip
 --gcov=0/1      Disable/enable test coverage reporting  $gcov
+--plugins=0/1   Disable/enable plugins support          $plugins
 
 --ipv6=0/1      IPv6 socket support                     $ipv6
-
---ldap=0/1/auto LDAP support                            $ldap
 
 --events=...    Event handler (glib, libevent)          $events
@@ -140 +140 @@
 
 if [ "$debug" = "1" ]; then
-        echo 'CFLAGS=-g' >> Makefile.settings
+        [ -z "$CFLAGS" ] && CFLAGS=-g
         echo 'DEBUG=1' >> Makefile.settings
         echo '#define DEBUG' >> config.h
 else
-        echo 'CFLAGS=-O3' >> Makefile.settings
-fi
-
+        [ -z "$CFLAGS" ] && CFLAGS=-O3
+fi
+
+echo CFLAGS=$CFLAGS >> Makefile.settings
 echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings
 
@@ -385 +386 @@
 fi
 
+if [ "$plugins" = 0 ]; then
+        echo '#undef WITH_PLUGINS' >> config.h
+else
+        echo '#define WITH_PLUGINS' >> config.h
+fi
+
 echo
 if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then

doc/CHANGES

@@ -1 @@
-Version 1.1dev:
+Version 1.2:
 - First BitlBee development/testing RELEASE. This should be quite stable
   though (and for most people more stable than 1.0.x). It just has a couple
@@ -65 +65 @@
     resources available for that buddy. (Of course this only works if the
     buddy is in your contact list.)
+
+Finished ???
+
+Version 1.0.4:
+- Removed sethostent(), which causes problems for many people, especially on
+  *BSD. This is basically the reason for this release.
+- "allow" command actually displays the allow list, not the block list.
+- Yahoo away state/msg fix.
+- Don't display "Gender: Male" by default if nothing's filled in (OSCAR
+  "info" command)
+- Fixed account cleanup (possible infinite loop) in irc_free().
+- Fixed configdir error message to not always display the compile-time
+  setting.
+
+Finished 20 Aug 2007
 
 Version 1.0.3:

doc/user-guide/commands.xml

@@ -596 +596 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="simulate_netsplit" type="boolean" scope="global">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                Some IRC clients parse quit messages sent by the IRC server to see if someone really left or just disappeared because of a netsplit. By default, BitlBee tries to simulate netsplit-like quit messages to keep the control channel window clean. If you don't like this (or if your IRC client doesn't support this) you can disable this setting.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="ssl" type="boolean" scope="account">
                 <default>false</default>

irc.c

@@ -132 +132 @@
         set_add( &irc->set, "buddy_sendbuffer", "false", set_eval_bool, irc );
         set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
-        set_add( &irc->set, "charset", "iso8859-1", set_eval_charset, irc );
+        set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc );
         set_add( &irc->set, "debug", "false", set_eval_bool, irc );
         set_add( &irc->set, "default_target", "root", NULL, irc );
@@ -143 +143 @@
         set_add( &irc->set, "query_order", "lifo", NULL, irc );
         set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc );
+        set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
         set_add( &irc->set, "strip_html", "true", NULL, irc );
         set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );
@@ -910 +911 @@
         char reason[128];
         
-        if( u->ic && u->ic->flags & OPT_LOGGING_OUT )
+        if( u->ic && u->ic->flags & OPT_LOGGING_OUT && set_getbool( &irc->set, "simulate_netsplit" ) )
         {
                 if( u->ic->acc->server )

lib/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o rc4.o sha.o $(SSL_CLIENT) url.o
+objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha.o $(SSL_CLIENT) url.o
 
 CFLAGS += -Wall

lib/arc.c

@@ -2 +2 @@
 *                                                                           *
 *  BitlBee - An IRC to IM gateway                                           *
-*  Simple (but secure) RC4 implementation for safer password storage.       *
+*  Simple (but secure) ArcFour implementation for safer password storage.   *
 *                                                                           *
 *  Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net>                   *
@@ -23 +23 @@
 
 /* 
-   This file implements RC4-encryption, which will mainly be used to save IM
-   passwords safely in the new XML-format. Possibly other uses will come up
-   later. It's supposed to be quite reliable (thanks to the use of a 6-byte
-   IV/seed), certainly compared to the old format. The only realistic way to
-   crack BitlBee passwords now is to use a sniffer to get your hands on the
-   user's password.
+   This file implements ArcFour-encryption, which will mainly be used to
+   save IM passwords safely in the new XML-format. Possibly other uses will
+   come up later. It's supposed to be quite reliable (thanks to the use of a
+   6-byte IV/seed), certainly compared to the old format. The only realistic
+   way to crack BitlBee passwords now is to use a sniffer to get your hands
+   on the user's password.
    
    If you see that something's wrong in this implementation (I asked a
    couple of people to look at it already, but who knows), please tell me.
    
-   The reason I chose for RC4 is because it's pretty simple but effective,
+   The reason I picked ArcFour is because it's pretty simple but effective,
    so it will work without adding several KBs or an extra library dependency.
+   
+   (ArcFour is an RC4-compatible cipher. See for details:
+   http://www.mozilla.org/projects/security/pki/nss/draft-kaukonen-cipher-arcfour-03.txt)
 */
 
@@ -43 +46 @@
 #include <string.h>
 #include "misc.h"
-#include "rc4.h"
+#include "arc.h"
 
 /* Add some seed to the password, to make sure we *never* use the same key.
    This defines how many bytes we use as a seed. */
-#define RC4_IV_LEN 6
+#define ARC_IV_LEN 6
 
 /* To defend against a "Fluhrer, Mantin and Shamir attack", it is recommended
    to shuffle S[] just a bit more before you start to use it. This defines how
    many bytes we'll request before we'll really use them for encryption. */
-#define RC4_CYCLES 1024
-
-struct rc4_state *rc4_keymaker( unsigned char *key, int kl, int cycles )
-{
-        struct rc4_state *st;
+#define ARC_CYCLES 1024
+
+struct arc_state *arc_keymaker( unsigned char *key, int kl, int cycles )
+{
+        struct arc_state *st;
         int i, j, tmp;
-        
-        st = g_malloc( sizeof( struct rc4_state ) );
+        unsigned char S2[256];
+        
+        st = g_malloc( sizeof( struct arc_state ) );
         st->i = st->j = 0;
-        for( i = 0; i < 256; i ++ )
-                st->S[i] = i;
-        
         if( kl <= 0 )
                 kl = strlen( (char*) key );
         
+        for( i = 0; i < 256; i ++ )
+        {
+                st->S[i] = i;
+                S2[i] = key[i%kl];
+        }
+        
         for( i = j = 0; i < 256; i ++ )
         {
-                j = ( j + st->S[i] + key[i%kl] ) & 0xff;
+                j = ( j + st->S[i] + S2[i] ) & 0xff;
                 tmp = st->S[i];
                 st->S[i] = st->S[j];
@@ -75 +82 @@
         }
         
+        memset( S2, 0, 256 );
+        i = j = 0;
+        
         for( i = 0; i < cycles; i ++ )
-                rc4_getbyte( st );
+                arc_getbyte( st );
         
         return st;
@@ -82 +92 @@
 
 /*
-   For those who don't know, RC4 is basically an algorithm that generates a
-   stream of bytes after you give it a key. Just get a byte from it and xor
-   it with your cleartext. To decrypt, just give it the same key again and
-   start xorring.
-   
-   The function above initializes the RC4 byte generator, the next function
-   can be used to get bytes from the generator (and shuffle things a bit).
+   For those who don't know, ArcFour is basically an algorithm that generates
+   a stream of bytes after you give it a key. Just get a byte from it and
+   xor it with your cleartext. To decrypt, just give it the same key again
+   and start xorring.
+   
+   The function above initializes the byte generator, the next function can
+   be used to get bytes from the generator (and shuffle things a bit).
 */
 
-unsigned char rc4_getbyte( struct rc4_state *st )
+unsigned char arc_getbyte( struct arc_state *st )
 {
         unsigned char tmp;
@@ -101 +111 @@
         st->S[st->i] = st->S[st->j];
         st->S[st->j] = tmp;
-        
-        return st->S[(st->S[st->i] + st->S[st->j]) & 0xff];
+        tmp = (st->S[st->i] + st->S[st->j]) & 0xff;
+        
+        return st->S[tmp];
 }
 
@@ -108 +119 @@
    The following two functions can be used for reliable encryption and
    decryption. Known plaintext attacks are prevented by adding some (6,
-   by default) random bytes to the password before setting up the RC4
+   by default) random bytes to the password before setting up the state
    structures. These 6 bytes are also saved in the results, because of
-   course we'll need them in rc4_decode().
+   course we'll need them in arc_decode().
    
    Because the length of the resulting string is unknown to the caller,
@@ -122 +133 @@
 */
 
-int rc4_encode( unsigned char *clear, int clear_len, unsigned char **crypt, char *password )
-{
-        struct rc4_state *st;
+int arc_encode( char *clear, int clear_len, unsigned char **crypt, char *password )
+{
+        struct arc_state *st;
         unsigned char *key;
         int key_len, i;
         
-        key_len = strlen( password ) + RC4_IV_LEN;
+        key_len = strlen( password ) + ARC_IV_LEN;
         if( clear_len <= 0 )
-                clear_len = strlen( (char*) clear );
+                clear_len = strlen( clear );
         
         /* Prepare buffers and the key + IV */
-        *crypt = g_malloc( clear_len + RC4_IV_LEN );
+        *crypt = g_malloc( clear_len + ARC_IV_LEN );
         key = g_malloc( key_len );
         strcpy( (char*) key, password );
@@ -139 +150 @@
         /* Add the salt. Save it for later (when decrypting) and, of course,
            add it to the encryption key. */
-        random_bytes( crypt[0], RC4_IV_LEN );
-        memcpy( key + key_len - RC4_IV_LEN, crypt[0], RC4_IV_LEN );
+        random_bytes( crypt[0], ARC_IV_LEN );
+        memcpy( key + key_len - ARC_IV_LEN, crypt[0], ARC_IV_LEN );
         
         /* Generate the initial S[] from the IVed key. */
-        st = rc4_keymaker( key, key_len, RC4_CYCLES );
+        st = arc_keymaker( key, key_len, ARC_CYCLES );
         g_free( key );
         
         for( i = 0; i < clear_len; i ++ )
-                crypt[0][i+RC4_IV_LEN] = clear[i] ^ rc4_getbyte( st );
+                crypt[0][i+ARC_IV_LEN] = clear[i] ^ arc_getbyte( st );
         
         g_free( st );
         
-        return clear_len + RC4_IV_LEN;
-}
-
-int rc4_decode( unsigned char *crypt, int crypt_len, unsigned char **clear, char *password )
-{
-        struct rc4_state *st;
+        return clear_len + ARC_IV_LEN;
+}
+
+int arc_decode( unsigned char *crypt, int crypt_len, char **clear, char *password )
+{
+        struct arc_state *st;
         unsigned char *key;
         int key_len, clear_len, i;
         
-        key_len = strlen( password ) + RC4_IV_LEN;
-        clear_len = crypt_len - RC4_IV_LEN;
+        key_len = strlen( password ) + ARC_IV_LEN;
+        clear_len = crypt_len - ARC_IV_LEN;
         
         if( clear_len < 0 )
         {
-                *clear = (unsigned char*) g_strdup( "" );
+                *clear = g_strdup( "" );
                 return 0;
         }
@@ -173 +184 @@
         key = g_malloc( key_len );
         strcpy( (char*) key, password );
-        for( i = 0; i < RC4_IV_LEN; i ++ )
-                key[key_len-RC4_IV_LEN+i] = crypt[i];
+        for( i = 0; i < ARC_IV_LEN; i ++ )
+                key[key_len-ARC_IV_LEN+i] = crypt[i];
         
         /* Generate the initial S[] from the IVed key. */
-        st = rc4_keymaker( key, key_len, RC4_CYCLES );
+        st = arc_keymaker( key, key_len, ARC_CYCLES );
         g_free( key );
         
         for( i = 0; i < clear_len; i ++ )
-                clear[0][i] = crypt[i+RC4_IV_LEN] ^ rc4_getbyte( st );
+                clear[0][i] = crypt[i+ARC_IV_LEN] ^ arc_getbyte( st );
         clear[0][i] = 0; /* Nice to have for plaintexts. */
         

lib/arc.h

@@ -2 +2 @@
 *                                                                           *
 *  BitlBee - An IRC to IM gateway                                           *
-*  Simple (but secure) RC4 implementation for safer password storage.       *
+*  Simple (but secure) ArcFour implementation for safer password storage.   *
 *                                                                           *
-*  Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net>                   *
+*  Copyright 2007 Wilmer van der Gaast <wilmer@gaast.net>                   *
 *                                                                           *
 *  This program is free software; you can redistribute it and/or modify     *
@@ -23 +23 @@
 
 
-/* See rc4.c for more information. */
+/* See arc.c for more information. */
 
-struct rc4_state
+struct arc_state
 {
         unsigned char S[256];
@@ -31 +31 @@
 };
 
-struct rc4_state *rc4_keymaker( unsigned char *key, int kl, int cycles );
-unsigned char rc4_getbyte( struct rc4_state *st );
-int rc4_encode( unsigned char *clear, int clear_len, unsigned char **crypt, char *password );
-int rc4_decode( unsigned char *crypt, int crypt_len, unsigned char **clear, char *password );
+struct arc_state *arc_keymaker( unsigned char *key, int kl, int cycles );
+unsigned char arc_getbyte( struct arc_state *st );
+int arc_encode( char *clear, int clear_len, unsigned char **crypt, char *password );
+int arc_decode( unsigned char *crypt, int crypt_len, char **clear, char *password );

lib/base64.c

@@ -31 +31 @@
 char *tobase64(const char *text)
 {
-        return base64_encode(text, strlen(text));
+        return base64_encode((const unsigned char *)text, strlen(text));
 }
 
-char *base64_encode(const char *in, int len)
+char *base64_encode(const unsigned char *in, int len)
 {
         char *out;

lib/base64.h

@@ -27 +27 @@
 
 G_MODULE_EXPORT char *tobase64( const char *text );
-G_MODULE_EXPORT char *base64_encode( const char *in, int len );
+G_MODULE_EXPORT char *base64_encode( const unsigned char *in, int len );
 G_MODULE_EXPORT int base64_encode_real( const unsigned char *in, int inlen, unsigned char *out, const char *b64digits );
 G_MODULE_EXPORT char *frombase64( const char *in );

lib/misc.c

@@ -545 +545 @@
         return reply;
 }
+
+/* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
+char *word_wrap( char *msg, int line_len )
+{
+        GString *ret = g_string_sized_new( strlen( msg ) + 16 );
+        
+        while( strlen( msg ) > line_len )
+        {
+                int i;
+                
+                /* First try to find out if there's a newline already. Don't
+                   want to add more splits than necessary. */
+                for( i = line_len; i > 0 && msg[i] != '\n'; i -- );
+                if( msg[i] == '\n' )
+                {
+                        g_string_append_len( ret, msg, i + 1 );
+                        msg += i + 1;
+                        continue;
+                }
+                
+                for( i = line_len; i > 0; i -- )
+                {
+                        if( msg[i] == '-' )
+                        {
+                                g_string_append_len( ret, msg, i + 1 );
+                                g_string_append_c( ret, '\n' );
+                                msg += i + 1;
+                                break;
+                        }
+                        else if( msg[i] == ' ' )
+                        {
+                                g_string_append_len( ret, msg, i );
+                                g_string_append_c( ret, '\n' );
+                                msg += i + 1;
+                                break;
+                        }
+                }
+                if( i == 0 )
+                {
+                        g_string_append_len( ret, msg, line_len );
+                        g_string_append_c( ret, '\n' );
+                        msg += line_len;
+                }
+        }
+        g_string_append( ret, msg );
+        
+        return g_string_free( ret, FALSE );
+}

lib/misc.h

@@ -64 +64 @@
 G_MODULE_EXPORT struct ns_srv_reply *srv_lookup( char *service, char *protocol, char *domain );
 
+G_MODULE_EXPORT char *word_wrap( char *msg, int line_len );
+
 #endif

lib/ssl_bogus.c

@@ -52 +52 @@
 }
 
+void *ssl_starttls( int fd, ssl_input_function func, gpointer data ) 
+{
+        return NULL;
+}
+
 b_input_condition ssl_getdirection( void *conn )
 {

protocols/jabber/sasl.c

@@ -89 +89 @@
                 strcpy( s + 1, jd->username );
                 strcpy( s + 2 + strlen( jd->username ), ic->acc->pass );
-                reply->text = base64_encode( s, len );
+                reply->text = base64_encode( (unsigned char *)s, len );
                 reply->text_len = strlen( reply->text );
                 g_free( s );
@@ -185 +185 @@
         struct jabber_data *jd = ic->proto_data;
         struct xt_node *reply = NULL;
-        char *nonce = NULL, *realm = NULL, *cnonce = NULL, cnonce_bin[30];
+        char *nonce = NULL, *realm = NULL, *cnonce = NULL;
+        unsigned char cnonce_bin[30];
         char *digest_uri = NULL;
         char *dec = NULL;
@@ -216 +217 @@
                         realm = g_strdup( jd->server );
                 
-                random_bytes( (unsigned char *) cnonce_bin, sizeof( cnonce_bin ) );
+                random_bytes( cnonce_bin, sizeof( cnonce_bin ) );
                 cnonce = base64_encode( cnonce_bin, sizeof( cnonce_bin ) );
                 digest_uri = g_strdup_printf( "%s/%s", "xmpp", jd->server );

protocols/nogaim.c

@@ -48 +48 @@
 
         if(!mod) {
-                log_message(LOGLVL_ERROR, "Can't find `%s', not loading", path);
+                log_message(LOGLVL_ERROR, "Can't find `%s', not loading (%s)\n", path, g_module_error());
                 return FALSE;
         }
@@ -608 +608 @@
               ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* (De)voice people changing state */
         {
-                irc_write( ic->irc, ":%s MODE %s %cv %s", ic->irc->myhost,
-                                                          ic->irc->channel, u->away?'-':'+', u->nick );
+                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 );
         }
 }
@@ -616 +628 @@
 {
         irc_t *irc = ic->irc;
+        char *wrapped;
         user_t *u;
         
@@ -658 +671 @@
                 strip_html( msg );
 
-        while( strlen( msg ) > 425 )
-        {
-                char tmp, *nl;
-                
-                tmp = msg[425];
-                msg[425] = 0;
-                
-                /* If there's a newline/space in this string, split up there,
-                   looks a bit prettier. */
-                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strrchr( msg, ' ' ) ) )
-                {
-                        msg[425] = tmp;
-                        tmp = *nl;
-                        *nl = 0;
-                }
-                
-                irc_msgfrom( irc, u->nick, msg );
-                
-                /* Move on. */
-                if( nl )
-                {
-                        *nl = tmp;
-                        msg = nl + 1;
-                }
-                else
-                {
-                        msg[425] = tmp;
-                        msg += 425;
-                }
-        }
-        irc_msgfrom( irc, u->nick, msg );
+        wrapped = word_wrap( msg, 425 );
+        irc_msgfrom( irc, u->nick, wrapped );
+        g_free( wrapped );
 }
 
@@ -750 +735 @@
 {
         struct im_connection *ic = c->ic;
+        char *wrapped;
         user_t *u;
         
@@ -762 +748 @@
                 strip_html( msg );
         
+        wrapped = word_wrap( msg, 425 );
         if( c && u )
-                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, "", msg );
+        {
+                irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, "", wrapped );
+        }
         else
-                imcb_log( ic, "Message from/to conversation %s@0x%x (unknown conv/user): %s", who, (int) c, msg );
+        {
+                imcb_log( ic, "Message from/to conversation %s@0x%x (unknown conv/user): %s", who, (int) c, wrapped );
+        }
+        g_free( wrapped );
 }
 

protocols/nogaim.h

@@ -98 +98 @@
         struct im_connection *ic;
 
+        /* stuff used just for chat */
+        /* The in_room variable is a list of handles (not nicks!), kind of
+         * "nick list". This is how you can check who is in the group chat
+         * already, for example to avoid adding somebody two times. */
         GList *in_room;
         GList *ignored;
@@ -103 +107 @@
         struct groupchat *next;
         char *channel;
+        /* The title variable contains the ID you gave when you created the
+         * chat using imcb_chat_new(). */
         char *title;
         char joined;
+        /* This is for you, you can add your own structure here to extend this
+         * structure for your protocol's needs. */
         void *data;
 };
@@ -123 +131 @@
 struct prpl {
         int options;
+        /* You should set this to the name of your protocol.
+         * - The user sees this name ie. when imcb_log() is used. */
         const char *name;
 
         /* Added this one to be able to add per-account settings, don't think
-           it should be used for anything else. */
+         * it should be used for anything else. You are supposed to use the
+         * set_add() function to add new settings. */
         void (* init)           (account_t *);
-        /* These should all be pretty obvious. */
+        /* The typical usage of the login() function:
+         * - Create an im_connection using imcb_new() from the account_t parameter.
+         * - Initialize your myproto_data struct - you should store all your protocol-specific data there.
+         * - Save your custom structure to im_connection->proto_data.
+         * - Use proxy_connect() to connect to the server.
+         */
         void (* login)          (account_t *);
+        /* Implementing this function is optional. */
         void (* keepalive)      (struct im_connection *);
+        /* In this function you should:
+         * - Tell the server about you are logging out.
+         * - g_free() your myproto_data struct as BitlBee does not know how to
+         *   properly do so.
+         */
         void (* logout)         (struct im_connection *);
         
+        /* This function is called when the user wants to send a message to a handle.
+         * - 'to' is a handle, not a nick
+         * - 'flags' may be ignored
+         */
         int  (* buddy_msg)      (struct im_connection *, char *to, char *message, int flags);
+        /* This function is called then the user uses the /away IRC command.
+         * - 'state' contains the away reason.
+         * - 'message' may be ignored if your protocol does not support it.
+         */
         void (* set_away)       (struct im_connection *, char *state, char *message);
+        /* Implementing this function is optional. */
         void (* get_away)       (struct im_connection *, char *who);
+        /* Implementing this function is optional. */
         int  (* send_typing)    (struct im_connection *, char *who, int flags);
         
-        /* For now BitlBee doesn't really handle groups, just set it to NULL. */
+        /* 'name' is a handle to add/remove. For now BitlBee doesn't really
+         * handle groups, just set it to NULL, so you can ignore that
+         * parameter. */
         void (* add_buddy)      (struct im_connection *, char *name, char *group);
         void (* remove_buddy)   (struct im_connection *, char *name, char *group);
         
-        /* Block list stuff. */
+        /* Block list stuff. Implementing these are optional. */
         void (* add_permit)     (struct im_connection *, char *who);
         void (* add_deny)       (struct im_connection *, char *who);
@@ -151 +185 @@
         
         /* Request profile info. Free-formatted stuff, the IM module gives back
-           this info via imcb_log(). */
+           this info via imcb_log(). Implementing these are optional. */
         void (* get_info)       (struct im_connection *, char *who);
         void (* set_my_name)    (struct im_connection *, char *name);
@@ -157 +191 @@
         
         /* Group chat stuff. */
+        /* This is called when the user uses the /invite IRC command.
+         * - 'who' may be ignored
+         * - 'message' is a handle to invite
+         */
         void (* chat_invite)    (struct groupchat *, char *who, char *message);
+        /* This is called when the user uses the /part IRC command in a group
+         * chat. You just should tell the user about it, nothing more. */
         void (* chat_leave)     (struct groupchat *);
+        /* This is called when the user sends a message to the groupchat.
+         * 'flags' may be ignored. */
         void (* chat_msg)       (struct groupchat *, char *message, int flags);
+        /* This is called when the user uses the /join #nick IRC command.
+         * - 'who' is the handle of the nick
+         */
         struct groupchat *
              (* chat_with)      (struct im_connection *, char *who);
+        /* This is used when the user uses the /join #channel IRC command.  If
+         * your protocol does not support publicly named group chats, then do
+         * not implement this. */
         struct groupchat *
              (* chat_join)      (struct im_connection *, char *room, char *nick, char *password);
         
+        /* You can tell what away states your protocol supports, so that
+         * BitlBee will try to map the IRC away reasons to them, or use
+         * GAIM_AWAY_CUSTOM when calling skype_set_away(). */
         GList *(* away_states)(struct im_connection *ic);
         
-        /* Mainly for AOL, since they think "Bung hole" == "Bu ngho le". *sigh* */
+        /* Mainly for AOL, since they think "Bung hole" == "Bu ngho le". *sigh*
+         * - Most protocols will just want to set this to g_strcasecmp().*/
         int (* handle_cmp) (const char *who1, const char *who2);
 };
@@ -175 +227 @@
 G_MODULE_EXPORT GSList *get_connections();
 G_MODULE_EXPORT struct prpl *find_protocol( const char *name );
+/* When registering a new protocol, you should allocate space for a new prpl
+ * struct, initialize it (set the function pointers to point to your
+ * functions), finally call this function. */
 G_MODULE_EXPORT void register_protocol( struct prpl * );
 
 /* Connection management. */
+/* You will need this function in prpl->login() to get an im_connection from
+ * the account_t parameter. */
 G_MODULE_EXPORT struct im_connection *imcb_new( account_t *acc );
 G_MODULE_EXPORT void imcb_free( struct im_connection *ic );
+/* Once you're connected, you should call this function, so that the user will
+ * see the success. */
 G_MODULE_EXPORT void imcb_connected( struct im_connection *ic );
+/* This can be used to disconnect when something went wrong (ie. read error
+ * from the server). You probably want to set the second parameter to TRUE. */
 G_MODULE_EXPORT void imc_logout( struct im_connection *ic, int allow_reconnect );
 
 /* Communicating with the user. */
+/* A printf()-like function to tell the user anything you want. */
 G_MODULE_EXPORT void imcb_log( struct im_connection *ic, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
+/* To tell the user an error, ie. before logging out when an error occurs. */
 G_MODULE_EXPORT void imcb_error( struct im_connection *ic, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
+/* To ask a your about something.
+ * - 'msg' is the question.
+ * - 'data' can be your custom struct - it will be passed to the callbacks.
+ * - 'doit' or 'dont' will be called depending of the answer of the user.
+ */
 G_MODULE_EXPORT void imcb_ask( struct im_connection *ic, char *msg, void *data, void *doit, void *dont );
 G_MODULE_EXPORT void imcb_ask_add( struct im_connection *ic, char *handle, const char *realname );
 
 /* Buddy management */
+/* This function should be called for each handle which are visible to the
+ * user, usually after a login, or if the user added a buddy and the IM
+ * server confirms that the add was successful. Don't forget to do this! */
 G_MODULE_EXPORT void imcb_add_buddy( struct im_connection *ic, char *handle, char *group );
 G_MODULE_EXPORT void imcb_remove_buddy( struct im_connection *ic, char *handle, char *group );
@@ -197 +268 @@
 
 /* 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, char *handle, char *msg, u_int32_t flags, time_t sent_at );
 G_MODULE_EXPORT void imcb_buddy_typing( struct im_connection *ic, char *handle, u_int32_t flags );
@@ -205 +281 @@
 /* Groupchats */
 G_MODULE_EXPORT void imcb_chat_invited( struct im_connection *ic, char *handle, char *who, char *msg, GList *data );
+/* These two functions are to create a group chat.
+ * - imcb_chat_new(): the 'handle' parameter identifies the chat, like the
+ *   channel name on IRC.
+ * - After you have a groupchat pointer, you should add the handles, finally
+ *   the user her/himself. At that point the group chat will be visible to the
+ *   user, too. */
 G_MODULE_EXPORT struct groupchat *imcb_chat_new( struct im_connection *ic, char *handle );
 G_MODULE_EXPORT void imcb_chat_add_buddy( struct groupchat *b, char *handle );
+/* To remove a handle from a group chat. Reason can be NULL. */
 G_MODULE_EXPORT void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason );
+/* To tell BitlBee 'who' said 'msg' in 'c'. 'flags' and 'sent_at' can be 0. */
 G_MODULE_EXPORT void imcb_chat_msg( struct groupchat *c, char *who, char *msg, u_int32_t flags, time_t sent_at );
 G_MODULE_EXPORT void imcb_chat_free( struct groupchat *c );

root_commands.c

@@ -383 +383 @@
                 }
                 
-                if( cmd[3] )
+                if( cmd[3] && set_name )
                 {
                         set_t *s = set_find( &a->set, set_name );

storage_xml.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "base64.h"
-#include "rc4.h"
+#include "arc.h"
 #include "md5.h"
 
@@ -132 +132 @@
         {
                 char *protocol, *handle, *server, *password = NULL, *autoconnect;
-                char *pass_b64 = NULL, *pass_rc4 = NULL;
+                char *pass_b64 = NULL;
+                unsigned char *pass_cr = NULL;
                 int pass_len;
                 struct prpl *prpl = NULL;
@@ -151 +152 @@
                         g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
                                      "Unknown protocol: %s", protocol );
-                else if( ( pass_len = base64_decode( pass_b64, (unsigned char**) &pass_rc4 ) ) &&
-                                rc4_decode( (unsigned char*) pass_rc4, pass_len,
-                                            (unsigned char**) &password, xd->given_pass ) )
+                else if( ( pass_len = base64_decode( pass_b64, (unsigned char**) &pass_cr ) ) &&
+                                         arc_decode( pass_cr, pass_len, &password, xd->given_pass ) )
                 {
                         xd->current_account = account_add( irc, prpl, handle, password );
@@ -169 +169 @@
                 }
                 
-                g_free( pass_rc4 );
+                g_free( pass_cr );
                 g_free( password );
         }
@@ -410 +410 @@
         md5_finish( &md5_state, pass_md5 );
         /* Save the hash in base64-encoded form. */
-        pass_buf = base64_encode( (char*) pass_md5, 21 );
+        pass_buf = base64_encode( pass_md5, 21 );
         
         if( !xml_printf( fd, 0, "<user nick=\"%s\" password=\"%s\" version=\"%d\">\n", irc->nick, pass_buf, XML_FORMAT_VERSION ) )
@@ -424 +424 @@
         for( acc = irc->accounts; acc; acc = acc->next )
         {
-                char *pass_rc4, *pass_b64;
+                unsigned char *pass_cr;
+                char *pass_b64;
                 int pass_len;
                 
-                pass_len = rc4_encode( (unsigned char*) acc->pass, strlen( acc->pass ), (unsigned char**) &pass_rc4, irc->password );
-                pass_b64 = base64_encode( pass_rc4, pass_len );
-                g_free( pass_rc4 );
+                pass_len = arc_encode( acc->pass, strlen( acc->pass ), (unsigned char**) &pass_cr, irc->password );
+                pass_b64 = base64_encode( pass_cr, pass_len );
+                g_free( pass_cr );
                 
                 if( !xml_printf( fd, 1, "<account protocol=\"%s\" handle=\"%s\" password=\"%s\" autoconnect=\"%d\"", acc->prpl->name, acc->user, pass_b64, acc->auto_connect ) )

tests/Makefile

@@ -13 +13 @@
 main_objs = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o storage_text.o user.o 
 
-test_objs = check.o check_util.o check_nick.o check_md5.o check_irc.o check_help.o check_user.o check_crypting.o check_set.o
+test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.o check_help.o check_user.o check_crypting.o check_set.o
 
 check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o

tests/check.c

@@ -47 +47 @@
 /* From check_md5.c */
 Suite *md5_suite(void);
+
+/* From check_arc.c */
+Suite *arc_suite(void);
 
 /* From check_irc.c */
@@ -102 +105 @@
         srunner_add_suite(sr, nick_suite());
         srunner_add_suite(sr, md5_suite());
+        srunner_add_suite(sr, arc_suite());
         srunner_add_suite(sr, irc_suite());
         srunner_add_suite(sr, help_suite());

tests/check_util.c

@@ -104 +104 @@
 END_TEST
 
+struct
+{
+        char *orig;
+        int line_len;
+        char *wrapped;
+} word_wrap_tests[] = {
+        {
+                "Line-wrapping is not as easy as it seems?",
+                16,
+                "Line-wrapping is\nnot as easy as\nit seems?"
+        },
+        {
+                "Line-wrapping is not as easy as it seems?",
+                8,
+                "Line-\nwrapping\nis not\nas easy\nas it\nseems?"
+        },
+        {
+                "Line-wrapping is\nnot as easy as it seems?",
+                8,
+                "Line-\nwrapping\nis\nnot as\neasy as\nit\nseems?"
+        },
+        {
+                "a aa aaa aaaa aaaaa aaaaaa aaaaaaa aaaaaaaa",
+                5,
+                "a aa\naaa\naaaa\naaaaa\naaaaa\na\naaaaa\naa\naaaaa\naaa",
+        },
+        {
+                "aaaaaaaa aaaaaaa aaaaaa aaaaa aaaa aaa aa a",
+                5,
+                "aaaaa\naaa\naaaaa\naa\naaaaa\na\naaaaa\naaaa\naaa\naa a",
+        },
+        {
+                "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                5,
+                "aaaaa\naaaaa\naaaaa\naaaaa\naaaaa\naaaaa\naaaaa\na",
+        },
+        {
+                NULL
+        }
+};
+
+START_TEST(test_word_wrap)
+        int i;
+        
+        for( i = 0; word_wrap_tests[i].orig && *word_wrap_tests[i].orig; i ++ )
+        {
+                char *wrapped = word_wrap( word_wrap_tests[i].orig, word_wrap_tests[i].line_len );
+                
+                fail_unless( strcmp( word_wrap_tests[i].wrapped, wrapped ) == 0,
+                             "%s (line_len = %d) should wrap to `%s', not to `%s'",
+                             word_wrap_tests[i].orig, word_wrap_tests[i].line_len,
+                             word_wrap_tests[i].wrapped, wrapped );
+                
+                g_free( wrapped );
+        }
+END_TEST
+
 Suite *util_suite (void)
 {
@@ -116 +173 @@
         tcase_add_test (tc_core, test_set_url_username);
         tcase_add_test (tc_core, test_set_url_username_pwd);
+        tcase_add_test (tc_core, test_word_wrap);
         return s;
 }

unix.c

@@ -47 +47 @@
         memset( &global, 0, sizeof( global_t ) );
         
-        b_main_init();
         log_init();
-        nogaim_init();
-        
-        srand( time( NULL ) ^ getpid() );
-        
         CONF_FILE = g_strdup( CONF_FILE_DEF );
-        global.helpfile = g_strdup( HELP_FILE );
-        
         global.conf = conf_load( argc, argv );
         if( global.conf == NULL )
                 return( 1 );
+        
+        b_main_init();
+        nogaim_init();
+        
+        srand( time( NULL ) ^ getpid() );
+        global.helpfile = g_strdup( HELP_FILE );
         
         if( global.conf->runmode == RUNMODE_INETD )