Changeset be609ff

Timestamp:

2010-03-12T19:10:16Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dde9d571

Parents:

08e5bb2 (diff), 8b6b740 (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:

Merging mainline.

Files:

• Makefile (modified) (2 diffs)
• account.c (modified) (4 diffs)
• account.h (modified) (2 diffs)
• bitlbee.conf (modified) (1 diff)
• conf.c (modified) (2 diffs)
• configure (modified) (1 diff)
• crypting.c (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (2 diffs)
• doc/user-guide/misc.xml (modified) (2 diffs)
• irc.c (modified) (3 diffs)
• irc_commands.c (modified) (2 diffs)
• lib/misc.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (3 diffs)
• protocols/jabber/jabber.h (modified) (1 diff)
• protocols/jabber/jabber_util.c (modified) (3 diffs)
• protocols/jabber/presence.c (modified) (3 diffs)
• protocols/msn/msn.c (modified) (2 diffs)
• protocols/msn/msn.h (modified) (1 diff)
• protocols/msn/msn_util.c (modified) (2 diffs)
• protocols/msn/ns.c (modified) (4 diffs)
• protocols/msn/tables.c (modified) (3 diffs)
• protocols/nogaim.c (modified) (5 diffs)
• protocols/nogaim.h (modified) (3 diffs)
• protocols/oscar/oscar.c (modified) (6 diffs)
• protocols/yahoo/libyahoo2.c (modified) (5 diffs)
• protocols/yahoo/yahoo.c (modified) (5 diffs)
• root_commands.c (modified) (1 diff)
• unix.c (modified) (5 diffs)

Makefile

@@ -49 +49 @@
 
 clean: $(subdirs)
-        rm -f *.o $(OUTFILE) core utils/bitlbeed encode decode
+        rm -f *.o $(OUTFILE) core utils/bitlbeed
         $(MAKE) -C tests clean
 
@@ -124 +124 @@
 endif
 
-encode: crypting.c
-        $(CC) crypting.c lib/md5.c $(CFLAGS) -o encode -DCRYPTING_MAIN $(CFLAGS) $(EFLAGS) $(LFLAGS)
-
-decode: encode
-        cp encode decode
-
 ctags: 
         ctags `find . -name "*.c"` `find . -name "*.h"`

account.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -69 +69 @@
                 prpl->init( a );
         
-        return( a );
+        s = set_add( &a->set, "away", NULL, set_eval_account, a );
+        s->flags |= SET_NULL_OK;
+        
+        if( a->flags & ACC_FLAG_STATUS_MESSAGE )
+        {
+                s = set_add( &a->set, "status", NULL, set_eval_account, a );
+                s->flags |= SET_NULL_OK;
+        }
+        
+        return a;
 }
 
@@ -121 +130 @@
                 
                 acc->auto_connect = bool2int( value );
+                return value;
+        }
+        else if( strcmp( set->key, "away" ) == 0 ||
+                 strcmp( set->key, "status" ) == 0 )
+        {
+                if( acc->ic && acc->ic->flags & OPT_LOGGED_IN )
+                {
+                        /* If we're currently on-line, set the var now already
+                           (bit of a hack) and send an update. */
+                        g_free( set->value );
+                        set->value = g_strdup( value );
+                        
+                        imc_away_send_update( acc->ic );
+                }
+                
                 return value;
         }
@@ -267 +291 @@
         p->max = 86400;
         
-        /* Format: /[0-9]+([*+][0-9]+(<[0-9+]))/ */
+        /* Format: /[0-9]+([*+][0-9]+(<[0-9+])?)?/ */
         while( *value && isdigit( *value ) )
                 p->start = p->start * 10 + *value++ - '0';

account.h

@@ -37 +37 @@
         int auto_reconnect_delay;
         int reconnect;
+        int flags;
         
         set_t *set;
@@ -56 +57 @@
 int account_reconnect_delay( account_t *a );
 
-#define ACC_SET_NOSAVE          0x01
-#define ACC_SET_OFFLINE_ONLY    0x02
-#define ACC_SET_ONLINE_ONLY     0x04
+typedef enum
+{
+        ACC_SET_NOSAVE = 0x01,          /* Don't save this setting (i.e. stored elsewhere). */
+        ACC_SET_OFFLINE_ONLY = 0x02,    /* Allow changes only if the acct is offline. */
+        ACC_SET_ONLINE_ONLY = 0x04,     /* Allow changes only if the acct is online. */
+} account_set_flag_t;
+
+typedef enum
+{
+        ACC_FLAG_AWAY_MESSAGE = 0x01,   /* Supports away messages instead of just states. */
+        ACC_FLAG_STATUS_MESSAGE = 0x02, /* Supports status messages (without being away). */
+} account_flag_t;
 
 #endif

bitlbee.conf

@@ -55 +55 @@
 ##
 ## Password the user should enter when logging into a closed BitlBee server.
-## You can also have an MD5-encrypted password here. Format: "md5:", followed
-## by a hash as generated for the <user password=""> attribute in a BitlBee
-## XML file (for now there's no easier way to generate the hash).
+## You can also have a BitlBee-style MD5 hash here. Format: "md5:", followed
+## by a hash as generated by "bitlbee -x hash <password>".
 ##
 # AuthPassword = ItllBeBitlBee   ## Heh.. Our slogan. ;-)

conf.c

@@ -127 +127 @@
                 {
                         printf( "Usage: bitlbee [-D/-F [-i <interface>] [-p <port>] [-n] [-v]] [-I]\n"
-                                "               [-c <file>] [-d <dir>] [-h]\n"
+                                "               [-c <file>] [-d <dir>] [-x] [-h]\n"
                                 "\n"
                                 "An IRC-to-other-chat-networks gateway\n"
@@ -143 +143 @@
                                 "  -c  Load alternative configuration file\n"
                                 "  -d  Specify alternative user configuration directory\n"
+                                "  -x  Command-line interface to password encryption/hashing\n"
                                 "  -h  Show this help page.\n" );
                         return NULL;

configure

@@ -360 +360 @@
         
         ## Yes, you, at the console! How can you authenticate if you don't have any SSL!?
-        if [ "$msn" = "1" ]; then
+        if [ "$msn" = "1" -o "$yahoo" = "1" ]; then
                 echo
-                echo 'Real SSL support is necessary for MSN authentication, will build without'
-                echo 'MSN protocol support.'
+                echo 'WARNING: The MSN and Yahoo! modules will not work without SSL. Disabling.'
                 msn=0
+                yahoo=0
         fi
         

crypting.c

@@ -132 +132 @@
         return (rv);
 }
-
-#ifdef CRYPTING_MAIN
-
-/* A little main() function for people who want a stand-alone program to
-   encode/decode BitlCrypted files. */
-
-int main( int argc, char *argv[] )
-{
-        char *hash, *action, line[256];
-        char* (*func)( char *, const char * );
-        
-        if( argc < 2 )
-        {
-                fprintf( stderr, "Usage: %s <password>\n\n"
-                                 "Reads from stdin, writes to stdout.\n"
-                                 "Call as \"encode\" to encode, \"decode\" to decode.\n", argv[0] );
-                return( 1 );
-        }
-        
-        hash = hashpass( argv[1] );
-        action = argv[0] + strlen( argv[0] ) - strlen( "encode" );
-        
-        if( strcmp( action, "encode" ) == 0 )
-        {
-                fwrite( hash, 32, 1, stdout );
-                func = obfucrypt;
-        }
-        else if( strcmp( action, "decode" ) == 0 )
-        {
-                char hash2[32];
-                
-                fread( hash2, 32, 1, stdin );
-                if( memcmp( hash, hash2, 32 ) != 0 )
-                {
-                        fprintf( stderr, "Passwords don't match. Can't decode.\n" );
-                        return( 1 );
-                }
-                func = deobfucrypt;
-        }
-        else
-        {
-                return( main( 0, NULL ) );
-        }
-        
-        while( fscanf( stdin, "%[^\n]255s", line ) > 0 )
-        {
-                char *out;
-                
-                /* Flush the newline */
-                fgetc( stdin );
-                
-                out = func( line, argv[1] );
-                printf( "%s\n", out );
-                g_free( out );
-        }
-        
-        return( 0 );
-}
-
-#endif

doc/user-guide/commands.xml

@@ -436 +436 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="away" type="string" scope="both">
+                <description>
+                        <para>
+                                To mark yourself as away, it is recommended to just use <emphasis>/away</emphasis>, like on normal IRC networks. If you want to mark yourself as away on only one IM network, you can use this per-account setting.
+                        </para>
+
+                        <para>
+                                You can set it to any value and BitlBee will try to map it to the most appropriate away state for every open IM connection, or set it as a free-form away message where possible.
+                        </para>
+
+                        <para>
+                                Any per-account away setting will override globally set away states. To un-set the setting, use <emphasis>set -del away</emphasis>.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="away_devoice" type="boolean" scope="global">
                 <default>true</default>
@@ -747 +763 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="status" type="string" scope="both">
+                <description>
+                        <para>
+                                Certain protocols (like Jabber/XMPP) support status messages, similar to away messages. They can be used to indicate things like your location or activity, without showing up as away/busy.
+                        </para>
+
+                        <para>
+                                This setting can be used to set such a message. It will be available as a per-account setting for protocols that support it, and also as a global setting (which will then automatically be used for all protocols that support it).
+                        </para>
+
+                        <para>
+                                Away states set using <emphasis>/away</emphasis> or the <emphasis>away</emphasis> setting will override this setting. To un-set the setting, use <emphasis>set -del status</emphasis>.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="strip_html" type="boolean" scope="global">
                 <default>true</default>

doc/user-guide/misc.xml

@@ -86 +86 @@
 
 <para>
-As you might've expected, you can just use the <emphasis>/away</emphasis> command in your IRC client to set an away-state. BitlBee supports most away-states supported by the protocols.
+To mark yourself as away, you can just use the <emphasis>/away</emphasis> command in your IRC client. BitlBee supports most away-states supported by the protocols.
 </para>
 
 <para>
-Not all away states are supported by all protocols, and some protocols have different names for them. BitlBee will try to pick the best available alias from this list for every connection:
+Away states have different names accross different protocols. BitlBee will try to pick the best available option for every connection:
 </para>
 
 <simplelist>
-        <member>Away from computer, Away, Extended away</member>
-        <member>NA, N/A, Not available</member>
-        <member>Busy, Do not disturb, DND, Occupied</member>
-        <member>Be right back, BRB</member>
-        <member>On the phone, Phone, On phone</member>
-        <member>Out to lunch, Lunch, Food</member>
+        <member>Away</member>
+        <member>NA</member>
+        <member>Busy, DND</member>
+        <member>BRB</member>
+        <member>Phone</member>
+        <member>Lunch, Food</member>
         <member>Invisible, Hidden</member>
 </simplelist>
 
 <para>
-So <emphasis>/away Food</emphasis> will set your state to "Out to lunch" on your MSN connection, and for most other connections the default, "Away" or "Away from computer" will be chosen.
+So <emphasis>/away Food</emphasis> will set your state to "Out to lunch" on your MSN connection, and for most other connections the default, "Away" will be chosen.
 </para>
 
@@ -111 +111 @@
 </para>
 
+<para>
+If you want to set an away state for only one of your connections, you can use the per-account <emphasis>away</emphasis> setting. See <emphasis>help set away</emphasis>.
+</para>
+
 </sect1>
 

irc.c

@@ -78 +78 @@
 }
 
+static char *set_eval_away_status( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
+        account_t *a;
+        
+        g_free( set->value );
+        set->value = g_strdup( value );
+        
+        for( a = irc->accounts; a; a = a->next )
+        {
+                struct im_connection *ic = a->ic;
+                
+                if( ic && ic->flags & OPT_LOGGED_IN )
+                        imc_away_send_update( ic );
+        }
+        
+        return value;
+}
+
 irc_t *irc_new( int fd )
 {
@@ -143 +162 @@
         irc_connection_list = g_slist_append( irc_connection_list, irc );
         
+        s = set_add( &irc->set, "away", NULL,  set_eval_away_status, irc );
+        s->flags |= SET_NULL_OK;
         s = set_add( &irc->set, "away_devoice", "true",  set_eval_away_devoice, irc );
         s = set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
@@ -163 +184 @@
         s = set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc );
         s = set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "status", NULL,  set_eval_away_status, irc );
+        s->flags |= SET_NULL_OK;
         s = set_add( &irc->set, "strip_html", "true", NULL, irc );
         s = set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );

irc_commands.c

@@ -448 +448 @@
         user_t *u = user_find( irc, irc->nick );
         char *away = cmd[1];
-        account_t *a;
         
         if( !u ) return;
@@ -475 +474 @@
         }
         
-        for( a = irc->accounts; a; a = a->next )
-        {
-                struct im_connection *ic = a->ic;
-                
-                if( ic && ic->flags & OPT_LOGGED_IN )
-                        imc_set_away( ic, u->away );
-        }
+        set_setstr( &irc->set, "away", u->away );
 }
 

lib/misc.c

@@ -89 +89 @@
         { "gt",     ">" },
         { "amp",    "&" },
+        { "apos",   "'" },
         { "quot",   "\"" },
         { "aacute", "á" },

protocols/jabber/jabber.c

@@ -82 +82 @@
         s = set_add( &acc->set, "xmlconsole", "false", set_eval_bool, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE;
 }
 
@@ -358 +360 @@
         while( bud )
         {
-                imcb_log( ic, "Buddy %s (%d) information:\nAway state: %s\nAway message: %s",
-                                   bud->full_jid, bud->priority,
-                                   bud->away_state ? bud->away_state->full_name : "(none)",
-                                   bud->away_message ? : "(none)" );
+                imcb_log( ic, "Buddy %s (%d) information:", bud->full_jid, bud->priority );
+                if( bud->away_state )
+                        imcb_log( ic, "Away state: %s", bud->away_state->full_name );
+                imcb_log( ic, "Status message: %s", bud->away_message ? : "(none)" );
+                
                 bud = bud->next;
         }
@@ -371 +374 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct jabber_away_state *state;
-        
-        /* Save all this info. We need it, for example, when changing the priority setting. */
-        state = (void *) jabber_away_state_by_name( state_txt );
-        jd->away_state = state ? state : (void *) jabber_away_state_list; /* Fall back to "Away" if necessary. */
+        
+        /* state_txt == NULL -> Not away.
+           Unknown state -> fall back to the first defined away state. */
+        jd->away_state = state_txt ? jabber_away_state_by_name( state_txt )
+                         ? : jabber_away_state_list : NULL;
+        
         g_free( jd->away_message );
         jd->away_message = ( message && *message ) ? g_strdup( message ) : NULL;

protocols/jabber/jabber.h

@@ -84 +84 @@
         /* After changing one of these two (or the priority setting), call
            presence_send_update() to inform the server about the changes. */
-        struct jabber_away_state *away_state;
+        const struct jabber_away_state *away_state;
         char *away_message;
         

protocols/jabber/jabber_util.c

@@ -228 +228 @@
 {
         { "away",  "Away" },
-        { "chat",  "Free for Chat" },
+        { "chat",  "Free for Chat" },   /* WTF actually uses this? */
         { "dnd",   "Do not Disturb" },
         { "xa",    "Extended Away" },
-        { "",      "Online" },
         { "",      NULL }
 };
@@ -238 +237 @@
 {
         int i;
+        
+        if( code == NULL )
+                return NULL;
         
         for( i = 0; jabber_away_state_list[i].full_name; i ++ )
@@ -249 +251 @@
 {
         int i;
+        
+        if( name == NULL )
+                return NULL;
         
         for( i = 0; jabber_away_state_list[i].full_name; i ++ )

protocols/jabber/presence.c

@@ -187 +187 @@
                 int is_away = 0;
 
-                if( send_presence->away_state && !( *send_presence->away_state->code == 0 ||
-                    strcmp( send_presence->away_state->code, "chat" ) == 0 ) )
+                if( send_presence->away_state &&
+                    strcmp( send_presence->away_state->code, "chat" ) != 0 )
                         is_away = OPT_AWAY;
 
                 imcb_buddy_status( ic, send_presence->bare_jid, OPT_LOGGED_IN | is_away,
-                                   ( is_away && send_presence->away_state ) ?
-                                   send_presence->away_state->full_name : NULL,
+                                   is_away ? send_presence->away_state->full_name : NULL,
                                    send_presence->away_message );
         }
@@ -206 +205 @@
         struct jabber_data *jd = ic->proto_data;
         struct xt_node *node, *cap;
-        char *show = jd->away_state->code;
-        char *status = jd->away_message;
         struct groupchat *c;
         int st;
@@ -213 +210 @@
         node = jabber_make_packet( "presence", NULL, NULL, NULL );
         xt_add_child( node, xt_new_node( "priority", set_getstr( &ic->acc->set, "priority" ), NULL ) );
-        if( show && *show )
-                xt_add_child( node, xt_new_node( "show", show, NULL ) );
-        if( status )
-                xt_add_child( node, xt_new_node( "status", status, NULL ) );
+        if( jd->away_state )
+                xt_add_child( node, xt_new_node( "show", jd->away_state->code, NULL ) );
+        if( jd->away_message )
+                xt_add_child( node, xt_new_node( "status", jd->away_message, NULL ) );
         
         /* This makes the packet slightly bigger, but clients interested in

protocols/msn/msn.c

@@ -139 +139 @@
         
         if( l == NULL )
-                for( i = 0; msn_away_state_list[i].number > -1; i ++ )
-                        l = g_list_append( l, (void*) msn_away_state_list[i].name );
+                for( i = 0; *msn_away_state_list[i].code; i ++ )
+                        if( *msn_away_state_list[i].name )
+                                l = g_list_append( l, (void*) msn_away_state_list[i].name );
         
         return l;
@@ -149 +150 @@
         char buf[1024];
         struct msn_data *md = ic->proto_data;
-        const struct msn_away_state *st;
-        
-        if( strcmp( state, GAIM_AWAY_CUSTOM ) == 0 )
-                st = msn_away_state_by_name( "Away" );
+        
+        if( state )
+                md->away_state = msn_away_state_by_name( state ) ? :
+                                 msn_away_state_list + 1;
         else
-                st = msn_away_state_by_name( state );
-        
-        if( !st ) st = msn_away_state_list;
-        md->away_state = st;
-        
-        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, st->code );
+                md->away_state = msn_away_state_list;
+        
+        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, md->away_state->code );
         msn_write( ic, buf, strlen( buf ) );
 }

protocols/msn/msn.h

@@ -97 +97 @@
 struct msn_away_state
 {
-        int number;
         char code[4];
         char name[16];

protocols/msn/msn_util.c

@@ -171 +171 @@
                 
                 /* End of headers? */
-                if( strncmp( text + i - 2, "\n\n", 2 ) == 0 ||
-                    strncmp( text + i - 4, "\r\n\r\n", 4 ) == 0 ||
-                    strncmp( text + i - 2, "\r\r", 2 ) == 0 )
+                if( ( i >= 4 && strncmp( text + i - 4, "\r\n\r\n", 4 ) == 0 ) ||
+                    ( i >= 2 && ( strncmp( text + i - 2, "\n\n", 2 ) == 0 ||   
+                                  strncmp( text + i - 2, "\r\r", 2 ) == 0 ) ) )
                 {
                         break;
@@ -374 +374 @@
         *list = NULL;
         
-        imcb_log( ic, ret->str );
+        imcb_log( ic, "%s", ret->str );
         g_string_free( ret, TRUE );
 }

protocols/msn/ns.c

@@ -420 +420 @@
                 {
                         /* FIXME: Warn/Bomb about unknown away state? */
-                        st = msn_away_state_list;
-                }
-                
-                imcb_buddy_status( ic, cmd[3], OPT_LOGGED_IN |
-                                   ( st->number ? OPT_AWAY : 0 ), st->name, NULL );
+                        st = msn_away_state_list + 1;
+                }
+                
+                imcb_buddy_status( ic, cmd[3], OPT_LOGGED_IN | 
+                                   ( st != msn_away_state_list ? OPT_AWAY : 0 ),
+                                   st->name, NULL );
         }
         else if( strcmp( cmd[0], "FLN" ) == 0 )
@@ -449 +450 @@
                 {
                         /* FIXME: Warn/Bomb about unknown away state? */
-                        st = msn_away_state_list;
-                }
-                
-                imcb_buddy_status( ic, cmd[2], OPT_LOGGED_IN |
-                                   ( st->number ? OPT_AWAY : 0 ), st->name, NULL );
+                        st = msn_away_state_list + 1;
+                }
+                
+                imcb_buddy_status( ic, cmd[2], OPT_LOGGED_IN | 
+                                   ( st != msn_away_state_list ? OPT_AWAY : 0 ),
+                                   st->name, NULL );
         }
         else if( strcmp( cmd[0], "RNG" ) == 0 )
@@ -663 +665 @@
                                 }
                                 
-                                if( arg1 ) g_free( arg1 );
-                                if( mtype ) g_free( mtype );
+                                g_free( arg1 );
+                                g_free( mtype );
                         }
                         else if( g_strncasecmp( ct, "text/x-msmsgsprofile", 20 ) == 0 )
@@ -672 +674 @@
                         else if( g_strncasecmp( ct, "text/x-msmsgsinitialemailnotification", 37 ) == 0 )
                         {
-                                char *inbox = msn_findheader( body, "Inbox-Unread:", blen );
-                                char *folders = msn_findheader( body, "Folders-Unread:", blen );
-                                
-                                if( inbox && folders && set_getbool( &ic->acc->set, "mail_notifications" ) )
+                                if( set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
-                                        imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
+                                        char *inbox = msn_findheader( body, "Inbox-Unread:", blen );
+                                        char *folders = msn_findheader( body, "Folders-Unread:", blen );
+
+                                        if( inbox && folders )
+                                                imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
+                                        
+                                        g_free( inbox );
+                                        g_free( folders );
                                 }
-                                
-                                g_free( inbox );
-                                g_free( folders );
                         }
                         else if( g_strncasecmp( ct, "text/x-msmsgsemailnotification", 30 ) == 0 )
                         {
-                                char *from = msn_findheader( body, "From-Addr:", blen );
-                                char *fromname = msn_findheader( body, "From:", blen );
-                                
-                                if( from && fromname && set_getbool( &ic->acc->set, "mail_notifications" ) )
+                                if( set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
-                                        imcb_log( ic, "Received an e-mail message from %s <%s>.", fromname, from );
+                                        char *from = msn_findheader( body, "From-Addr:", blen );
+                                        char *fromname = msn_findheader( body, "From:", blen );
+                                        
+                                        if( from && fromname )
+                                                imcb_log( ic, "Received an e-mail message from %s <%s>.", fromname, from );
+
+                                        g_free( from );
+                                        g_free( fromname );
                                 }
                         }

protocols/msn/tables.c

@@ -29 +29 @@
 const struct msn_away_state msn_away_state_list[] =
 {
-        {  0, "NLN", "Available" },
-        {  1, "BSY", "Busy" },
-        {  3, "IDL", "Idle" },
-        {  5, "BRB", "Be Right Back" },
-        {  7, "AWY", "Away" },
-        {  9, "PHN", "On the Phone" },
-        { 11, "LUN", "Out to Lunch" },
-        { 13, "HDN", "Hidden" },
-        { -1, "",    "" }
+        { "NLN", "" },
+        { "AWY", "Away" },
+        { "BSY", "Busy" },
+        { "IDL", "Idle" },
+        { "BRB", "Be Right Back" },
+        { "PHN", "On the Phone" },
+        { "LUN", "Out to Lunch" },
+        { "HDN", "Hidden" },
+        { "",    "" }
 };
-
-const struct msn_away_state *msn_away_state_by_number( int number )
-{
-        int i;
-        
-        for( i = 0; msn_away_state_list[i].number > -1; i ++ )
-                if( msn_away_state_list[i].number == number )
-                        return( msn_away_state_list + i );
-        
-        return( NULL );
-}
 
 const struct msn_away_state *msn_away_state_by_code( char *code )
@@ -55 +44 @@
         int i;
         
-        for( i = 0; msn_away_state_list[i].number > -1; i ++ )
+        for( i = 0; *msn_away_state_list[i].code; i ++ )
                 if( g_strcasecmp( msn_away_state_list[i].code, code ) == 0 )
                         return( msn_away_state_list + i );
         
-        return( NULL );
+        return NULL;
 }
 
@@ -66 +55 @@
         int i;
         
-        for( i = 0; msn_away_state_list[i].number > -1; i ++ )
+        for( i = 0; *msn_away_state_list[i].code; i ++ )
                 if( g_strcasecmp( msn_away_state_list[i].name, name ) == 0 )
                         return( msn_away_state_list + i );
         
-        return( NULL );
+        return NULL;
 }
 

protocols/nogaim.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2006 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -268 +268 @@
         ic->flags |= OPT_LOGGED_IN;
         
-        /* Also necessary when we're not away, at least for some of the
-           protocols. */
-        imc_set_away( ic, u->away );
+        /* Necessary to send initial presence status, even if we're not away. */
+        imc_away_send_update( ic );
         
         /* Apparently we're connected successfully, so reset the
@@ -1070 +1069 @@
 }
 
-static char *imc_away_alias_find( GList *gcm, char *away );
-
-int imc_set_away( struct im_connection *ic, char *away )
-{
-        GList *m, *ms;
-        char *s;
-        
-        if( !away ) away = "";
-        ms = m = ic->acc->prpl->away_states( ic );
-        
-        while( m )
-        {
-                if( *away )
-                {
-                        if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )
-                                break;
-                }
-                else
-                {
-                        if( g_strcasecmp( m->data, "Available" ) == 0 )
-                                break;
-                        if( g_strcasecmp( m->data, "Online" ) == 0 )
-                                break;
-                }
-                m = m->next;
-        }
-        
-        if( m )
-        {
-                ic->acc->prpl->set_away( ic, m->data, *away ? away : NULL );
-        }
-        else
-        {
-                s = imc_away_alias_find( ms, away );
-                if( s )
-                {
-                        ic->acc->prpl->set_away( ic, s, away );
-                        if( set_getbool( &ic->irc->set, "debug" ) )
-                                imcb_log( ic, "Setting away state to %s", s );
-                }
-                else
-                        ic->acc->prpl->set_away( ic, GAIM_AWAY_CUSTOM, away );
-        }
-        
-        return( 1 );
+static char *imc_away_state_find( GList *gcm, char *away, char **message );
+
+int imc_away_send_update( struct im_connection *ic )
+{
+        char *away, *msg = NULL;
+        
+        away = set_getstr( &ic->acc->set, "away" ) ?
+             : set_getstr( &ic->irc->set, "away" );
+        if( away && *away )
+        {
+                GList *m = ic->acc->prpl->away_states( ic );
+                msg = ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? away : NULL;
+                away = imc_away_state_find( m, away, &msg ) ? : m->data;
+        }
+        else if( ic->acc->flags & ACC_FLAG_STATUS_MESSAGE )
+        {
+                away = NULL;
+                msg = set_getstr( &ic->acc->set, "status" ) ?
+                    : set_getstr( &ic->irc->set, "status" );
+        }
+        
+        ic->acc->prpl->set_away( ic, away, msg );
+        
+        return 1;
 }
 
@@ -1129 +1107 @@
 };
 
-static char *imc_away_alias_find( GList *gcm, char *away )
+static char *imc_away_state_find( GList *gcm, char *away, char **message )
 {
         GList *m;
         int i, j;
         
+        for( m = gcm; m; m = m->next )
+                if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )
+                {
+                        /* At least the Yahoo! module works better if message
+                           contains no data unless it adds something to what
+                           we have in state already. */
+                        if( strlen( m->data ) == strlen( away ) )
+                                *message = NULL;
+                        
+                        return m->data;
+                }
+        
         for( i = 0; *imc_away_alias_list[i]; i ++ )
         {
+                int keep_message;
+                
                 for( j = 0; imc_away_alias_list[i][j]; j ++ )
                         if( g_strncasecmp( away, imc_away_alias_list[i][j], strlen( imc_away_alias_list[i][j] ) ) == 0 )
+                        {
+                                keep_message = strlen( away ) != strlen( imc_away_alias_list[i][j] );
                                 break;
+                        }
                 
                 if( !imc_away_alias_list[i][j] )        /* If we reach the end, this row */
@@ -1146 +1141 @@
                 for( j = 0; imc_away_alias_list[i][j]; j ++ )
                 {
-                        m = gcm;
-                        while( m )
-                        {
+                        for( m = gcm; m; m = m->next )
                                 if( g_strcasecmp( imc_away_alias_list[i][j], m->data ) == 0 )
-                                        return( imc_away_alias_list[i][j] );
-                                m = m->next;
-                        }
-                }
-        }
-        
-        return( NULL );
+                                {
+                                        if( !keep_message )
+                                                *message = NULL;
+                                        
+                                        return imc_away_alias_list[i][j];
+                                }
+                }
+                
+                /* No need to look further, apparently this state doesn't
+                   have any good alias for this protocol. */
+                break;
+        }
+        
+        return NULL;
 }
 

protocols/nogaim.h

@@ -49 +49 @@
 
 #define WEBSITE "http://www.bitlbee.org/"
-#define GAIM_AWAY_CUSTOM "Custom"
 
 /* Sharing flags between all kinds of things. I just hope I won't hit any
@@ -218 +217 @@
         
         /* 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(). */
+         * BitlBee will try to map the IRC away reasons to them. If your
+         * protocol doesn't have any, just return one generic "Away". */
         GList *(* away_states)(struct im_connection *ic);
         
@@ -315 +314 @@
 
 /* Actions, or whatever. */
-int imc_set_away( struct im_connection *ic, char *away );
+int imc_away_send_update( struct im_connection *ic );
 int imc_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags );
 int imc_chat_msg( struct groupchat *c, char *msg, int flags );

protocols/oscar/oscar.c

@@ -380 +380 @@
                 s->flags |= ACC_SET_OFFLINE_ONLY;
         }
+        
+        acc->flags |= ACC_FLAG_AWAY_MESSAGE;
 }
 
@@ -1952 +1954 @@
 static void oscar_set_away_aim(struct im_connection *ic, struct oscar_data *od, const char *state, const char *message)
 {
+        if (state == NULL)
+                state = "";
 
         if (!g_strcasecmp(state, _("Visible"))) {
@@ -1959 +1963 @@
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_INVISIBLE);
                 return;
-        } /* else... */
+        } else if (message == NULL) {
+                message = state;
+        }
 
         if (od->rights.maxawaymsglen == 0)
@@ -2002 +2008 @@
         }
 
-        if (!g_strcasecmp(state, "Online")) {
+        if (state == NULL) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL);
         } else if (!g_strcasecmp(state, "Away")) {
@@ -2027 +2033 @@
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_INVISIBLE);
                 ic->away = g_strdup(msg);
-        } else if (!g_strcasecmp(state, GAIM_AWAY_CUSTOM)) {
+        } else {
                 if (no_message) {
                         aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL);
@@ -2276 +2282 @@
 {
         struct oscar_data *od = ic->proto_data;
-        GList *m = NULL;
-
-        if (!od->icq)
-                return g_list_append(m, GAIM_AWAY_CUSTOM);
-
-        m = g_list_append(m, "Online");
-        m = g_list_append(m, "Away");
-        m = g_list_append(m, "Do Not Disturb");
-        m = g_list_append(m, "Not Available");
-        m = g_list_append(m, "Occupied");
-        m = g_list_append(m, "Free For Chat");
-        m = g_list_append(m, "Invisible");
-
-        return m;
+
+        if (od->icq) {
+                static GList *m = NULL;
+                m = g_list_append(m, "Away");
+                m = g_list_append(m, "Do Not Disturb");
+                m = g_list_append(m, "Not Available");
+                m = g_list_append(m, "Occupied");
+                m = g_list_append(m, "Free For Chat");
+                m = g_list_append(m, "Invisible");
+                return m;
+        } else {
+                static GList *m = NULL;
+                m = g_list_append(m, "Away");
+                return m;
+        }
 }
 

protocols/yahoo/libyahoo2.c

@@ -1530 +1530 @@
                         newbud = y_new0(struct yahoo_buddy, 1);
                         newbud->id = strdup(pair->value);
-                        if(cur_group)
+                        if (cur_group) {
                                 newbud->group = strdup(cur_group);
-                        else {
-                                struct yahoo_buddy *lastbud = (struct yahoo_buddy *)y_list_nth(
-                                                                yd->buddies, y_list_length(yd->buddies)-1)->data;
-                                newbud->group = strdup(lastbud->group);
+                        } else {
+                                YList *last;
+                                struct yahoo_buddy *lastbud;
+                                
+                                for (last = yd->buddies; last && last->next; last = last->next);
+                                if (last) {
+                                        lastbud = last->data;
+                                        newbud->group = strdup(lastbud->group);
+                                } else {
+                                        newbud->group = strdup("Buddies");
+                                }
                         }
 
@@ -2393 +2400 @@
 {
         struct yahoo_https_auth_data *had = req->data;
-        struct yahoo_input_data *yid = had->yid;
-        struct yahoo_data *yd = yid->yd;
+        struct yahoo_input_data *yid;
+        struct yahoo_data *yd;
         int st;
+        
+        if (y_list_find(inputs, had->yid) == NULL)
+                return;
+        
+        yid = had->yid;
+        yd = yid->yd;
         
         if (req->status_code != 200) {
@@ -2436 +2449 @@
 {
         struct yahoo_https_auth_data *had = req->data;
-        struct yahoo_input_data *yid = had->yid;
-        struct yahoo_data *yd = yid->yd;
+        struct yahoo_input_data *yid;
+        struct yahoo_data *yd;
         struct yahoo_packet *pack;
-        char *crumb;
+        char *crumb = NULL;
         int st;
+        
+        if (y_list_find(inputs, had->yid) == NULL)
+                return;
+        
+        yid = had->yid;
+        yd = yid->yd;
         
         md5_byte_t result[16];
@@ -4080 +4099 @@
 
         yd = yid->yd;
-
         old_status = yd->current_status;
-
-        if (msg && strncmp(msg,"Invisible",9)) {
-                yd->current_status = YAHOO_STATUS_CUSTOM;
-        } else {
-                yd->current_status = state;
-        }
+        yd->current_status = state;
 
         /* Thank you libpurple :) */
@@ -4102 +4115 @@
         snprintf(s, sizeof(s), "%d", yd->current_status);
         yahoo_packet_hash(pkt, 10, s);
-         
-        if (yd->current_status == YAHOO_STATUS_CUSTOM) {
-                yahoo_packet_hash(pkt, 19, msg);
-        } else {
-                yahoo_packet_hash(pkt, 19, "");
-        }
-        
+        yahoo_packet_hash(pkt, 19, msg && state == YAHOO_STATUS_CUSTOM ? msg : "");
         yahoo_packet_hash(pkt, 47, (away == 2)? "2": (away) ?"1":"0");
-
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);

protocols/yahoo/yahoo.c

@@ -130 +130 @@
 {
         set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
+        
+        acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE;
 }
 
@@ -197 +199 @@
 {
         struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
-        char *away;
-        
-        away = NULL;
-        
-        if( state && msg && g_strcasecmp( state, msg ) != 0 )
-        {
-                yd->current_status = YAHOO_STATUS_CUSTOM;
-                away = "";
-        }
-        else if( state )
-        {
-                /* Set msg to NULL since (if it isn't NULL already) it's equal
-                   to state. msg must be empty if we want to use an existing
-                   away state. */
-                msg = NULL;
-                
-                away = "";
-                if( g_strcasecmp( state, "Available" ) == 0 )
-                {
-                        yd->current_status = YAHOO_STATUS_AVAILABLE;
-                        away = NULL;
-                }
-                else if( g_strcasecmp( state, "Be Right Back" ) == 0 )
+        
+        if( state && msg == NULL )
+        {
+                /* Use these states only if msg doesn't contain additional
+                   info since away messages are only supported with CUSTOM. */
+                if( g_strcasecmp( state, "Be Right Back" ) == 0 )
                         yd->current_status = YAHOO_STATUS_BRB;
                 else if( g_strcasecmp( state, "Busy" ) == 0 )
@@ -239 +224 @@
                 else if( g_strcasecmp( state, "Invisible" ) == 0 )
                         yd->current_status = YAHOO_STATUS_INVISIBLE;
-                else if( g_strcasecmp( state, GAIM_AWAY_CUSTOM ) == 0 )
-                {
-                        yd->current_status = YAHOO_STATUS_AVAILABLE;
-                        
-                        away = NULL;
-                }
-        }
+                else
+                        yd->current_status = YAHOO_STATUS_CUSTOM;
+        }
+        else if( state )
+                yd->current_status = YAHOO_STATUS_CUSTOM;
         else
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        yahoo_set_away( yd->y2_id, yd->current_status, msg, away != NULL ? 2 : 0 );
+        yahoo_set_away( yd->y2_id, yd->current_status, msg, state ? 2 : 0 );
 }
 
@@ -258 +241 @@
         if( m == NULL )
         {
-                m = g_list_append( m, "Available" );
                 m = g_list_append( m, "Be Right Back" );
                 m = g_list_append( m, "Busy" );
@@ -269 +251 @@
                 m = g_list_append( m, "Stepped Out" );
                 m = g_list_append( m, "Invisible" );
-                m = g_list_append( m, GAIM_AWAY_CUSTOM );
         }
         

root_commands.c

@@ -1115 +1115 @@
                 irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "chat", cmd[1] );
         }
-
-
-
-#if 0
-        account_t *a;
-        struct im_connection *ic;
-        char *chat, *channel, *nick = NULL, *password = NULL;
-        struct groupchat *c;
-        
-        if( !( a = account_get( irc, cmd[1] ) ) )
-        {
-                irc_usermsg( irc, "Invalid account" );
-                return;
-        }
-        else if( !( a->ic && ( a->ic->flags & OPT_LOGGED_IN ) ) )
-        {
-                irc_usermsg( irc, "That account is not on-line" );
-                return;
-        }
-        else if( a->prpl->chat_join == NULL )
-        {
-                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
-                return;
-        }
-        ic = a->ic;
-        
-        chat = cmd[2];
-        if( cmd[3] )
-        {
-                if( strchr( CTYPES, cmd[3][0] ) == NULL )
-                        channel = g_strdup_printf( "&%s", cmd[3] );
-                else
-                        channel = g_strdup( cmd[3] );
-        }
-        else
-        {
-                char *s;
-                
-                channel = g_strdup_printf( "&%s", chat );
-                if( ( s = strchr( channel, '@' ) ) )
-                        *s = 0;
-        }
-        if( cmd[3] && cmd[4] )
-                nick = cmd[4];
-        else
-                nick = irc->nick;
-        if( cmd[3] && cmd[4] && cmd[5] )
-                password = cmd[5];
-        
-        if( !nick_ok( channel + 1 ) )
-        {
-                irc_usermsg( irc, "Invalid channel name: %s", channel );
-                g_free( channel );
-                return;
-        }
-        else if( g_strcasecmp( channel, irc->channel ) == 0 || irc_chat_by_channel( irc, channel ) )
-        {
-                irc_usermsg( irc, "Channel already exists: %s", channel );
-                g_free( channel );
-                return;
-        }
-        
-        if( ( c = a->prpl->chat_join( ic, chat, nick, password ) ) )
-        {
-                g_free( c->channel );
-                c->channel = channel;
-        }
-        else
-        {
-                irc_usermsg( irc, "Tried to join chat, not sure if this was successful" );
-                g_free( channel );
-        }
-#endif
 }
 

unix.c

@@ -25 +25 @@
 
 #include "bitlbee.h"
+
+#include "arc.h"
+#include "base64.h"
 #include "commands.h"
-#include "crypting.h"
 #include "protocols/nogaim.h"
 #include "help.h"
 #include "ipc.h"
+#include "md5.h"
+#include "misc.h"
 #include <signal.h>
 #include <unistd.h>
@@ -40 +44 @@
 static void sighandler( int signal );
 
+static int crypt_main( int argc, char *argv[] );
+
 int main( int argc, char *argv[] )
 {
@@ -45 +51 @@
         char *old_cwd = NULL;
         struct sigaction sig, old;
+        
+        if( argc > 1 && strcmp( argv[1], "-x" ) == 0 )
+                return crypt_main( argc, argv );
         
         log_init();
@@ -159 +168 @@
 }
 
+static int crypt_main( int argc, char *argv[] )
+{
+        int pass_len;
+        unsigned char *pass_cr, *pass_cl;
+        
+        if( argc < 4 || ( strcmp( argv[2], "hash" ) != 0 &&
+                          strcmp( argv[2], "unhash" ) != 0 && argc < 5 ) )
+        {
+                printf( "Supported:\n"
+                        "  %s -x enc <key> <cleartext password>\n"
+                        "  %s -x dec <key> <encrypted password>\n"
+                        "  %s -x hash <cleartext password>\n"
+                        "  %s -x unhash <hashed password>\n"
+                        "  %s -x chkhash <hashed password> <cleartext password>\n",
+                        argv[0], argv[0], argv[0], argv[0], argv[0] );
+        }
+        else if( strcmp( argv[2], "enc" ) == 0 )
+        {
+                pass_len = arc_encode( argv[4], strlen( argv[4] ), (unsigned char**) &pass_cr, argv[3], 12 );
+                printf( "%s\n", base64_encode( pass_cr, pass_len ) );
+        }
+        else if( strcmp( argv[2], "dec" ) == 0 )
+        {
+                pass_len = base64_decode( argv[4], (unsigned char**) &pass_cr );
+                arc_decode( pass_cr, pass_len, (char**) &pass_cl, argv[3] );
+                printf( "%s\n", pass_cl );
+        }
+        else if( strcmp( argv[2], "hash" ) == 0 )
+        {
+                md5_byte_t pass_md5[21];
+                md5_state_t md5_state;
+                
+                random_bytes( pass_md5 + 16, 5 );
+                md5_init( &md5_state );
+                md5_append( &md5_state, (md5_byte_t*) argv[3], strlen( argv[3] ) );
+                md5_append( &md5_state, pass_md5 + 16, 5 ); /* Add the salt. */
+                md5_finish( &md5_state, pass_md5 );
+                
+                printf( "%s\n", base64_encode( pass_md5, 21 ) );
+        }
+        else if( strcmp( argv[2], "unhash" ) == 0 )
+        {
+                printf( "Hash %s submitted to a massive Beowulf cluster of\n"
+                        "overclocked 486s. Expect your answer next year somewhere around this time. :-)\n", argv[3] );
+        }
+        else if( strcmp( argv[2], "chkhash" ) == 0 )
+        {
+                char *hash = strncmp( argv[3], "md5:", 4 ) == 0 ? argv[3] + 4 : argv[3];
+                int st = md5_verify_password( argv[4], hash );
+                
+                printf( "Hash %s given password.\n", st == 0 ? "matches" : "does not match" );
+                
+                return st;
+        }
+        
+        return 0;
+}
+
 static void sighandler( int signal )
 {
@@ -214 +281 @@
         return( (double) time->tv_sec + (double) time->tv_usec / 1000000 );
 }
-
-