Changeset 2288705

Timestamp:

2009-12-07T21:54:19Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1c3008a

Parents:

aac4017 (diff), 36cf9fd (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 head.

Files:

• Makefile (modified) (2 diffs)
• account.c (modified) (10 diffs)
• account.h (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• chat.c (added)
• chat.h (added)
• conf.c (modified) (2 diffs)
• configure (modified) (3 diffs)
• debian/bitlbee.init (modified) (3 diffs)
• debian/changelog (modified) (1 diff)
• debian/patches/bitlbee.conf.diff (added)
• debian/postinst (modified) (2 diffs)
• debian/prerm (modified) (1 diff)
• debian/rules (modified) (1 diff)
• doc/CHANGES (modified) (1 diff)
• doc/user-guide/Makefile (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (7 diffs)
• doc/user-guide/help.xml (modified) (1 diff)
• doc/user-guide/misc.xml (modified) (1 diff)
• doc/user-guide/user-guide.xml (modified) (1 diff)
• irc.c (modified) (8 diffs)
• irc.h (modified) (4 diffs)
• irc_commands.c (modified) (4 diffs)
• lib/events_libevent.c (modified) (4 diffs)
• lib/http_client.c (modified) (3 diffs)
• lib/http_client.h (modified) (1 diff)
• lib/ini.c (modified) (2 diffs)
• lib/ini.h (modified) (1 diff)
• lib/misc.c (modified) (1 diff)
• lib/proxy.c (modified) (1 diff)
• lib/xmltree.c (modified) (1 diff)
• lib/xmltree.h (modified) (1 diff)
• protocols/jabber/conference.c (modified) (4 diffs)
• protocols/jabber/iq.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (2 diffs)
• protocols/jabber/jabber.h (modified) (2 diffs)
• protocols/jabber/jabber_util.c (modified) (1 diff)
• protocols/jabber/presence.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (10 diffs)
• protocols/nogaim.h (modified) (7 diffs)
• protocols/oscar/aim.h (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (12 diffs)
• protocols/yahoo/libyahoo2.c (modified) (31 diffs)
• protocols/yahoo/yahoo.c (modified) (9 diffs)
• protocols/yahoo/yahoo2.h (modified) (1 diff)
• protocols/yahoo/yahoo2_callbacks.h (modified) (1 diff)
• protocols/yahoo/yahoo2_types.h (modified) (4 diffs)
• root_commands.c (modified) (19 diffs)
• set.c (modified) (7 diffs)
• set.h (modified) (3 diffs)
• storage.c (modified) (6 diffs)
• storage.h (modified) (2 diffs)
• storage_text.c (modified) (4 diffs)
• storage_xml.c (modified) (16 diffs)
• tests/Makefile (modified) (1 diff)
• tests/check_set.c (modified) (2 diffs)
• user.c (modified) (1 diff)
• user.h (modified) (1 diff)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o crypting.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o dcc.o
-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/sha1.h lib/ssl_client.h lib/url.h protocols/nogaim.h protocols/ft.h lib/ftutil.h
+objects = account.o bitlbee.o chat.o crypting.o dcc.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
+headers = account.h bitlbee.h commands.h conf.h config.h 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/ftutil.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/ft.h protocols/nogaim.h
 subdirs = lib protocols
 
@@ -105 +105 @@
         x=$$(basename $$(pwd)); \
         cd ..; \
-        tar czf $$x.tar.gz --exclude=debian --exclude=.bzr $$x
+        tar czf $$x.tar.gz --exclude=debian --exclude=.bzr* $$x
 
 $(subdirs):

account.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "account.h"
+#include "chat.h"
 
 account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass )
@@ -55 +56 @@
         
         s = set_add( &a->set, "password", NULL, set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE;
+        s->flags |= ACC_SET_NOSAVE | SET_NULL_OK;
         
         s = set_add( &a->set, "username", NULL, set_eval_account, a );
@@ -77 +78 @@
         /* Double-check: We refuse to edit on-line accounts. */
         if( set->flags & ACC_SET_OFFLINE_ONLY && acc->ic )
-                return NULL;
-        
-        if( strcmp( set->key, "username" ) == 0 )
+                return SET_INVALID;
+        
+        if( strcmp( set->key, "server" ) == 0 )
+        {
+                g_free( acc->server );
+                if( value && *value )
+                {
+                        acc->server = g_strdup( value );
+                        return value;
+                }
+                else
+                {
+                        acc->server = g_strdup( set->def );
+                        return g_strdup( set->def );
+                }
+        }
+        else if( strcmp( set->key, "username" ) == 0 )
         {
                 g_free( acc->user );
@@ -87 +102 @@
         else if( strcmp( set->key, "password" ) == 0 )
         {
-                g_free( acc->pass );
-                acc->pass = g_strdup( value );
-                return NULL;    /* password shouldn't be visible in plaintext! */
-        }
-        else if( strcmp( set->key, "server" ) == 0 )
-        {
-                g_free( acc->server );
-                if( *value )
-                {
-                        acc->server = g_strdup( value );
-                        return value;
+                if( value )
+                {
+                        g_free( acc->pass );
+                        acc->pass = g_strdup( value );
+                        return NULL;    /* password shouldn't be visible in plaintext! */
                 }
                 else
                 {
-                        acc->server = NULL;
-                        return g_strdup( set->def );
+                        /* NULL can (should) be stored in the set_t
+                           variable, but is otherwise not correct. */
+                        return SET_INVALID;
                 }
         }
@@ -108 +118 @@
         {
                 if( !is_bool( value ) )
-                        return NULL;
+                        return SET_INVALID;
                 
                 acc->auto_connect = bool2int( value );
@@ -114 +124 @@
         }
         
-        return NULL;
+        return SET_INVALID;
 }
 
@@ -181 +191 @@
 {
         account_t *a, *l = NULL;
+        struct chat *c, *nc;
         
         if( acc->ic )
@@ -193 +204 @@
                         else
                                 irc->accounts = a->next;
+                        
+                        for( c = irc->chatrooms; c; c = nc )
+                        {
+                                nc = c->next;
+                                if( acc == c->acc )
+                                        chat_del( irc, c );
+                        }
                         
                         while( a->set )
@@ -254 +272 @@
         
         /* Sure, call me evil for implementing my own fscanf here, but it's
-           dead simple and I'm immediately at the next part to parse. */
+           dead simple and I immediately know where to continue parsing. */
         
         if( *value == 0 )
@@ -287 +305 @@
         struct account_reconnect_delay p;
         
-        return account_reconnect_delay_parse( value, &p ) ? value : NULL;
+        return account_reconnect_delay_parse( value, &p ) ? value : SET_INVALID;
 }
 

account.h

@@ -56 +56 @@
 int account_reconnect_delay( account_t *a );
 
-#define ACC_SET_NOSAVE          1
-#define ACC_SET_OFFLINE_ONLY    2
-#define ACC_SET_ONLINE_ONLY     4
+#define ACC_SET_NOSAVE          0x01
+#define ACC_SET_OFFLINE_ONLY    0x02
+#define ACC_SET_ONLINE_ONLY     0x04
 
 #endif

bitlbee.h

@@ -33 +33 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.2.1"
+#define BITLBEE_VERSION "1.2.4"
 #define VERSION BITLBEE_VERSION
 

conf.c

@@ -335 +335 @@
                         else
                         {
-                                fprintf( stderr, "Error: Unknown setting `%s` in configuration file.\n", ini->key );
+                                fprintf( stderr, "Error: Unknown setting `%s` in configuration file (line %d).\n", ini->key, ini->line );
                                 return 0;
                                 /* For now just ignore unknown keys... */
@@ -342 +342 @@
                 else if( g_strcasecmp( ini->section, "defaults" ) != 0 )
                 {
-                        fprintf( stderr, "Error: Unknown section [%s] in configuration file. "
-                                         "BitlBee configuration must be put in a [settings] section!\n", ini->section );
+                        fprintf( stderr, "Error: Unknown section [%s] in configuration file (line %d). "
+                                         "BitlBee configuration must be put in a [settings] section!\n", ini->section, ini->line );
                         return 0;
                 }

configure

@@ -267 +267 @@
 detect_ldap()
 {
-        TMPFILE=`mktemp`
+        TMPFILE=$(mktemp)
         if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
                 cat<<EOF>>Makefile.settings
@@ -280 +280 @@
                 ret=0
         fi
+}
+
+RESOLV_TESTCODE='
+#include <arpa/nameser.h>
+#include <resolv.h> 
+
+int main()
+{
+        ns_initparse( NULL, 0, NULL );
+        ns_parserr( NULL, ns_s_an, 0, NULL );
+}
+'
+
+detect_resolv_dynamic()
+{
+        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -lresolv >/dev/null 2>/dev/null
+        if [ "$?" = "0" ]; then
+                echo 'EFLAGS+=-lresolv' >> Makefile.settings
+                return 0
+        fi
+
+        return 1
+}
+
+detect_resolv_static()
+{
+        for i in $systemlibdirs; do
+                if [ -f $i/libresolv.a ]; then
+                        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null
+                        if [ "$?" = "0" ]; then
+                                echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
+                                return 0
+                        fi
+                fi
+        done
+
+        return 1
 }
 
@@ -349 +386 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
-for i in $systemlibdirs; do
-        if [ -f $i/libresolv.a ]; then
-                echo '#define HAVE_RESOLV_A' >> config.h
-                echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
-                break
-        fi
-done
+if detect_resolv_dynamic || detect_resolv_static; then
+        echo '#define HAVE_RESOLV_A' >> config.h
+fi
 
 STORAGES="text xml"

debian/bitlbee.init

@@ -32 +32 @@
 fi
 
-[ "$BITLBEE_DISABLED" = "1" ] && exit 0
-
 
 #
@@ -41 +39 @@
         # Make sure BitlBee can actually write its PID...
         touch /var/run/bitlbee.pid
-        chown bitlbee /var/run/bitlbee.pid
+        chown bitlbee: /var/run/bitlbee.pid
         
-        start-stop-daemon --start --quiet --pidfile $PIDFILE \
+        # Clean up after the bug between 1.2-5 and 1.2.1-2 where BitlBee ran
+        # as root. (#494656 and #495877) Fixing this in the postinst script
+        # is not enough since the user will restart his BitlBee after up-
+        # grading the package, and the BitlBee running as root will then
+        # save its settings, re-setting ownership of the file to root.
+        # TODO: Remove this after a few revisions.
+        find /var/lib/bitlbee -uid 0 -name '*.xml' -exec chown bitlbee: {} \;
+
+        start-stop-daemon --start --quiet \
                 --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
 }
@@ -58 +64 @@
 case "$1" in
   start)
+        [ "$BITLBEE_DISABLED" = "1" ] && exit 0
+
         echo -n "Starting $DESC: $NAME"
         d_start

debian/changelog

@@ -1 @@
-bitlbee (1.2-6) UNRELEASED; urgency=low
-
-  * Add Homepage and Vcs-Bzr fields.
-
- -- Jelmer Vernooij <jelmer@samba.org>  Sun, 11 May 2008 14:18:16 +0200
+bitlbee (1.2.2-1) unstable; urgency=critical
+
+  * New upstream version.
+  * Fixes a security issue (account hijacking), hence the high priority.
+  * Using a patch to set the User setting in bitlbee.conf properly to keep
+    upstream and Debian properly separated in my bzr tree.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Wed, 27 Aug 2008 23:59:50 +0100
+
+bitlbee (1.2.1-3) unstable; urgency=high
+
+  * chown /var/lib/bitlbee/*.xml to bitlbee:bitlbee to clean up after
+    1.2-5 and the bugfix in 1.2.1-2. (Closes: #495877)
+  * Moved BITLBEE_DISABLED check to only check when trying to *start*
+    the daemon. (Closes: #488611)
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 23 Aug 2008 18:53:54 +0100
+
+bitlbee (1.2.1-2) unstable; urgency=low
+
+  * Properly set the User= line to something sensible so BitlBee won't
+    run as root anymore. 1.2-5 was a bad upload. :-( (Closes: #494656)
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 12 Aug 2008 00:36:03 +0100
+
+bitlbee (1.2.1-1.1) unstable; urgency=low
+
+  * Non-Maintainer Upload
+  * Use invoke-rc.d as per policy. (Closes: #492637) [Thanks to Matt
+    Kraai]
+
+ -- Don Armstrong <don@debian.org>  Wed, 06 Aug 2008 06:57:18 -0700
+
+bitlbee (1.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add Homepage and Vcs-Bzr fields. (From Jelmer.)
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Thu, 26 Jun 2008 00:07:50 +0100
 
 bitlbee (1.2-5) unstable; urgency=low

debian/postinst

@@ -64 +64 @@
 fi
 
+if ! grep -qi '^User *= *' /etc/bitlbee/bitlbee.conf; then
+        echo 'Updating configuration file, enabling User-setting...'
+        if ! sed -i -e 's/# *User *= *.*/User = bitlbee/i' /etc/bitlbee/bitlbee.conf; then
+                echo 'Failed! BitlBee may run as root now, please check your configs.'
+        fi
+fi
+
 if [ -n "$2" -a "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then
-        /etc/init.d/bitlbee restart
+        if which invoke-rc.d >/dev/null 2>&1; then
+                invoke-rc.d bitlbee restart
+        else
+                /etc/init.d/bitlbee restart
+        fi
 fi
 
 ## If we're upgrading, we'll probably skip this next part
-if [ -d $CONFDIR ] && chown -R bitlbee $CONFDIR; then
+if [ -d $CONFDIR ] && chown -R bitlbee: $CONFDIR; then
         echo 'BitlBee (probably) already installed, skipping user/configdir installation'
         exit 0
@@ -91 +102 @@
 
 if [ -z "$2" ]; then
-        /etc/init.d/bitlbee start
+        if which invoke-rc.d >/dev/null 2>&1; then
+                invoke-rc.d bitlbee start
+        else
+                /etc/init.d/bitlbee start
+        fi
 fi

debian/prerm

@@ -10 +10 @@
         fi
 else
-        /etc/init.d/bitlbee stop || exit 0
+        if which invoke-rc.d >/dev/null 2>&1; then
+                invoke-rc.d bitblee stop || exit 0
+        else
+                /etc/init.d/bitlbee stop || exit 0
+        fi
 fi

debian/rules

@@ -55 +55 @@
         cp utils/* debian/bitlbee/usr/share/doc/bitlbee/examples/
         cp debian/bitlbee.init debian/bitlbee/etc/init.d/bitlbee
+        patch -p0 < debian/patches/bitlbee.conf.diff
         cd debian/bitlbee/usr/share/; \
                 gzip -9 doc/bitlbee/changelog.Debian doc/bitlbee/changelog doc/bitlbee/user-guide.txt \

doc/CHANGES

@@ -3 +3 @@
 
 http://bugs.bitlbee.org/bitlbee/timeline?daysback=90&changeset=on
+
+Version 1.2.4:
+- Most important change (and main reason for releasing now): Upgraded Yahoo!
+  module to a newer version to get it working again.
+- join_chat command replaced with the much better chat command:
+  * Similar to how account replaced login/slist/logout. Add a chatroom once,
+    then just /join it like any other room. Also automatic joining at login
+    time is now possible.
+  * Note that the old way of starting groupchats (/join #nickname) is now
+    also deprecated, use "chat with" instead.
+  * See "help chat" and "help chat add" for more information.
+- Rewrote bitlbee.conf parser to be less dumb.
+- Fixed compatibility (hopefully) with AIM mobile messages, certain kinds
+  of Google Talk chatrooms.
+- Fixed numerous stability/reliability bugs over the last year.
+
+Finished 17 Oct 2009
+
+Version 1.2.3:
+- Fixed one more flaw similar to the previous hijacking bug, caused by incon-
+  sistent handling of the USTATUS_IDENTIFIED state. All code touching these
+  variables was reviewed and should be correct now.
+
+Finished 7 Sep 2008 
+
+Version 1.2.2:
+- Security bugfix: It was possible to hijack accounts (without gaining access
+  to the old account, it's simply an overwrite)
+- Some more stability improvements.
+- Fixed bug where people with non-lowercase nicks couldn't drop their account.
+- Easier upgrades of non-forking daemon mode servers (using the DEAF
+  command).
+- Can be cross-compiled for Win32 now! (No support for SSL yet though, which
+  makes it less useful for now.)
+- Exponential backoff on auto-reconnect.
+- Changing passwords gives less confusing feedback ("password is empty") now.
+
+Finished 26 Aug 2008
 
 Version 1.2.1:

doc/user-guide/Makefile

@@ -13 +13 @@
 
 %.html: %.db.xml
-        xsltproc --output $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
+        xsltproc --output $@ http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
 
 %.pdf: %.db.xml

doc/user-guide/commands.xml

@@ -125 +125 @@
                         <description>
                                 <para>
-                                        This command gives you a list of all the accounts known by BitlBee, including the numbers you'll need for most account commands.
+                                        This command gives you a list of all the accounts known by BitlBee.
                                 </para>
                         </description>
@@ -138 +138 @@
                         <description>
                                 <para>
-                                        This account can be used to change various settings for IM accounts. For all protocols, this command can be used to change the handle or the password BitlBee uses to log in and if it should be logged in automatically. Some protocols have additional settings. You can see the settings available for a connection by typing <emphasis>account set &lt;account id&gt;</emphasis>.
+                                        This command can be used to change various settings for IM accounts. For all protocols, this command can be used to change the handle or the password BitlBee uses to log in and if it should be logged in automatically. Some protocols have additional settings. You can see the settings available for a connection by typing <emphasis>account set &lt;account id&gt;</emphasis>.
                                 </para>
                                 
                                 <para>
-                                        For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>. For details about the syntax of this command, see <emphasis>help set</emphasis>.
+                                        For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
                                 </para>
                                 
                                 <para>
                                         The account ID can be a number (see <emphasis>account list</emphasis>), the protocol name or (part of) the screenname, as long as it matches only one connection.
+                                </para>
+                        </description>
+                </bitlbee-command>
+        </bitlbee-command>
+
+        <bitlbee-command name="chat">
+                <short-description>Chatroom list maintenance</short-description>
+                <syntax>chat &lt;action&gt; [&lt;arguments&gt;]</syntax>
+
+                <description>
+
+                        <para>
+                                Available actions: add, del, list, with and set. See <emphasis>help chat &lt;action&gt;</emphasis> for more information.
+                        </para>
+
+                </description>
+
+                <bitlbee-command name="add">
+                        <syntax>chat add &lt;account&gt; &lt;room&gt; [&lt;channel&gt;]</syntax>
+
+                        <description>
+                                <para>
+                                        Add a chatroom to the list of chatrooms you're interested in. BitlBee needs this list to map room names to a proper IRC channel name.
+                                </para>
+
+                                <para>
+                                        After adding a room to your list, you can simply use the IRC /join command to enter the room. Also, you can tell BitlBee to automatically join the room when you log in. (See <emphasis>chat set</emphasis>)
+                                </para>
+
+                                <para>
+                                        Password-protected rooms work exactly like on IRC, by passing the password as an extra argument to /join.
+                                </para>
+                        </description>
+
+                </bitlbee-command>
+
+                <bitlbee-command name="del">
+                        <syntax>chat del &lt;chat id&gt;</syntax>
+
+                        <description>
+                                <para>
+                                        This commands deletes an chatroom from your list.
+                                </para>
+
+                                <para>
+                                        The room ID can be a number (see <emphasis>chat list</emphasis>), or (part of) the name of the room/channel.
+                                </para>
+                        </description>
+                </bitlbee-command>
+
+                <bitlbee-command name="list">
+                        <syntax>chat list</syntax>
+
+                        <description>
+                                <para>
+                                        This command gives you a list of all the chatrooms known by BitlBee.
+                                </para>
+                        </description>
+                </bitlbee-command>
+
+                <bitlbee-command name="with">
+                        <syntax>chat with &lt;nickname&gt;</syntax>
+
+                        <description>
+                                <para>
+                                        While most <emphasis>chat</emphasis> subcommands are about named chatrooms, this command can be used to open an unnamed groupchat with one or more persons. This command is what <emphasis>/join #nickname</emphasis> used to do in older BitlBee versions.
+                                </para>
+                        </description>
+                </bitlbee-command>
+
+                <bitlbee-command name="set">
+                        <syntax>chat set &lt;chat id&gt;</syntax>
+                        <syntax>chat set &lt;chat id&gt;/&lt;setting&gt;</syntax>
+                        <syntax>chat set &lt;chat id&gt;/&lt;setting&gt; &lt;value&gt;</syntax>
+                        <syntax>chat set -del &lt;chat id&gt;/&lt;setting&gt;</syntax>
+
+                        <description>
+                                <para>
+                                        This command can be used to change various settings for chatrooms.
+                                </para>
+                                
+                                <para>
+                                        For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
+                                </para>
+                                
+                                <para>
+                                        The room ID can be a number (see <emphasis>chat list</emphasis>), or (part of) the name of the room/channel.
                                 </para>
                         </description>
@@ -303 +390 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="auto_join" type="boolean" scope="chat">
+                <default>false</default>
+
+                <description>
+                        <para>
+                                With this option enabled, BitlBee will automatically join this chatroom when you log in.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="auto_reconnect" type="boolean" scope="both">
                 <default>false</default>
@@ -486 +583 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="nick" type="string" scope="chat">
+
+                <description>
+                        <para>
+                                You can use this option to set your nickname in a chatroom. You won't see this nickname yourself, but other people in the room will. By default, BitlBee will use your username as the chatroom nickname.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="ops" type="string" scope="global">
                 <default>both</default>
@@ -580 +686 @@
         <bitlbee-setting name="resource_select" type="string" scope="account">
                 <default>priority</default>
-                <possible-values>priority, time</possible-values>
+                <possible-values>priority, activity</possible-values>
 
                 <description>
@@ -588 +694 @@
 
                         <para>
-                                Normally it's set to <emphasis>priority</emphasis> which means messages will always be delivered to the buddy's resource with the highest priority. If the setting is set to <emphasis>time</emphasis>, messages will be delivered to the resource that was last used to send you a message (or the resource that most recently connected).
+                                Normally it's set to <emphasis>priority</emphasis> which means messages will always be delivered to the buddy's resource with the highest priority. If the setting is set to <emphasis>activity</emphasis>, messages will be delivered to the resource that was last used to send you a message (or the resource that most recently connected).
                         </para>
                 </description>
@@ -851 +957 @@
                         <ircline nick="wouter">account set 1/display_name "The majestik møøse"</ircline>
                         <ircline nick="root">display_name = `The majestik møøse'</ircline>
-                </ircexample>
-
-        </bitlbee-command>
-
-        <bitlbee-command name="join_chat">
-                <short-description>Join a named groupchat/conference room</short-description>
-                <syntax>join_chat &lt;connection&gt; &lt;room name&gt; [&lt;channel name&gt;] [&lt;room nickname&gt;] [&lt;password&gt;]</syntax>
-
-                <description>
-                        <para>
-                                On most IM-networks groupchats can be started using the /join command. (<emphasis>/join #foo</emphasis> to start a chatroom with you and <emphasis>foo</emphasis>) This doesn't work with names groupchats though (which exist on Jabber networks and AIM, for example), instead you can use this command.
-                        </para>
-
-                        <para>
-                                The first two arguments are required. <emphasis>room name</emphasis> is the name of the chatroom on the IM-network. <emphasis>channel name</emphasis> is the IRC channel name BitlBee should map this to. <emphasis>room nickname</emphasis> is the nickname you want to have in this channel. If you don't give these options, BitlBee will do the right guesses.
-                        </para>
-
-                        <para>
-                                The following command will join you to the chatroom called <emphasis>bitlbee@conference.bitlbee.org</emphasis>. The channel will be called <emphasis>&amp;bitlbee-help</emphasis> because <emphasis>&amp;bitlbee</emphasis> will already be in use. Your nickname will be <emphasis>help-me</emphasis>.
-                        </para>
-                </description>
-
-                <ircexample>
-                        <ircline nick="wilmer">join_chat jabber bitlbee@conference.bitlbee.org &amp;bitlbee-help help-me</ircline>
                 </ircexample>
 

doc/user-guide/help.xml

@@ -1 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 

doc/user-guide/misc.xml

@@ -69 +69 @@
 
 <para>
-If you want to start a groupchat with the person <emphasis>lisa_msn</emphasis> in it, just join the channel <emphasis>#lisa_msn</emphasis>. BitlBee will refuse to join you to the channel with that name, but it will create a new virtual channel with root, you and lisa_msn in it.
+To open a groupchat, use the <emphasis>chat with</emphasis> command. For example,  to start a groupchat with the person <emphasis>lisa_msn</emphasis> in it, just type <emphasis>chat with lisa_msn</emphasis>. BitlBee will create a new virtual channel with root, you and lisa_msn in it.
 </para>
 
 <para>
-Of course a channel with only two people isn't really exciting yet. So the next step is to invite some other people to the channel. For this, you can use the <emphasis>/invite</emphasis> command of your IRC client. Please do keep in mind that all the people have to be on the same network and contact list! You can't invite Yahoo! buddies into an MSN groupchat.
+Then, just use the ordinary IRC <emphasis>/invite</emphasis> command to invite more people. Please do keep in mind that all the people have to be on the same network and contact list! You can't invite Yahoo! buddies into an MSN groupchat.
 </para>
 
 <para>
-Some protocols (like Jabber) also support named groupchats. BitlBee now supports these too. You can use the <emphasis>join_chat</emphasis> command to join them. See <emphasis>help join_chat</emphasis> for more information.
+Some protocols (like Jabber) also support named groupchats. BitlBee now supports these too. You can use the <emphasis>chat add</emphasis> command to join them. See <emphasis>help chat add</emphasis> for more information.
 </para>
 

doc/user-guide/user-guide.xml

@@ -1 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 

irc.c

@@ -35 +35 @@
 GSList *irc_connection_list = NULL;
 
-static char *passchange( set_t *set, char *value )
+static char *set_eval_password( set_t *set, char *value )
 {
         irc_t *irc = set->data;
         
-        irc_setpass( irc, value );
-        irc_usermsg( irc, "Password successfully changed" );
-        return NULL;
+        if( irc->status & USTATUS_IDENTIFIED && value )
+        {
+                irc_setpass( irc, value );
+                return NULL;
+        }
+        else
+        {
+                return SET_INVALID;
+        }
 }
 
@@ -78 +84 @@
         struct sockaddr_storage sock;
         socklen_t socklen = sizeof( sock );
+        set_t *s;
         
         irc = g_new0( irc_t, 1 );
@@ -137 +144 @@
         irc_connection_list = g_slist_append( irc_connection_list, irc );
         
-        set_add( &irc->set, "away_devoice", "true",  set_eval_away_devoice, irc );
-        set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
-        set_add( &irc->set, "auto_reconnect", "false", set_eval_bool, irc );
-        set_add( &irc->set, "auto_reconnect_delay", "5*3<900", set_eval_account_reconnect_delay, irc );
-        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", "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 );
-        set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc );
-        set_add( &irc->set, "handle_unknown", "root", NULL, irc );
-        set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc );
-        set_add( &irc->set, "ops", "both", set_eval_ops, irc );
-        set_add( &irc->set, "password", NULL, passchange, irc );
-        set_add( &irc->set, "private", "true", set_eval_bool, irc );
-        set_add( &irc->set, "query_order", "lifo", NULL, irc );
-        set_add( &irc->set, "root_nick", irc->mynick, set_eval_root_nick, 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 );
-        set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "away_devoice", "true",  set_eval_away_devoice, irc );
+        s = set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "auto_reconnect", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "auto_reconnect_delay", "5*3<900", set_eval_account_reconnect_delay, irc );
+        s = set_add( &irc->set, "buddy_sendbuffer", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
+        s = set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc );
+        s = set_add( &irc->set, "debug", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "default_target", "root", NULL, irc );
+        s = set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "handle_unknown", "root", NULL, irc );
+        s = set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "ops", "both", set_eval_ops, irc );
+        s = set_add( &irc->set, "password", NULL, set_eval_password, irc );
+        s->flags |= SET_NULL_OK;
+        s = set_add( &irc->set, "private", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "query_order", "lifo", NULL, irc );
+        s = set_add( &irc->set, "root_nick", irc->mynick, set_eval_root_nick, irc );
+        s = set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "strip_html", "true", NULL, irc );
+        s = set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );
+        s = set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc );
         
         conf_loaddefaults( irc );
@@ -232 +240 @@
         
         if( irc->status & USTATUS_IDENTIFIED && set_getbool( &irc->set, "save_on_quit" ) ) 
-                if( storage_save( irc, TRUE ) != STORAGE_OK )
+                if( storage_save( irc, NULL, TRUE ) != STORAGE_OK )
                         irc_usermsg( irc, "Error while saving settings!" );
         
@@ -400 +408 @@
                         }
                         
-                        if( lines[i] )
-                        {
-                                if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
-                                        continue;
+                        if( lines[i] && ( cmd = irc_parse_line( lines[i] ) ) )
+                        {
                                 irc_exec( irc, cmd );
                                 g_free( cmd );
@@ -478 +484 @@
         if( line[0] == ':' )
         {
-                for( i = 0; line[i] != ' '; i ++ );
+                for( i = 0; line[i] && line[i] != ' '; i ++ );
                 line = line + i;
         }
@@ -774 +780 @@
         irc_reply( irc,   3, ":%s", IRCD_INFO );
         irc_reply( irc,   4, "%s %s %s %s", irc->myhost, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES );
-        irc_reply( irc,   5, "PREFIX=(ov)@+ CHANTYPES=#& CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server", CMODES, MAX_NICK_LENGTH - 1 );
+        irc_reply( irc,   5, "PREFIX=(ov)@+ CHANTYPES=%s CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee "
+                             "CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server",
+                             CTYPES, CMODES, MAX_NICK_LENGTH - 1 );
         irc_motd( irc );
         irc->umode[0] = '\0';
@@ -1015 +1023 @@
         user_t *u = NULL;
         
-        if( *nick == '#' || *nick == '&' )
+        if( strchr( CTYPES, *nick ) )
         {
                 if( !( c = irc_chat_by_channel( irc, nick ) ) )

irc.h

@@ -38 +38 @@
 #define CMODE "t"
 #define UMODE "s"
+#define CTYPES "&#"
 
 typedef enum
@@ -47 +48 @@
         USTATUS_SHUTDOWN = 8
 } irc_status_t;
-
-typedef struct channel
-{
-        char *name;
-} channel_t;
 
 typedef struct irc
@@ -88 +84 @@
         struct account *accounts;
         GSList *file_transfers;
+        struct chat *chatrooms;
         
         struct __USER *users;
@@ -101 +98 @@
 
 #include "user.h"
-// #include "nick.h"
 
 extern GSList *irc_connection_list;

irc_commands.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "ipc.h"
+#include "chat.h"
 
 static void irc_cmd_pass( irc_t *irc, char **cmd )
@@ -125 +126 @@
 static void irc_cmd_mode( irc_t *irc, char **cmd )
 {
-        if( *cmd[1] == '#' || *cmd[1] == '&' )
+        if( strchr( CTYPES, *cmd[1] ) )
         {
                 if( cmd[2] )
@@ -193 +194 @@
         else if( cmd[1] )
         {
-                if( ( cmd[1][0] == '#' || cmd[1][0] == '&' ) && cmd[1][1] )
-                {
-                        user_t *u = user_find( irc, cmd[1] + 1 );
-                        
-                        if( u && u->ic && u->ic->acc->prpl->chat_with )
-                        {
-                                irc_reply( irc, 403, "%s :Initializing groupchat in a different channel", cmd[1] );
-                                
-                                if( !u->ic->acc->prpl->chat_with( u->ic, u->handle ) )
-                                {
-                                        irc_usermsg( irc, "Could not open a groupchat with %s.", u->nick );
-                                }
-                        }
-                        else if( u )
-                        {
-                                irc_reply( irc, 403, "%s :Groupchats are not possible with %s", cmd[1], cmd[1]+1 );
-                        }
-                        else
-                        {
-                                irc_reply( irc, 403, "%s :No such nick", cmd[1] );
-                        }
-                }
+                struct chat *c;
+                
+                if( strchr( CTYPES, cmd[1][0] ) == NULL || cmd[1][1] == 0 )
+                        irc_reply( irc, 479, "%s :Invalid channel name", cmd[1] );
+                else if( ( c = chat_bychannel( irc, cmd[1] ) ) && c->acc && c->acc->ic )
+                        chat_join( irc, c, cmd[2] );
                 else
-                {
                         irc_reply( irc, 403, "%s :No such channel", cmd[1] );
-                }
         }
 }
@@ -433 +416 @@
                         if( g_hash_table_lookup_extended( irc->watches, nick, &okey, &ovalue ) )
                         {
+                                g_hash_table_remove( irc->watches, okey );
                                 g_free( okey );
-                                g_hash_table_remove( irc->watches, okey );
                                 
                                 irc_reply( irc, 602, "%s %s %s %d :%s", nick, "*", "*", 0, "Stopped watching" );

lib/events_libevent.c

@@ -37 +37 @@
 
 static void b_main_restart();
-static guint id_next = 1;
+static guint id_next = 1; /* Next ID to be allocated to an event handler. */
+static guint id_cur = 0; /* Event ID that we're currently handling. */
+static guint id_dead; /* Set to 1 if b_event_remove removes id_cur. */
 static GHashTable *id_hash;
-static int quitting = 0;
+static int quitting = 0; /* Prepare to quit, stop handling events. */
 
 /* Since libevent doesn't handle two event handlers for one fd-condition
@@ -119 +121 @@
         struct b_event_data *b_ev = data;
         b_input_condition cond = 0;
-        int id;
+        gboolean st;
         
         if( fd >= 0 )
@@ -133 +135 @@
         /* Since the called function might cancel this handler already
            (which free()s b_ev), we have to remember the ID here. */
-        id = b_ev->id;
+        id_cur = b_ev->id;
+        id_dead = 0;
         
         if( quitting )
         {
-                b_event_remove( id );
+                b_event_remove( id_cur );
                 return;
         }
         
-        if( !b_ev->function( b_ev->data, fd, cond ) )
+        st = b_ev->function( b_ev->data, fd, cond );
+        if( id_dead )
+        {
+                /* This event was killed already, don't touch it! */
+                return;
+        }
+        else if( !st )
         {
                 event_debug( "Handler returned FALSE: " );
-                b_event_remove( id );
+                b_event_remove( id_cur );
         }
         else if( fd == -1 )
         {
+                /* fd == -1 means it was a timer. These can't be auto-repeated
+                   so it has to be recreated every time. */
                 struct timeval tv;
                 
@@ -236 +247 @@
         if( b_ev )
         {
+                if( id == id_cur )
+                        id_dead = TRUE;
+                
                 g_hash_table_remove( id_hash, &b_ev->id );
                 if( b_ev->evinfo.ev_fd >= 0 )

lib/http_client.c

@@ -59 +59 @@
         if( error )
         {
-                g_free( req );
-                return( NULL );
+                http_free( req );
+                return NULL;
         }
         
@@ -160 +160 @@
         
         req->func( req );
-        
-        g_free( req->request );
-        g_free( req );
-        
+        http_free( req );
         return FALSE;
 }
@@ -444 +441 @@
         
         req->func( req );
-        
+        http_free( req );
+        return FALSE;
+}
+
+void http_free( struct http_request *req )
+{
         g_free( req->request );
         g_free( req->reply_headers );
         g_free( req->status_string );
         g_free( req );
-        
-        return FALSE;
-}
+}
+

lib/http_client.h

@@ -81 +81 @@
 void *http_dorequest( char *host, int port, int ssl, char *request, http_input_function func, gpointer data );
 void *http_dorequest_url( char *url_string, http_input_function func, gpointer data );
+
+void http_free( struct http_request *req );

lib/ini.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2005 Wilmer van der Gaast and others                *
+  * Copyright 2002-2008 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -28 +28 @@
 ini_t *ini_open( char *file )
 {
-        ini_t *ini = g_new0( ini_t, 1 );
+        int fd;
+        ini_t *ini = NULL;
+        struct stat fi;
         
-        if( ( ini->fp = fopen( file, "r" ) ) == NULL )
+        if( ( fd = open( file, O_RDONLY ) ) != -1 &&
+            fstat( fd, &fi ) == 0 &&
+            fi.st_size <= 16384 &&
+            ( ini = g_malloc( sizeof( ini_t ) + fi.st_size + 1 ) ) &&
+            read( fd, ini->file, fi.st_size ) == fi.st_size )
         {
-                g_free( ini );
-                return( NULL );
+                memset( ini, 0, sizeof( ini_t ) );
+                ini->size = fi.st_size;
+                ini->file[ini->size] = 0;
+                ini->cur = ini->file;
+                ini->c_section = "";
+                
+                close( fd );
+                
+                return ini;
         }
+
+        if( fd >= 0 )
+                close( fd );
         
-        return( ini );
+        ini_close( ini );
+
+        return NULL;
+}
+
+/* Strips leading and trailing whitespace and returns a pointer to the first
+   non-ws character of the given string. */
+static char *ini_strip_whitespace( char *in )
+{
+        char *e;
+
+        while( isspace( *in ) )
+                in++;
+
+        e = in + strlen( in ) - 1;
+        while( e > in && isspace( *e ) )
+                e--;
+        e[1] = 0;
+        
+        return in;
 }
 
 int ini_read( ini_t *file )
 {
-        char key[MAX_STRING], s[MAX_STRING], *t;
-        int i;
+        char *s;
         
-        while( !feof( file->fp ) )
+        while( file->cur && file->cur < file->file + file->size )
         {
-                *s = 0;
-                fscanf( file->fp, "%127[^\n#]s", s );
-                fscanf( file->fp, "%*[^\n]s" );
-                fgetc( file->fp );              /* Skip newline         */
-                file->line ++;
-                if( strchr( s, '=' ) )
+                char *e, *next;
+                
+                file->line++;
+
+                /* Find the end of line */
+                if( ( e = strchr( file->cur, '\n' ) ) != NULL )
                 {
-                        sscanf( s, "%[^ =]s", key );
-                        if( ( t = strchr( key, '.' ) ) )
+                        *e = 0;
+                        next = e + 1;
+                }
+                else
+                {
+                        /* No more lines. */
+                        e = file->cur + strlen( file->cur );
+                        next = NULL;
+                }
+                
+                /* Comment? */
+                if( ( s = strchr( file->cur, '#' ) ) != NULL )
+                        *s = 0;
+                
+                file->cur = ini_strip_whitespace( file->cur );
+                
+                if( *file->cur == '[' )
+                {
+                        file->cur++;
+                        if( ( s = strchr( file->cur, ']' ) ) != NULL )
                         {
-                                *t = 0;
-                                strcpy( file->section, key );
-                                t ++;
+                                *s = 0;
+                                file->c_section = file->cur;
+                        }
+                }
+                else if( ( s = strchr( file->cur, '=' ) ) != NULL )
+                {
+                        *s = 0;
+                        file->key = ini_strip_whitespace( file->cur );
+                        file->value = ini_strip_whitespace( s + 1 );
+                        
+                        if( ( s = strchr( file->key, '.' ) ) != NULL )
+                        {
+                                *s = 0;
+                                file->section = file->key;
+                                file->key = s + 1;
                         }
                         else
                         {
-                                strcpy( file->section, file->c_section );
-                                t = key;
+                                file->section = file->c_section;
                         }
-                        sscanf( t, "%s", file->key );
-                        t = strchr( s, '=' ) + 1;
-                        for( i = 0; t[i] == ' '; i ++ );
-                        strcpy( file->value, &t[i] );
-                        for( i = strlen( file->value ) - 1; file->value[i] == 32; i -- )
-                                file->value[i] = 0;
                         
-                        return( 1 );
+                        file->cur = next;
+                        return 1;
                 }
-                else if( ( t = strchr( s, '[' ) ) )
-                {
-                        strcpy( file->c_section, t + 1 );
-                        t = strchr( file->c_section, ']' );
-                        *t = 0;
-                }
+                /* else: noise/comment/etc, let's just ignore it. */
+
+                file->cur = next;
         }
-        return( 0 );
+        
+        return 0;
 }
 
 void ini_close( ini_t *file )
 {
-        fclose( file->fp );
         g_free( file );
 }

lib/ini.h

@@ -29 +29 @@
 typedef struct
 {
-        FILE *fp;
         int line;
-        char c_section[MAX_STRING];
-        char section[MAX_STRING];
-        char key[MAX_STRING];
-        char value[MAX_STRING];
+        char *c_section;
+        char *section;
+        char *key;
+        char *value;
+        int size;
+        char *cur, *tok;
+        char file[];
 } ini_t;
 

lib/misc.c

@@ -46 +46 @@
 #endif
 
+#include "md5.h"
 #include "ssl_client.h"
 

lib/proxy.c

@@ -558 +558 @@
                 return proxy_connect_socks5(host, port, phb);
         
-        if (phb->host) g_free(phb);
         g_free(phb);
         return -1;

lib/xmltree.c

@@ -472 +472 @@
 }
 
-struct xt_node *xt_new_node( char *name, char *text, struct xt_node *children )
+struct xt_node *xt_new_node( char *name, const char *text, struct xt_node *children )
 {
         struct xt_node *node, *c;

lib/xmltree.h

@@ -90 +90 @@
 char *xt_find_attr( struct xt_node *node, const char *key );
 
-struct xt_node *xt_new_node( char *name, char *text, struct xt_node *children );
+struct xt_node *xt_new_node( char *name, const char *text, struct xt_node *children );
 void xt_add_child( struct xt_node *parent, struct xt_node *child );
 void xt_add_attr( struct xt_node *node, const char *key, const char *value );

protocols/jabber/conference.c

@@ -26 +26 @@
 static xt_status jabber_chat_join_failed( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
 
-struct groupchat *jabber_chat_join( struct im_connection *ic, char *room, char *nick, char *password )
+struct groupchat *jabber_chat_join( struct im_connection *ic, const char *room, const char *nick, const char *password )
 {
         struct jabber_chat *jc;
@@ -36 +36 @@
         node = xt_new_node( "x", NULL, NULL );
         xt_add_attr( node, "xmlns", XMLNS_MUC );
-        node = jabber_make_packet( "presence", NULL, roomjid, node );
         if( password )
                 xt_add_child( node, xt_new_node( "password", password, NULL ) );
+        node = jabber_make_packet( "presence", NULL, roomjid, node );
         jabber_cache_add( ic, node, jabber_chat_join_failed );
         
@@ -234 +234 @@
                             ( strcmp( s, XMLNS_MUC_USER ) == 0 ) )
                         {
-                                c = xt_find_node( c->children, "item" );
-                                if( ( s = xt_find_attr( c, "jid" ) ) )
+                                struct xt_node *item;
+                                
+                                item = xt_find_node( c->children, "item" );
+                                if( ( s = xt_find_attr( item, "jid" ) ) )
                                 {
                                         /* Yay, found what we need. :-) */
@@ -283 +285 @@
         else if( type ) /* type can only be NULL or "unavailable" in this function */
         {
-                s = strchr( bud->ext_jid, '/' );
-                if( s ) *s = 0;
-                imcb_chat_remove_buddy( chat, bud->ext_jid, NULL );
-                if( bud != jc->me && bud->flags & JBFLAG_IS_ANONYMOUS )
-                        imcb_remove_buddy( ic, bud->ext_jid, NULL );
-                if( s ) *s = '/';
+                if( ( bud->flags & JBFLAG_IS_CHATROOM ) && bud->ext_jid )
+                {
+                        s = strchr( bud->ext_jid, '/' );
+                        if( s ) *s = 0;
+                        imcb_chat_remove_buddy( chat, bud->ext_jid, NULL );
+                        if( bud != jc->me && bud->flags & JBFLAG_IS_ANONYMOUS )
+                                imcb_remove_buddy( ic, bud->ext_jid, NULL );
+                        if( s ) *s = '/';
+                }
                 
                 if( bud == jc->me )

protocols/jabber/iq.c

@@ -51 +51 @@
         {
                 if( !( ( c = xt_find_node( node->children, "query" ) ) ||
-                       ( c = xt_find_node( node->children, "ping" ) ) ) || /* O_o WHAT is wrong with just <query/> ????? */
+                       ( c = xt_find_node( node->children, "ping" ) ) ) ||
                     !( s = xt_find_attr( c, "xmlns" ) ) )
                 {
-                        imcb_log( ic, "Warning: Received incomplete IQ-%s packet", type );
+                        /* Sigh. Who decided to suddenly invent new elements
+                           instead of just sticking with <query/>? */
                         return XT_HANDLED;
                 }

protocols/jabber/jabber.c

@@ -70 +70 @@
         
         s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
         
         s = set_add( &acc->set, "ssl", "false", set_eval_bool, acc );
@@ -439 +439 @@
 }
 
-static struct groupchat *jabber_chat_join_( struct im_connection *ic, char *room, char *nick, char *password )
+static struct groupchat *jabber_chat_join_( struct im_connection *ic, const char *room, const char *nick, const char *password )
 {
         if( strchr( room, '@' ) == NULL )

protocols/jabber/jabber.h

@@ -27 +27 @@
 #include <glib.h>
 
+#include "bitlbee.h"
+#include "md5.h"
 #include "xmltree.h"
-#include "bitlbee.h"
 
 extern GSList *jabber_connections;
@@ -302 +303 @@
 
 /* conference.c */
-struct groupchat *jabber_chat_join( struct im_connection *ic, char *room, char *nick, char *password );
+struct groupchat *jabber_chat_join( struct im_connection *ic, const char *room, const char *nick, const char *password );
 struct groupchat *jabber_chat_by_jid( struct im_connection *ic, const char *name );
 void jabber_chat_free( struct groupchat *c );

protocols/jabber/jabber_util.c

@@ -37 +37 @@
                 /* Priority is a signed 8-bit integer, according to RFC 3921. */
                 if( i < -128 || i > 127 )
-                        return NULL;
+                        return SET_INVALID;
         }
         else
-                return NULL;
+                return SET_INVALID;
         
         /* Only run this stuff if the account is online ATM,

protocols/jabber/presence.c

@@ -49 +49 @@
                 if( !( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT | GET_BUDDY_CREAT ) ) )
                 {
-                        if( set_getbool( &ic->irc->set, "debug" ) )
-                                imcb_log( ic, "Warning: Could not handle presence information from JID: %s", from );
+                        /*
+                        imcb_log( ic, "Warning: Could not handle presence information from JID: %s", from );
+                        */
                         return XT_HANDLED;
                 }
@@ -106 +107 @@
                 if( ( bud = jabber_buddy_by_jid( ic, from, 0 ) ) == NULL )
                 {
-                        if( set_getbool( &ic->irc->set, "debug" ) )
-                                imcb_log( ic, "Warning: Received presence information from unknown JID: %s", from );
+                        /*
+                        imcb_log( ic, "Warning: Received presence information from unknown JID: %s", from );
+                        */
                         return XT_HANDLED;
                 }

protocols/nogaim.c

@@ -33 +33 @@
 
 #define BITLBEE_CORE
+#include <ctype.h>
+
 #include "nogaim.h"
-#include <ctype.h>
+#include "chat.h"
 
 static int remove_chat_buddy_silent( struct groupchat *b, const char *handle );
@@ -249 +251 @@
 void imcb_connected( struct im_connection *ic )
 {
+        irc_t *irc = ic->irc;
+        struct chat *c;
         user_t *u;
         
@@ -271 +275 @@
            exponential backoff timer. */
         ic->acc->auto_reconnect_delay = 0;
+        
+        for( c = irc->chatrooms; c; c = c->next )
+        {
+                if( c->acc != ic->acc )
+                        continue;
+                
+                if( set_getbool( &c->set, "auto_join" ) )
+                        chat_join( irc, c, NULL );
+        }
 }
 
@@ -309 +322 @@
         ic->acc->prpl->logout( ic );
         b_event_remove( ic->inpa );
+        
+        g_free( ic->away );
+        ic->away = NULL;
         
         u = irc->users;
@@ -492 +508 @@
 }
 
-/* prpl.c */
-
-struct show_got_added_data
+
+struct imcb_ask_cb_data
 {
         struct im_connection *ic;
@@ -500 +515 @@
 };
 
-void show_got_added_no( void *data )
-{
-        g_free( ((struct show_got_added_data*)data)->handle );
+static void imcb_ask_auth_cb_no( void *data )
+{
+        struct imcb_ask_cb_data *cbd = data;
+        
+        cbd->ic->acc->prpl->auth_deny( cbd->ic, cbd->handle );
+        
+        g_free( cbd->handle );
+        g_free( cbd );
+}
+
+static void imcb_ask_auth_cb_yes( void *data )
+{
+        struct imcb_ask_cb_data *cbd = data;
+        
+        cbd->ic->acc->prpl->auth_allow( cbd->ic, cbd->handle );
+        
+        g_free( cbd->handle );
+        g_free( cbd );
+}
+
+void imcb_ask_auth( struct im_connection *ic, const char *handle, const char *realname )
+{
+        struct imcb_ask_cb_data *data = g_new0( struct imcb_ask_cb_data, 1 );
+        char *s, *realname_ = NULL;
+        
+        if( realname != NULL )
+                realname_ = g_strdup_printf( " (%s)", realname );
+        
+        s = g_strdup_printf( "The user %s%s wants to add you to his/her buddy list.",
+                             handle, realname_ ?: "" );
+        
+        g_free( realname_ );
+        
+        data->ic = ic;
+        data->handle = g_strdup( handle );
+        query_add( ic->irc, ic, s, imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, data );
+}
+
+
+static void imcb_ask_add_cb_no( void *data )
+{
+        g_free( ((struct imcb_ask_cb_data*)data)->handle );
         g_free( data );
 }
 
-void show_got_added_yes( void *data )
-{
-        struct show_got_added_data *sga = data;
-        
-        sga->ic->acc->prpl->add_buddy( sga->ic, sga->handle, NULL );
-        /* imcb_add_buddy( sga->ic, NULL, sga->handle, sga->handle ); */
-        
-        return show_got_added_no( data );
-}
-
-void imcb_ask_add( struct im_connection *ic, char *handle, const char *realname )
-{
-        struct show_got_added_data *data = g_new0( struct show_got_added_data, 1 );
+static void imcb_ask_add_cb_yes( void *data )
+{
+        struct imcb_ask_cb_data *cbd = data;
+        
+        cbd->ic->acc->prpl->add_buddy( cbd->ic, cbd->handle, NULL );
+        
+        return imcb_ask_add_cb_no( data );
+}
+
+void imcb_ask_add( struct im_connection *ic, const char *handle, const char *realname )
+{
+        struct imcb_ask_cb_data *data = g_new0( struct imcb_ask_cb_data, 1 );
         char *s;
         
@@ -529 +582 @@
         data->ic = ic;
         data->handle = g_strdup( handle );
-        query_add( ic->irc, ic, s, show_got_added_yes, show_got_added_no, data );
+        query_add( ic->irc, ic, s, imcb_ask_add_cb_yes, imcb_ask_add_cb_no, data );
 }
 
@@ -699 +752 @@
 }
 
-struct groupchat *imcb_chat_new( struct im_connection *ic, char *handle )
+struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle )
 {
         struct groupchat *c;
@@ -928 +981 @@
         int st;
         
-        if( ( g_strcasecmp( value, "true" ) == 0 ) || ( g_strcasecmp( value, "yes" ) == 0 ) || ( g_strcasecmp( value, "on" ) == 0 ) )
-                st = 1;
-        else if( ( g_strcasecmp( value, "false" ) == 0 ) || ( g_strcasecmp( value, "no" ) == 0 ) || ( g_strcasecmp( value, "off" ) == 0 ) )
-                st = 0;
-        else if( sscanf( value, "%d", &st ) != 1 )
-                return( NULL );
-        
-        st = st != 0;
+        if( !is_bool( value ) )
+                return SET_INVALID;
+        
+        st = bool2int( value );
         
         /* Horror.... */
@@ -979 +1028 @@
         }
         
-        return( set_eval_bool( set, value ) );
+        return value;
 }
 

protocols/nogaim.h

@@ -39 +39 @@
 #define _NOGAIM_H
 
+#include <stdint.h>
+
 #include "bitlbee.h"
 #include "account.h"
@@ -210 +212 @@
          * not implement this. */
         struct groupchat *
-             (* chat_join)      (struct im_connection *, char *room, char *nick, char *password);
+             (* chat_join)      (struct im_connection *, const char *room, const char *nick, const char *password);
         /* Change the topic, if supported. Note that BitlBee expects the IM
            server to confirm the topic change with a regular topic change
@@ -225 +227 @@
          * - Most protocols will just want to set this to g_strcasecmp().*/
         int (* handle_cmp) (const char *who1, const char *who2);
+
+        /* Implement these callbacks if you want to use imcb_ask_auth() */
+        void (* auth_allow)     (struct im_connection *, const char *who);
+        void (* auth_deny)      (struct im_connection *, const char *who);
 
         /* Incoming transfer request */
@@ -243 +249 @@
  * 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 );
+G_MODULE_EXPORT void imc_free( struct im_connection *ic );
 /* Once you're connected, you should call this function, so that the user will
  * see the success. */
@@ -256 +262 @@
 /* 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.
@@ -262 +269 @@
  */
 G_MODULE_EXPORT void imcb_ask( struct im_connection *ic, char *msg, void *data, query_callback doit, query_callback dont );
-G_MODULE_EXPORT void imcb_ask_add( struct im_connection *ic, char *handle, const char *realname );
+
+/* Two common questions you may want to ask:
+ * - X added you to his contact list, allow?
+ * - X is not in your contact list, want to add?
+ */
+G_MODULE_EXPORT void imcb_ask_auth( struct im_connection *ic, const char *handle, const char *realname );
+G_MODULE_EXPORT void imcb_ask_add( struct im_connection *ic, const char *handle, const char *realname );
 
 /* Buddy management */
@@ -294 +307 @@
  *   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 struct groupchat *imcb_chat_new( struct im_connection *ic, const 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. */

protocols/oscar/aim.h

@@ -144 +144 @@
 }
 
+#define AIM_CLIENTINFO_KNOWNGOOD_5_1_3036 { \
+        "AOL Instant Messenger, version 5.1.3036/WIN32", \
+        0x0109, \
+        0x0005, \
+        0x0001, \
+        0x0000, \
+        0x0bdc, \
+        "us", \
+        "en", \
+}
+
 /*
  * I would make 4.1.2010 the default, but they seem to have found
@@ -152 +163 @@
  * around. (see login.c::memrequest())
  */
-#define AIM_CLIENTINFO_KNOWNGOOD AIM_CLIENTINFO_KNOWNGOOD_3_5_1670
+#define AIM_CLIENTINFO_KNOWNGOOD AIM_CLIENTINFO_KNOWNGOOD_5_1_3036
 
 #ifndef TRUE

protocols/oscar/oscar.c

@@ -91 +91 @@
         GSList *oscar_chats;
 
-        gboolean killme;
+        gboolean killme, no_reconnect;
         gboolean icq;
         GSList *evilhack;
@@ -181 +181 @@
 static int gaim_parse_auth_resp  (aim_session_t *, aim_frame_t *, ...);
 static int gaim_parse_login      (aim_session_t *, aim_frame_t *, ...);
+static int gaim_parse_logout     (aim_session_t *, aim_frame_t *, ...);
 static int gaim_handle_redirect  (aim_session_t *, aim_frame_t *, ...);
 static int gaim_parse_oncoming   (aim_session_t *, aim_frame_t *, ...);
@@ -294 +295 @@
                         aim_rxdispatch(odata->sess);
                                if (odata->killme)
-                                       imc_logout(ic, TRUE);
+                                       imc_logout(ic, !odata->no_reconnect);
                 } else {
                         if ((conn->type == AIM_CONN_TYPE_BOS) ||
@@ -520 +521 @@
                 case 0x18:
                         /* connecting too frequently */
+                        od->no_reconnect = TRUE;
                         imcb_error(ic, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));
                         break;
@@ -572 +574 @@
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_USERINFO, gaim_parseaiminfo, 0);
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_MTN, gaim_parsemtn, 0);
+        aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNERR, gaim_parse_logout, 0);
 
         ((struct oscar_data *)ic->proto_data)->conn = bosconn;
@@ -747 +750 @@
 
         aim_send_login(sess, fr->conn, ic->acc->user, ic->acc->pass, &info, key);
+
+        return 1;
+}
+
+static int gaim_parse_logout(aim_session_t *sess, aim_frame_t *fr, ...) {
+        struct im_connection *ic = sess->aux_data;
+        struct oscar_data *odata = ic->proto_data;
+        int code;
+        va_list ap;
+
+        va_start(ap, fr);
+        code = va_arg(ap, int);
+        va_end(ap);
+        
+        imcb_error( ic, "Connection aborted by server: %s", code == 1 ?
+                        "someone else logged in with your account" :
+                        "unknown reason" );
+        
+        /* Tell BitlBee to disable auto_reconnect if code == 1, since that
+           means a concurrent login somewhere else. */
+        odata->no_reconnect = code == 1;
+        
+        /* DO NOT log out here! Just tell the callback to do it. */
+        odata->killme = TRUE;
 
         return 1;
@@ -1939 +1966 @@
         aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL);
 
-        if (ic->away)
-                g_free(ic->away);
+        g_free(ic->away);
         ic->away = NULL;
 
@@ -1960 +1986 @@
 static void oscar_set_away_icq(struct im_connection *ic, struct oscar_data *od, const char *state, const char *message)
 {
-    const char *msg = NULL;
+        const char *msg = NULL;
         gboolean no_message = FALSE;
 
         /* clean old states */
-    if (ic->away) {
-                g_free(ic->away);
-                ic->away = NULL;
-    }
+        g_free(ic->away);
+        ic->away = NULL;
         od->sess->aim_icq_state = 0;
 
         /* if no message, then use an empty message */
-    if (message) {
-        msg = message;
-    } else {
-        msg = "";
+        if (message) {
+                msg = message;
+        } else {
+                msg = "";
                 no_message = TRUE;
-    }
+        }
 
         if (!g_strcasecmp(state, "Online")) {
@@ -1982 +2006 @@
         } else if (!g_strcasecmp(state, "Away")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_AWAY);
-        ic->away = g_strdup(msg);
+                ic->away = g_strdup(msg);
                 od->sess->aim_icq_state = AIM_MTYPE_AUTOAWAY;
         } else if (!g_strcasecmp(state, "Do Not Disturb")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_AWAY | AIM_ICQ_STATE_DND | AIM_ICQ_STATE_BUSY);
-        ic->away = g_strdup(msg);
+                ic->away = g_strdup(msg);
                 od->sess->aim_icq_state = AIM_MTYPE_AUTODND;
         } else if (!g_strcasecmp(state, "Not Available")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_OUT | AIM_ICQ_STATE_AWAY);
-        ic->away = g_strdup(msg);
+                ic->away = g_strdup(msg);
                 od->sess->aim_icq_state = AIM_MTYPE_AUTONA;
         } else if (!g_strcasecmp(state, "Occupied")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_AWAY | AIM_ICQ_STATE_BUSY);
-        ic->away = g_strdup(msg);
+                ic->away = g_strdup(msg);
                 od->sess->aim_icq_state = AIM_MTYPE_AUTOBUSY;
         } else if (!g_strcasecmp(state, "Free For Chat")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_CHAT);
-        ic->away = g_strdup(msg);
+                ic->away = g_strdup(msg);
                 od->sess->aim_icq_state = AIM_MTYPE_AUTOFFC;
         } else if (!g_strcasecmp(state, "Invisible")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_INVISIBLE);
-        ic->away = g_strdup(msg);
+                ic->away = g_strdup(msg);
         } else if (!g_strcasecmp(state, GAIM_AWAY_CUSTOM)) {
                 if (no_message) {
@@ -2008 +2032 @@
                 } else {
                         aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_AWAY);
-            ic->away = g_strdup(msg);
+                        ic->away = g_strdup(msg);
                         od->sess->aim_icq_state = AIM_MTYPE_AUTOAWAY;
                 }
@@ -2020 +2044 @@
         struct oscar_data *od = (struct oscar_data *)ic->proto_data;
 
-    oscar_set_away_aim(ic, od, state, message);
+        oscar_set_away_aim(ic, od, state, message);
         if (od->icq)
                 oscar_set_away_icq(ic, od, state, message);
@@ -2581 +2605 @@
 }
 
-struct groupchat *oscar_chat_join(struct im_connection * ic, char * room, char * nick, char * password )
+struct groupchat *oscar_chat_join(struct im_connection * ic, const char * room, const char * nick, const char * password )
 {
         struct oscar_data * od = (struct oscar_data *)ic->proto_data;

protocols/yahoo/libyahoo2.c

@@ -89 +89 @@
 
 #include "base64.h"
+#include "http_client.h"
 
 #ifdef USE_STRUCT_CALLBACKS
@@ -169 +170 @@
         YAHOO_SERVICE_GOTGROUPRENAME, /* < 1, 36(old), 37(new) */
         YAHOO_SERVICE_SYSMESSAGE = 0x14,
+        YAHOO_SERVICE_SKINNAME = 0x15,
         YAHOO_SERVICE_PASSTHROUGH2 = 0x16,
         YAHOO_SERVICE_CONFINVITE = 0x18,
@@ -192 +194 @@
         YAHOO_SERVICE_LIST,
         YAHOO_SERVICE_AUTH = 0x57,
+        YAHOO_SERVICE_AUTHBUDDY = 0x6d,
         YAHOO_SERVICE_ADDBUDDY = 0x83,
         YAHOO_SERVICE_REMBUDDY,
@@ -197 +200 @@
         YAHOO_SERVICE_REJECTCONTACT,
         YAHOO_SERVICE_GROUPRENAME = 0x89, /* > 1, 65(new), 66(0), 67(old) */
+        YAHOO_SERVICE_Y7_PING = 0x8A, /* 0 - id and that's it?? */
         YAHOO_SERVICE_CHATONLINE = 0x96, /* > 109(id), 1, 6(abcde) < 0,1*/
         YAHOO_SERVICE_CHATGOTO,
@@ -202 +206 @@
         YAHOO_SERVICE_CHATLEAVE,
         YAHOO_SERVICE_CHATEXIT = 0x9b,
+        YAHOO_SERVICE_CHATADDINVITE = 0x9d,
         YAHOO_SERVICE_CHATLOGOUT = 0xa0,
         YAHOO_SERVICE_CHATPING,
@@ -209 +214 @@
         YAHOO_SERVICE_PICTURE = 0xbe,
         YAHOO_SERVICE_PICTURE_UPDATE = 0xc1,
-        YAHOO_SERVICE_PICTURE_UPLOAD = 0xc2
+        YAHOO_SERVICE_PICTURE_UPLOAD = 0xc2,
+        YAHOO_SERVICE_Y6_VISIBILITY=0xc5,
+        YAHOO_SERVICE_Y6_STATUS_UPDATE=0xc6,
+        YAHOO_PHOTOSHARE_INIT=0xd2,     
+        YAHOO_SERVICE_CONTACT_YMSG13=0xd6,
+        YAHOO_PHOTOSHARE_PREV=0xd7,
+        YAHOO_PHOTOSHARE_KEY=0xd8,
+        YAHOO_PHOTOSHARE_TRANS=0xda,
+        YAHOO_FILE_TRANSFER_INIT_YMSG13=0xdc,
+        YAHOO_FILE_TRANSFER_GET_YMSG13=0xdd,
+        YAHOO_FILE_TRANSFER_PUT_YMSG13=0xde,
+        YAHOO_SERVICE_YMSG15_STATUS=0xf0,
+        YAHOO_SERVICE_YMSG15_BUDDY_LIST=0xf1,
 };
 
@@ -733 +750 @@
 
         memcpy(data + pos, "YMSG", 4); pos += 4;
-        pos += yahoo_put16(data + pos, 0x000c);
+        pos += yahoo_put16(data + pos, YAHOO_PROTO_VER);
         pos += yahoo_put16(data + pos, 0x0000);
         pos += yahoo_put16(data + pos, pktlen + extra_pad);
@@ -747 +764 @@
                 yahoo_send_data(yid->fd, data, len);
         else
-        yahoo_add_to_send_queue(yid, data, len);
+                yahoo_add_to_send_queue(yid, data, len);
         FREE(data);
 }
@@ -1467 +1484 @@
 
                 if (u->name != NULL) {
-                        if (pkt->service == YAHOO_SERVICE_LOGOFF || u->flags == 0) {
+                        if (pkt->service == YAHOO_SERVICE_LOGOFF) { /* || u->flags == 0) { Not in YMSG16 */
                                 YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, u->name, YAHOO_STATUS_OFFLINE, NULL, 1, 0, 0);
                         } else {
+                                /* Key 47 always seems to be 1 for YMSG16 */
+                                if(!u->state)
+                                        u->away = 0;
+                                else
+                                        u->away = 1;
+
                                 YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, u->name, u->state, u->msg, u->away, u->idle, u->mobile);
                         }
@@ -1477 +1500 @@
                 y_list_free_1(t);
                 FREE(u);
+        }
+}
+
+static void yahoo_process_buddy_list(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+{
+        struct yahoo_data *yd = yid->yd;
+        YList *l;
+        int last_packet = 0;
+        char *cur_group = NULL;
+        struct yahoo_buddy *newbud = NULL;
+
+        /* we could be getting multiple packets here */
+        for (l = pkt->hash; l; l = l->next) {
+                struct yahoo_pair *pair = l->data;
+
+                switch(pair->key) {
+                case 300:
+                case 301:
+                case 302:
+                case 303:
+                        if ( 315 == atoi(pair->value) )
+                                last_packet = 1;
+                        break;
+                case 65:
+                        g_free(cur_group);
+                        cur_group = strdup(pair->value);
+                        break;
+                case 7:
+                        newbud = y_new0(struct yahoo_buddy, 1);
+                        newbud->id = strdup(pair->value);
+                        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);
+                        }
+
+                        yd->buddies = y_list_append(yd->buddies, newbud);
+
+                        break;
+                }
+        }
+        
+        g_free(cur_group);
+
+        /* we could be getting multiple packets here */
+        if (last_packet)
+                return;
+
+        YAHOO_CALLBACK(ext_yahoo_got_buddies)(yd->client_id, yd->buddies);
+
+        /*** We login at the very end of the packet communication */
+        if (!yd->logged_in) {
+                yd->logged_in = TRUE;
+                if(yd->current_status < 0)
+                        yd->current_status = yd->initial_status;
+                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, YAHOO_LOGIN_OK, NULL);
         }
 }
@@ -1549 +1630 @@
                         } 
 
-                        if(yd->cookie_y && yd->cookie_t && yd->cookie_c)
+                        if(yd->cookie_y && yd->cookie_t)
                                 YAHOO_CALLBACK(ext_yahoo_got_cookies)(yd->client_id);
 
@@ -2226 +2307 @@
 }
 
+struct yahoo_https_auth_data
+{
+        struct yahoo_input_data *yid;
+        char *token;
+        char *chal;
+};
+
+static void yahoo_https_auth_token_init(struct yahoo_https_auth_data *had);
+static void yahoo_https_auth_token_finish(struct http_request *req);
+static void yahoo_https_auth_init(struct yahoo_https_auth_data *had);
+static void yahoo_https_auth_finish(struct http_request *req);
+
+/* Extract a value from a login.yahoo.com response. Assume CRLF-linebreaks
+   and FAIL miserably if they're not there... */
+static char *yahoo_ha_find_key(char *response, char *key)
+{
+        char *s, *end;
+        int len = strlen(key);
+        
+        s = response;
+        do {
+                if (strncmp(s, key, len) == 0 && s[len] == '=') {
+                        s += len + 1;
+                        if ((end = strchr(s, '\r')))
+                                return g_strndup(s, end - s);
+                        else
+                                return g_strdup(s);
+                }
+                
+                if ((s = strchr(s, '\n')))
+                        s ++;
+        } while (s && *s);
+        
+        return NULL;
+}
+
+static enum yahoo_status yahoo_https_status_parse(int code)
+{
+        switch (code)
+        {
+                case 1212: return YAHOO_LOGIN_PASSWD;
+                case 1213: return YAHOO_LOGIN_LOCK;
+                case 1235: return YAHOO_LOGIN_UNAME;
+                default: return (enum yahoo_status) code;
+        }
+}
+
+static void yahoo_process_auth_0x10(struct yahoo_input_data *yid, const char *seed, const char *sn)
+{
+        struct yahoo_https_auth_data *had = g_new0(struct yahoo_https_auth_data, 1);
+        
+        had->yid = yid;
+        had->chal = g_strdup(seed);
+        
+        yahoo_https_auth_token_init(had);
+}
+
+static void yahoo_https_auth_token_init(struct yahoo_https_auth_data *had)
+{
+        struct yahoo_input_data *yid = had->yid;
+        struct yahoo_data *yd = yid->yd;
+        struct http_request *req;
+        char *login, *passwd, *chal;
+        char *url;
+        
+        login = g_strndup(yd->user, 3 * strlen(yd->user));
+        http_encode(login);
+        passwd = g_strndup(yd->password, 3 * strlen(yd->password));
+        http_encode(passwd);
+        chal = g_strndup(had->chal, 3 * strlen(had->chal));
+        http_encode(chal);
+        
+        url = g_strdup_printf("https://login.yahoo.com/config/pwtoken_get?src=ymsgr&ts=%d&login=%s&passwd=%s&chal=%s",
+                               (int) time(NULL), login, passwd, chal);
+        
+        req = http_dorequest_url(url, yahoo_https_auth_token_finish, had);
+        
+        g_free(url);
+        g_free(chal);
+        g_free(passwd);
+        g_free(login);
+}
+
+static void yahoo_https_auth_token_finish(struct http_request *req)
+{
+        struct yahoo_https_auth_data *had = req->data;
+        struct yahoo_input_data *yid = had->yid;
+        struct yahoo_data *yd = yid->yd;
+        int st;
+        
+        if (req->status_code != 200) {
+                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, 2000 + req->status_code, NULL);
+                goto fail;
+        }
+        
+        if (sscanf(req->reply_body, "%d", &st) != 1 || st != 0) {
+                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, yahoo_https_status_parse(st), NULL);
+                goto fail;
+        }
+        
+        if ((had->token = yahoo_ha_find_key(req->reply_body, "ymsgr")) == NULL) {
+                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, 3001, NULL);
+                goto fail;
+        }
+        
+        return yahoo_https_auth_init(had);
+        
+fail:
+        g_free(had->token);
+        g_free(had->chal);
+        g_free(had);
+}
+
+static void yahoo_https_auth_init(struct yahoo_https_auth_data *had)
+{
+        struct http_request *req;
+        char *url;
+        
+        url = g_strdup_printf("https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=%d&token=%s",
+                              (int) time(NULL), had->token);
+        
+        req = http_dorequest_url(url, yahoo_https_auth_finish, had);
+        
+        g_free(url);
+}
+
+static void yahoo_https_auth_finish(struct http_request *req)
+{
+        struct yahoo_https_auth_data *had = req->data;
+        struct yahoo_input_data *yid = had->yid;
+        struct yahoo_data *yd = yid->yd;
+        struct yahoo_packet *pack;
+        char *crumb;
+        int st;
+        
+        md5_byte_t result[16];
+        md5_state_t ctx;
+        
+        unsigned char yhash[32];
+
+        if (req->status_code != 200) {
+                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, 2000 + req->status_code, NULL);
+                goto fail;
+        }
+        
+        if (sscanf(req->reply_body, "%d", &st) != 1 || st != 0) {
+                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, yahoo_https_status_parse(st), NULL);
+                goto fail;
+        }
+        
+        if ((yd->cookie_y = yahoo_ha_find_key(req->reply_body, "Y")) == NULL ||
+            (yd->cookie_t = yahoo_ha_find_key(req->reply_body, "T")) == NULL ||
+            (crumb = yahoo_ha_find_key(req->reply_body, "crumb")) == NULL) {
+                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, 3002, NULL);
+                goto fail;
+        }
+        
+        md5_init(&ctx);  
+        md5_append(&ctx, (unsigned char*) crumb, 11);
+        md5_append(&ctx, (unsigned char*) had->chal, strlen(had->chal));
+        md5_finish(&ctx, result);
+        to_y64(yhash, result, 16);
+
+        pack = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, yd->initial_status, yd->session_id);
+        yahoo_packet_hash(pack, 1, yd->user);
+        yahoo_packet_hash(pack, 0, yd->user);
+        yahoo_packet_hash(pack, 277, yd->cookie_y);
+        yahoo_packet_hash(pack, 278, yd->cookie_t);
+        yahoo_packet_hash(pack, 307, (char*) yhash);
+        yahoo_packet_hash(pack, 244, "524223");
+        yahoo_packet_hash(pack, 2, yd->user);
+        yahoo_packet_hash(pack, 2, "1");
+        yahoo_packet_hash(pack, 98, "us");
+        yahoo_packet_hash(pack, 135, "7.5.0.647");
+        
+        yahoo_send_packet(yid, pack, 0);
+                
+        yahoo_packet_free(pack);
+        
+fail:
+        g_free(crumb);
+        g_free(had->token);
+        g_free(had->chal);
+        g_free(had);
+}
+
 static void yahoo_process_auth(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
 {
@@ -2253 +2520 @@
                 case 1:
                         yahoo_process_auth_0x0b(yid, seed, sn);
+                        break;
+                case 2:
+                        yahoo_process_auth_0x10(yid, seed, sn);
                         break;
                 default:
@@ -2408 +2678 @@
                 
                 yd->buddies = y_list_append(yd->buddies, bud);
-                
+        
                 /* Possibly called already, but at least the call above doesn't
                    seem to happen every time (not anytime I tried). */
@@ -2415 +2685 @@
 
 /*      YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, who, status, NULL, (status==YAHOO_STATUS_AVAILABLE?0:1)); */
+}
+
+static void yahoo_process_contact_ymsg13(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+{
+        char* who=NULL;
+        char* me=NULL;  
+        char* msg=NULL;
+        YList *l;
+        for (l = pkt->hash; l; l = l->next) {
+                struct yahoo_pair *pair = l->data;
+                if (pair->key == 4)
+                        who = pair->value;
+                else if (pair->key == 5)
+                        me = pair->value;
+                else
+                        DEBUG_MSG(("unknown key: %d = %s", pair->key, pair->value));
+        }
+
+        if(pkt->status==3)
+                YAHOO_CALLBACK(ext_yahoo_contact_auth_request)(yid->yd->client_id, me, who, msg);
 }
 
@@ -2628 +2918 @@
 
         YList *l;
-        yahoo_dump_unhandled(pkt);
+        // yahoo_dump_unhandled(pkt);
         for (l = pkt->hash; l; l = l->next) {
                 struct yahoo_pair *pair = l->data;
@@ -2650 +2940 @@
 {
         DEBUG_MSG(("yahoo_packet_process: 0x%02x", pkt->service));
+        yahoo_dump_unhandled(pkt);
         switch (pkt->service)
         {
@@ -2661 +2952 @@
         case YAHOO_SERVICE_IDACT:
         case YAHOO_SERVICE_IDDEACT:
+        case YAHOO_SERVICE_Y6_STATUS_UPDATE:
+        case YAHOO_SERVICE_YMSG15_STATUS:
                 yahoo_process_status(yid, pkt);
                 break;
@@ -2674 +2967 @@
                 yahoo_process_mail(yid, pkt);
                 break;
+        case YAHOO_SERVICE_REJECTCONTACT:
         case YAHOO_SERVICE_NEWCONTACT:
                 yahoo_process_contact(yid, pkt);
@@ -2714 +3008 @@
                 yahoo_process_buddyadd(yid, pkt);
                 break;
+        case YAHOO_SERVICE_CONTACT_YMSG13:
+                yahoo_process_contact_ymsg13(yid,pkt);
+                break;
         case YAHOO_SERVICE_REMBUDDY:
                 yahoo_process_buddydel(yid, pkt);
@@ -2742 +3039 @@
         case YAHOO_SERVICE_CHATLOGOFF:
         case YAHOO_SERVICE_CHATMSG:
-        case YAHOO_SERVICE_REJECTCONTACT:
         case YAHOO_SERVICE_PEERTOPEER:
                 WARNING(("unhandled service 0x%02x", pkt->service));
@@ -2756 +3052 @@
                 yahoo_process_picture_upload(yid, pkt);
                 break;  
+        case YAHOO_SERVICE_YMSG15_BUDDY_LIST:   /* Buddy List */
+                yahoo_process_buddy_list(yid, pkt);
         default:
                 WARNING(("unknown service 0x%02x", pkt->service));
@@ -3539 +3837 @@
         yahoo_process_webcam_connection,
         yahoo_process_chatcat_connection,
-        yahoo_process_search_connection
+        yahoo_process_search_connection,
 };
 
@@ -3557 +3855 @@
         } while(len == -1 && errno == EINTR);
 
-        if(len == -1 && errno == EAGAIN)        /* we'll try again later */
+        if(len == -1 && (errno == EAGAIN||errno == EINTR))      /* we'll try again later */
                 return 1;
 
@@ -3760 +4058 @@
 
         yahoo_packet_hash(pkt, 5, who);
-        yahoo_packet_hash(pkt, 4, from?from:yd->user);
+        yahoo_packet_hash(pkt, 1, from?from:yd->user);
         yahoo_packet_hash(pkt, 14, " ");
         yahoo_packet_hash(pkt, 13, typ ? "1" : "0");
@@ -3775 +4073 @@
         struct yahoo_data *yd;
         struct yahoo_packet *pkt = NULL;
-        int service;
+        int old_status;
         char s[4];
 
@@ -3783 +4081 @@
         yd = yid->yd;
 
-        if (msg) {
+        old_status = yd->current_status;
+
+        if (msg && strncmp(msg,"Invisible",9)) {
                 yd->current_status = YAHOO_STATUS_CUSTOM;
         } else {
@@ -3789 +4089 @@
         }
 
-        if (yd->current_status == YAHOO_STATUS_AVAILABLE)
-                service = YAHOO_SERVICE_ISBACK;
-        else
-                service = YAHOO_SERVICE_ISAWAY;
+        /* Thank you libpurple :) */
+        if (yd->current_status == YAHOO_STATUS_INVISIBLE) {
+                pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBILITY, YAHOO_STATUS_AVAILABLE, 0);
+                yahoo_packet_hash(pkt, 13, "2");
+                yahoo_send_packet(yid, pkt, 0);
+                yahoo_packet_free(pkt);
+
+                return;
+        }
+
+        pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_STATUS_UPDATE, yd->current_status, yd->session_id);
+        snprintf(s, sizeof(s), "%d", yd->current_status);
+        yahoo_packet_hash(pkt, 10, s);
          
-        if ((away == 2) && (yd->current_status == YAHOO_STATUS_AVAILABLE)) {
-                pkt = yahoo_packet_new(YAHOO_SERVICE_ISAWAY, YAHOO_STATUS_BRB, yd->session_id);
-                yahoo_packet_hash(pkt, 10, "999");
-                yahoo_packet_hash(pkt, 47, "2");
-        }else {
-                pkt = yahoo_packet_new(service, YAHOO_STATUS_AVAILABLE, yd->session_id);
-                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);
-                        yahoo_packet_hash(pkt, 47, (away == 2)? "2": (away) ?"1":"0");
-                } else {
-                        yahoo_packet_hash(pkt, 47, (away == 2)? "2": (away) ?"1":"0");
-                }
-                
-                
-                
-        }
+        if (yd->current_status == YAHOO_STATUS_CUSTOM) {
+                yahoo_packet_hash(pkt, 19, msg);
+        } else {
+                yahoo_packet_hash(pkt, 19, "");
+        }
+        
+        yahoo_packet_hash(pkt, 47, (away == 2)? "2": (away) ?"1":"0");
 
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);
+
+        if(old_status == YAHOO_STATUS_INVISIBLE) {
+                pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBILITY, YAHOO_STATUS_AVAILABLE, 0);
+                yahoo_packet_hash(pkt, 13, "1");
+                yahoo_send_packet(yid, pkt, 0);
+                yahoo_packet_free(pkt);
+        }
 }
 
@@ -3829 +4134 @@
         LOG(("yahoo_logoff: current status: %d", yd->current_status));
 
-        if(yd->current_status != -1) {
+        if(yd->current_status != -1 && 0) {
+                /* Meh. Don't send this. The event handlers are not going to
+                   get to do this so it'll just leak memory. And the TCP
+                   connection reset will hopefully be clear enough. */
                 pkt = yahoo_packet_new(YAHOO_SERVICE_LOGOFF, YAHOO_STATUS_AVAILABLE, yd->session_id);
                 yd->current_status = -1;
@@ -4062 +4370 @@
                 return;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_ADDBUDDY, YAHOO_STATUS_AVAILABLE, yd->session_id);
-        yahoo_packet_hash(pkt, 1, yd->user);
-        yahoo_packet_hash(pkt, 7, who);
-        yahoo_packet_hash(pkt, 65, group);
+        pkt = yahoo_packet_new(YAHOO_SERVICE_ADDBUDDY, YPACKET_STATUS_DEFAULT, yd->session_id);
+
         if (msg != NULL) /* add message/request "it's me add me" */
                 yahoo_packet_hash(pkt, 14, msg);
+        else
+                yahoo_packet_hash(pkt,14,"");
+
+        yahoo_packet_hash(pkt, 65, group);
+        yahoo_packet_hash(pkt, 97, "1");
+        yahoo_packet_hash(pkt, 1, yd->user);
+        yahoo_packet_hash(pkt, 302, "319");
+        yahoo_packet_hash(pkt, 300, "319");
+        yahoo_packet_hash(pkt, 7, who);
+        yahoo_packet_hash(pkt, 334, "0");
+        yahoo_packet_hash(pkt, 301, "319");
+        yahoo_packet_hash(pkt, 303, "319");
+
+
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);
@@ -4089 +4409 @@
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);
+}
+
+void yahoo_accept_buddy_ymsg13(int id,const char* me,const char* who){
+        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_data *yd;
+
+        if(!yid)
+                return;
+        yd = yid->yd;
+
+        struct yahoo_packet* pkt=NULL;
+        pkt= yahoo_packet_new(YAHOO_SERVICE_CONTACT_YMSG13,YAHOO_STATUS_AVAILABLE,0);
+
+        yahoo_packet_hash(pkt,1,me ?: yd->user);        
+        yahoo_packet_hash(pkt,5,who);
+        yahoo_packet_hash(pkt,13,"1");
+        yahoo_packet_hash(pkt,334,"0");
+        yahoo_send_packet(yid, pkt, 0);
+        yahoo_packet_free(pkt);
+}
+
+void yahoo_reject_buddy_ymsg13(int id,const char* me,const char* who,const char* msg){
+        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_data *yd;
+
+        if(!yid)
+                return;
+        yd = yid->yd;
+
+        struct yahoo_packet* pkt=NULL;
+        pkt= yahoo_packet_new(YAHOO_SERVICE_CONTACT_YMSG13,YAHOO_STATUS_AVAILABLE,0);
+
+        yahoo_packet_hash(pkt,1,me ?: yd->user);        
+        yahoo_packet_hash(pkt,5,who);
+//      yahoo_packet_hash(pkt,241,YAHOO_PROTO_VER);
+        yahoo_packet_hash(pkt,13,"2");
+        yahoo_packet_hash(pkt,334,"0");
+        yahoo_packet_hash(pkt,97,"1");
+        yahoo_packet_hash(pkt,14,msg?:"");
+
+        yahoo_send_packet(yid, pkt, 0);
+        yahoo_packet_free(pkt);
+
 }
 

protocols/yahoo/yahoo.c

@@ -197 +197 @@
 {
         struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
-        
-        ic->away = NULL;
+        char *away;
+        
+        away = NULL;
         
         if( state && msg && g_strcasecmp( state, msg ) != 0 )
         {
                 yd->current_status = YAHOO_STATUS_CUSTOM;
-                ic->away = "";
+                away = "";
         }
         else if( state )
@@ -212 +213 @@
                 msg = NULL;
                 
-                ic->away = "";
+                away = "";
                 if( g_strcasecmp( state, "Available" ) == 0 )
                 {
                         yd->current_status = YAHOO_STATUS_AVAILABLE;
-                        ic->away = NULL;
+                        away = NULL;
                 }
                 else if( g_strcasecmp( state, "Be Right Back" ) == 0 )
@@ -242 +243 @@
                         yd->current_status = YAHOO_STATUS_AVAILABLE;
                         
-                        ic->away = NULL;
+                        away = NULL;
                 }
         }
@@ -248 +249 @@
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        yahoo_set_away( yd->y2_id, yd->current_status, msg, ic->away != NULL ? 2 : 0 );
+        yahoo_set_away( yd->y2_id, yd->current_status, msg, away != NULL ? 2 : 0 );
 }
 
 static GList *byahoo_away_states( struct im_connection *ic )
 {
-        GList *m = NULL;
-
-        m = g_list_append( m, "Available" );
-        m = g_list_append( m, "Be Right Back" );
-        m = g_list_append( m, "Busy" );
-        m = g_list_append( m, "Not At Home" );
-        m = g_list_append( m, "Not At Desk" );
-        m = g_list_append( m, "Not In Office" );
-        m = g_list_append( m, "On Phone" );
-        m = g_list_append( m, "On Vacation" );
-        m = g_list_append( m, "Out To Lunch" );
-        m = g_list_append( m, "Stepped Out" );
-        m = g_list_append( m, "Invisible" );
-        m = g_list_append( m, GAIM_AWAY_CUSTOM );
+        static GList *m = NULL;
+
+        if( m == NULL )
+        {
+                m = g_list_append( m, "Available" );
+                m = g_list_append( m, "Be Right Back" );
+                m = g_list_append( m, "Busy" );
+                m = g_list_append( m, "Not At Home" );
+                m = g_list_append( m, "Not At Desk" );
+                m = g_list_append( m, "Not In Office" );
+                m = g_list_append( m, "On Phone" );
+                m = g_list_append( m, "On Vacation" );
+                m = g_list_append( m, "Out To Lunch" );
+                m = g_list_append( m, "Stepped Out" );
+                m = g_list_append( m, "Invisible" );
+                m = g_list_append( m, GAIM_AWAY_CUSTOM );
+        }
         
         return m;
@@ -345 +349 @@
         
         return c;
+}
+
+static void byahoo_auth_allow( struct im_connection *ic, const char *who )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
+        
+        yahoo_accept_buddy_ymsg13( yd->y2_id, NULL, who );
+}
+
+static void byahoo_auth_deny( struct im_connection *ic, const char *who )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
+        
+        yahoo_reject_buddy_ymsg13( yd->y2_id, NULL, who, NULL );
 }
 
@@ -372 +390 @@
         ret->handle_cmp = g_strcasecmp;
         
+        ret->auth_allow = byahoo_auth_allow;
+        ret->auth_deny = byahoo_auth_deny;
+        
         register_protocol(ret);
 }
@@ -451 +472 @@
         struct byahoo_write_ready_data *d = data;
         
-        yahoo_write_ready( d->id, d->fd, d->data );
-        
-        return FALSE;
+        return yahoo_write_ready( d->id, d->fd, d->data );
 }
 
@@ -790 +809 @@
 {
         struct byahoo_conf_invitation *inv = data;
-        
-        yahoo_conference_logon( inv->yid, NULL, inv->members, inv->name );
-        imcb_chat_add_buddy( inv->c, inv->ic->acc->user );
+        struct groupchat *b;
+        
+        for( b = inv->ic->groupchats; b; b = b->next )
+                if( b == inv->c )
+                        break;
+        
+        if( b != NULL )
+        {
+                yahoo_conference_logon( inv->yid, NULL, inv->members, inv->name );
+                imcb_chat_add_buddy( inv->c, inv->ic->acc->user );
+        }
+        else
+        {
+                imcb_log( inv->ic, "Duplicate/corrupted invitation to `%s'.", inv->name );
+        }
+        
         g_free( inv->name );
         g_free( inv );
@@ -908 +940 @@
 }
 
+void ext_yahoo_contact_auth_request( int id, const char *myid, const char *who, const char *msg )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        imcb_ask_auth( ic, who, NULL );
+}
+
 void ext_yahoo_contact_added( int id, const char *myid, const char *who, const char *msg )
 {
-        /* Groups schmoups. If I want to handle groups properly I can get the
-           buddy data from some internal libyahoo2 structure. */
-        imcb_add_buddy( byahoo_get_ic_by_id( id ), (char*) who, NULL );
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        imcb_add_buddy( ic, (char*) who, NULL );
 }
 

protocols/yahoo/yahoo2.h

@@ -217 +217 @@
 void yahoo_buddyicon_request(int id, const char *who);
 
+void yahoo_accept_buddy_ymsg13(int,const char*,const char*);
+void yahoo_reject_buddy_ymsg13(int,const char*,const char*,const char*);
+
 #include "yahoo_httplib.h"
 

protocols/yahoo/yahoo2_callbacks.h

@@ -361 +361 @@
 
 /*
+ * Name: ext_yahoo_contact_auth_request
+ *      Called when a contact wants to add you to his/her contact list
+ * Params:
+ *      id   - the id that identifies the server connection
+ *      myid - the identity s/he added
+ *      who  - who did it
+ *      msg  - any message sent
+ */
+void YAHOO_CALLBACK_TYPE(ext_yahoo_contact_auth_request)(int id, const char *myid, const char *who, const char *msg);
+
+
+/*
  * Name: ext_yahoo_contact_added
  *      Called when a contact is added to your list

protocols/yahoo/yahoo2_types.h

@@ -57 +57 @@
         YAHOO_LOGIN_LOCK = 14,
         YAHOO_LOGIN_DUPL = 99,
-        YAHOO_LOGIN_SOCK = -1
+        YAHOO_LOGIN_SOCK = -1,
+};
+
+enum ypacket_status {
+        YPACKET_STATUS_DISCONNECTED = -1,
+        YPACKET_STATUS_DEFAULT = 0,
+        YPACKET_STATUS_SERVERACK = 1,
+        YPACKET_STATUS_GAME     = 0x2,
+        YPACKET_STATUS_AWAY     = 0x4,
+        YPACKET_STATUS_CONTINUED = 0x5,
+        YPACKET_STATUS_INVISIBLE = 12,
+        YPACKET_STATUS_NOTIFY = 0x16, /* TYPING */
+        YPACKET_STATUS_WEBLOGIN = 0x5a55aa55,
+        YPACKET_STATUS_OFFLINE = 0x5a55aa56
 };
 
@@ -85 +98 @@
 };
 
-#define YAHOO_PROTO_VER 0x000b
+#define YAHOO_PROTO_VER 0x0010
 
 /* Yahoo style/color directives */
@@ -115 +128 @@
         YAHOO_CONNECTION_WEBCAM,
         YAHOO_CONNECTION_CHATCAT,
-        YAHOO_CONNECTION_SEARCH
+        YAHOO_CONNECTION_SEARCH,
+        YAHOO_CONNECTION_AUTH,
 };
 
@@ -131 +145 @@
 /* chat member attribs */
 #define YAHOO_CHAT_MALE 0x8000
-#define YAHOO_CHAT_FEMALE 0x10000
 #define YAHOO_CHAT_FEMALE 0x10000
 #define YAHOO_CHAT_DUNNO 0x400

root_commands.c

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "help.h"
+#include "chat.h"
 
 #include <string.h>
@@ -78 +79 @@
 }
 
+#define MIN_ARGS( x, y... )                                                    \
+        do                                                                     \
+        {                                                                      \
+                int blaat;                                                     \
+                for( blaat = 0; blaat <= x; blaat ++ )                         \
+                        if( cmd[blaat] == NULL )                               \
+                        {                                                      \
+                                irc_usermsg( irc, "Not enough parameters given (need %d).", x ); \
+                                return y;                                      \
+                        }                                                      \
+        } while( 0 )
+
 void root_command( irc_t *irc, char *cmd[] )
 {       
@@ -88 +101 @@
                 if( g_strcasecmp( commands[i].command, cmd[0] ) == 0 )
                 {
-                        if( !cmd[commands[i].required_parameters] )
-                        {
-                                irc_usermsg( irc, "Not enough parameters given (need %d)", commands[i].required_parameters );
-                                return;
-                        }
+                        MIN_ARGS( commands[i].required_parameters );
+                        
                         commands[i].execute( irc, cmd );
                         return;
@@ -131 +141 @@
 static void cmd_identify( irc_t *irc, char **cmd )
 {
-        storage_status_t status = storage_load( irc->nick, cmd[1], irc );
+        storage_status_t status = storage_load( irc, cmd[1] );
         char *account_on[] = { "account", "on", NULL };
         
@@ -143 +153 @@
         case STORAGE_OK:
                 irc_usermsg( irc, "Password accepted, settings and accounts loaded" );
+                irc_setpass( irc, cmd[1] );
+                irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "+R", 1 );
                 if( set_getbool( &irc->set, "auto_connect" ) )
@@ -162 +174 @@
         }
 
-        irc_setpass( irc, cmd[1] );
-        switch( storage_save( irc, FALSE )) {
+        switch( storage_save( irc, cmd[1], FALSE ) ) {
                 case STORAGE_ALREADY_EXISTS:
                         irc_usermsg( irc, "Nick is already registered" );
@@ -170 +181 @@
                 case STORAGE_OK:
                         irc_usermsg( irc, "Account successfully created" );
+                        irc_setpass( irc, cmd[1] );
                         irc->status |= USTATUS_IDENTIFIED;
                         irc_umode_set( irc, "+R", 1 );
@@ -238 +250 @@
 }
 
+static void cmd_showset( irc_t *irc, set_t **head, char *key )
+{
+        char *val;
+        
+        if( ( val = set_getstr( head, key ) ) )
+                irc_usermsg( irc, "%s = `%s'", key, val );
+        else
+                irc_usermsg( irc, "%s is empty", key );
+}
+
+typedef set_t** (*cmd_set_findhead)( irc_t*, char* );
+typedef int (*cmd_set_checkflags)( irc_t*, set_t *set );
+
+static int cmd_set_real( irc_t *irc, char **cmd, cmd_set_findhead findhead, cmd_set_checkflags checkflags )
+{
+        char *set_full = NULL, *set_name = NULL, *tmp;
+        set_t **head;
+        
+        if( cmd[1] && g_strncasecmp( cmd[1], "-del", 4 ) == 0 )
+        {
+                MIN_ARGS( 2, 0 );
+                set_full = cmd[2];
+        }
+        else
+                set_full = cmd[1];
+        
+        if( findhead == NULL )
+        {
+                set_name = set_full;
+                
+                head = &irc->set;
+        }
+        else 
+        {
+                char *id;
+                
+                if( ( tmp = strchr( set_full, '/' ) ) )
+                {
+                        id = g_strndup( set_full, ( tmp - set_full ) );
+                        set_name = tmp + 1;
+                }
+                else
+                {
+                        id = g_strdup( set_full );
+                }
+                
+                if( ( head = findhead( irc, id ) ) == NULL )
+                {
+                        g_free( id );
+                        irc_usermsg( irc, "Could not find setting." );
+                        return 0;
+                }
+                g_free( id );
+        }
+        
+        if( cmd[1] && cmd[2] && set_name )
+        {
+                set_t *s = set_find( head, set_name );
+                int st;
+                
+                if( s && checkflags && checkflags( irc, s ) == 0 )
+                        return 0;
+                
+                if( g_strncasecmp( cmd[1], "-del", 4 ) == 0 )
+                        st = set_reset( head, set_name );
+                else
+                        st = set_setstr( head, set_name, cmd[2] );
+                
+                if( set_getstr( head, set_name ) == NULL )
+                {
+                        if( st )
+                                irc_usermsg( irc, "Setting changed successfully" );
+                        else
+                                irc_usermsg( irc, "Failed to change setting" );
+                }
+                else
+                {
+                        cmd_showset( irc, head, set_name );
+                }
+        }
+        else if( set_name )
+        {
+                cmd_showset( irc, head, set_name );
+        }
+        else
+        {
+                set_t *s = *head;
+                while( s )
+                {
+                        cmd_showset( irc, &s, s->key );
+                        s = s->next;
+                }
+        }
+        
+        return 1;
+}
+
+static set_t **cmd_account_set_findhead( irc_t *irc, char *id )
+{
+        account_t *a;
+        
+        if( ( a = account_get( irc, id ) ) )
+                return &a->set;
+        else
+                return NULL;
+}
+
+static int cmd_account_set_checkflags( irc_t *irc, set_t *s )
+{
+        account_t *a = s->data;
+        
+        if( a->ic && s && s->flags & ACC_SET_OFFLINE_ONLY )
+        {
+                irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "off" );
+                return 0;
+        }
+        else if( !a->ic && s && s->flags & ACC_SET_ONLINE_ONLY )
+        {
+                irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "on" );
+                return 0;
+        }
+        
+        return 1;
+}
+
 static void cmd_account( irc_t *irc, char **cmd )
 {
@@ -252 +389 @@
                 struct prpl *prpl;
                 
-                if( cmd[2] == NULL || cmd[3] == NULL || cmd[4] == NULL )
-                {
-                        irc_usermsg( irc, "Not enough parameters" );
-                        return;
-                }
-                
-                prpl = find_protocol(cmd[2]);
+                MIN_ARGS( 4 );
+                
+                prpl = find_protocol( cmd[2] );
                 
                 if( prpl == NULL )
@@ -278 +411 @@
         else if( g_strcasecmp( cmd[1], "del" ) == 0 )
         {
-                if( !cmd[2] )
-                {
-                        irc_usermsg( irc, "Not enough parameters given (need %d)", 2 );
-                }
-                else if( !( a = account_get( irc, cmd[2] ) ) )
+                MIN_ARGS( 2 );
+
+                if( !( a = account_get( irc, cmd[2] ) ) )
                 {
                         irc_usermsg( irc, "Invalid account" );
@@ -410 +541 @@
         else if( g_strcasecmp( cmd[1], "set" ) == 0 )
         {
-                char *acc_handle, *set_name = NULL, *tmp;
-                
-                if( !cmd[2] )
-                {
-                        irc_usermsg( irc, "Not enough parameters given (need %d)", 2 );
-                        return;
-                }
-                
-                if( g_strncasecmp( cmd[2], "-del", 4 ) == 0 )
-                        acc_handle = g_strdup( cmd[3] );
-                else
-                        acc_handle = g_strdup( cmd[2] );
-                
-                if( !acc_handle )
-                {
-                        irc_usermsg( irc, "Not enough parameters given (need %d)", 3 );
-                        return;
-                }
-                
-                if( ( tmp = strchr( acc_handle, '/' ) ) )
-                {
-                        *tmp = 0;
-                        set_name = tmp + 1;
-                }
-                
-                if( ( a = account_get( irc, acc_handle ) ) == NULL )
-                {
-                        g_free( acc_handle );
-                        irc_usermsg( irc, "Invalid account" );
-                        return;
-                }
-                
-                if( cmd[3] && set_name )
-                {
-                        set_t *s = set_find( &a->set, set_name );
-                        
-                        if( a->ic && s && s->flags & ACC_SET_OFFLINE_ONLY )
-                        {
-                                g_free( acc_handle );
-                                irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "off" );
-                                return;
-                        }
-                        else if( !a->ic && s && s->flags & ACC_SET_ONLINE_ONLY )
-                        {
-                                g_free( acc_handle );
-                                irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "on" );
-                                return;
-                        }
-                        
-                        if( g_strncasecmp( cmd[2], "-del", 4 ) == 0 )
-                                set_reset( &a->set, set_name );
-                        else
-                                set_setstr( &a->set, set_name, cmd[3] );
-                }
-                if( set_name ) /* else 'forgotten' on purpose.. Must show new value after changing */
-                {
-                        char *s = set_getstr( &a->set, set_name );
-                        if( s )
-                                irc_usermsg( irc, "%s = `%s'", set_name, s );
-                        else
-                                irc_usermsg( irc, "%s is empty", set_name );
-                }
-                else
-                {
-                        set_t *s = a->set;
-                        while( s )
-                        {
-                                if( s->value || s->def )
-                                        irc_usermsg( irc, "%s = `%s'", s->key, s->value ? s->value : s->def );
-                                else
-                                        irc_usermsg( irc, "%s is empty", s->key );
-                                s = s->next;
-                        }
-                }
-                
-                g_free( acc_handle );
-        }
-        else
-        {
-                irc_usermsg( irc, "Unknown command: account %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[1] );
+                MIN_ARGS( 2 );
+                
+                cmd_set_real( irc, cmd + 1, cmd_account_set_findhead, cmd_account_set_checkflags );
+        }
+        else
+        {
+                irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "account", cmd[1] );
         }
 }
@@ -500 +558 @@
         if( g_strcasecmp( cmd[1], "-tmp" ) == 0 )
         {
+                MIN_ARGS( 3 );
                 add_on_server = 0;
                 cmd ++;
@@ -610 +669 @@
                         irc->mynick = g_strdup( cmd[2] );
                         
+                        /* If we're called internally (user did "set root_nick"),
+                           let's not go O(INF). :-) */
                         if( strcmp( cmd[0], "set_rename" ) != 0 )
                                 set_setstr( &irc->set, "root_nick", cmd[2] );
@@ -633 +694 @@
         }
         
-        return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : NULL;
+        return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : SET_INVALID;
 }
 
@@ -817 +878 @@
 static void cmd_set( irc_t *irc, char **cmd )
 {
-        char *set_name = cmd[1];
-        
-        if( cmd[1] && cmd[2] )
-        {
-                if( g_strncasecmp( cmd[1], "-del", 4 ) == 0 )
-                {
-                        set_reset( &irc->set, cmd[2] );
-                        set_name = cmd[2];
-                }
-                else
-                {
-                        set_setstr( &irc->set, cmd[1], cmd[2] );
-                }
-        }
-        if( set_name ) /* else 'forgotten' on purpose.. Must show new value after changing */
-        {
-                char *s = set_getstr( &irc->set, set_name );
-                if( s )
-                        irc_usermsg( irc, "%s = `%s'", set_name, s );
-                else
-                        irc_usermsg( irc, "%s is empty", set_name );
-
-                if( strchr( set_name, '/' ) )
-                        irc_usermsg( irc, "Warning: / found in setting name, you're probably looking for the `account set' command." );
-        }
-        else
-        {
-                set_t *s = irc->set;
-                while( s )
-                {
-                        if( s->value || s->def )
-                                irc_usermsg( irc, "%s = `%s'", s->key, s->value ? s->value : s->def );
-                        else
-                                irc_usermsg( irc, "%s is empty", s->key );
-                        s = s->next;
-                }
-        }
+        cmd_set_real( irc, cmd, NULL, NULL );
 }
 
 static void cmd_save( irc_t *irc, char **cmd )
 {
-        if( storage_save( irc, TRUE ) == STORAGE_OK )
+        if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
+                irc_usermsg( irc, "Please create an account first" );
+        else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
                 irc_usermsg( irc, "Configuration saved" );
         else
@@ -974 +1001 @@
 static void cmd_join_chat( irc_t *irc, char **cmd )
 {
+        irc_usermsg( irc, "This command is now obsolete. "
+                          "Please try the `chat' command instead." );
+}
+
+static set_t **cmd_chat_set_findhead( irc_t *irc, char *id )
+{
+        struct chat *c;
+        
+        if( ( c = chat_get( irc, id ) ) )
+                return &c->set;
+        else
+                return NULL;
+}
+
+static void cmd_chat( irc_t *irc, char **cmd )
+{
+        account_t *acc;
+        struct chat *c;
+        
+        if( g_strcasecmp( cmd[1], "add" ) == 0 )
+        {
+                char *channel, *s;
+                
+                MIN_ARGS( 3 );
+                
+                if( !( acc = account_get( irc, cmd[2] ) ) )
+                {
+                        irc_usermsg( irc, "Invalid account" );
+                        return;
+                }
+                
+                if( cmd[4] == NULL )
+                {
+                        channel = g_strdup( cmd[3] );
+                        if( ( s = strchr( channel, '@' ) ) )
+                                *s = 0;
+                }
+                else
+                {
+                        channel = g_strdup( cmd[4] );
+                }
+                
+                if( strchr( CTYPES, channel[0] ) == NULL )
+                {
+                        s = g_strdup_printf( "%c%s", CTYPES[0], channel );
+                        g_free( channel );
+                        channel = s;
+                }
+                
+                if( ( c = chat_add( irc, acc, cmd[3], channel ) ) )
+                        irc_usermsg( irc, "Chatroom added successfully." );
+                else
+                        irc_usermsg( irc, "Could not add chatroom." );
+                
+                g_free( channel );
+        }
+        else if( g_strcasecmp( cmd[1], "list" ) == 0 )
+        {
+                int i = 0;
+                
+                if( strchr( irc->umode, 'b' ) )
+                        irc_usermsg( irc, "Chatroom list:" );
+                
+                for( c = irc->chatrooms; c; c = c->next )
+                {
+                        irc_usermsg( irc, "%2d. %s(%s) %s, %s", i, c->acc->prpl->name,
+                                          c->acc->user, c->handle, c->channel );
+                        
+                        i ++;
+                }
+                irc_usermsg( irc, "End of chatroom list" );
+        }
+        else if( g_strcasecmp( cmd[1], "set" ) == 0 )
+        {
+                MIN_ARGS( 2 );
+                
+                cmd_set_real( irc, cmd + 1, cmd_chat_set_findhead, NULL );
+        }
+        else if( g_strcasecmp( cmd[1], "del" ) == 0 )
+        {
+                MIN_ARGS( 2 );
+                
+                if( ( c = chat_get( irc, cmd[2] ) ) )
+                {
+                        chat_del( irc, c );
+                }
+                else
+                {
+                        irc_usermsg( irc, "Could not remove chat." );
+                }
+        }
+        else if( g_strcasecmp( cmd[1], "with" ) == 0 )
+        {
+                user_t *u;
+                
+                MIN_ARGS( 2 );
+                
+                if( ( u = user_find( irc, cmd[2] ) ) && u->ic && u->ic->acc->prpl->chat_with )
+                {
+                        if( !u->ic->acc->prpl->chat_with( u->ic, u->handle ) )
+                        {
+                                irc_usermsg( irc, "(Possible) failure while trying to open "
+                                                  "a groupchat with %s.", u->nick );
+                        }
+                }
+                else
+                {
+                        irc_usermsg( irc, "Can't open a groupchat with %s.", cmd[2] );
+                }
+        }
+        else
+        {
+                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;
@@ -999 +1144 @@
         if( cmd[3] )
         {
-                if( cmd[3][0] != '#' && cmd[3][0] != '&' )
+                if( strchr( CTYPES, cmd[3][0] ) == NULL )
                         channel = g_strdup_printf( "&%s", cmd[3] );
                 else
@@ -1042 +1187 @@
                 g_free( channel );
         }
+#endif
 }
 
@@ -1129 +1275 @@
         { "qlist",          0, cmd_qlist,          0 },
         { "join_chat",      2, cmd_join_chat,      0 },
+        { "chat",           1, cmd_chat,           0 },
         { "transfers",      0, cmd_transfers,      0 },
         { NULL }

set.c

@@ -25 +25 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
+
+/* Used to use NULL for this, but NULL is actually a "valid" value. */
+char *SET_INVALID = "nee";
 
 set_t *set_add( set_t **head, char *key, char *def, set_eval eval, void *data )
@@ -114 +117 @@
         
         if( !s )
+                /*
+                Used to do this, but it never really made sense.
                 s = set_add( head, key, NULL, NULL, NULL );
-        
-        if( s->eval && !( nv = s->eval( s, value ) ) )
+                */
+                return 0;
+        
+        if( value == NULL && ( s->flags & SET_NULL_OK ) == 0 )
+                return 0;
+        
+        /* Call the evaluator. For invalid values, evaluators should now
+           return SET_INVALID, but previously this was NULL. Try to handle
+           that too if NULL is not an allowed value for this setting. */
+        if( s->eval && ( ( nv = s->eval( s, value ) ) == SET_INVALID ||
+                         ( ( s->flags & SET_NULL_OK ) == 0 && nv == NULL ) ) )
                 return 0;
         
@@ -168 +182 @@
 }
 
-void set_reset( set_t **head, char *key )
+int set_reset( set_t **head, char *key )
 {
         set_t *s;
@@ -174 +188 @@
         s = set_find( head, key );
         if( s )
-                set_setstr( head, key, s->def );
+                return set_setstr( head, key, s->def );
+        
+        return 0;
 }
 
@@ -187 +203 @@
         for( ; *s; s ++ )
                 if( !isdigit( *s ) )
-                        return NULL;
+                        return SET_INVALID;
         
         return value;
@@ -194 +210 @@
 char *set_eval_bool( set_t *set, char *value )
 {
-        return is_bool( value ) ? value : NULL;
+        return is_bool( value ) ? value : SET_INVALID;
 }
 
@@ -226 +242 @@
                                                               irc->channel, "-oo", irc->nick, irc->mynick );
         else
-                return NULL;
+                return SET_INVALID;
         
         return value;

set.h

@@ -44 +44 @@
 typedef char *(*set_eval) ( struct set *set, char *value );
 
+extern char *SET_INVALID;
+
+#define SET_NULL_OK        0x0100
+
 typedef struct set
 {
@@ -61 +65 @@
                            this (yet?). */
         
-        /* Eval: Returns NULL if the value is incorrect or exactly the
-           passed value variable. When returning a corrected value,
+        /* Eval: Returns SET_INVALID if the value is incorrect or exactly
+           the passed value variable. When returning a corrected value,
            set_setstr() should be able to free() the returned string! */
         set_eval eval;
@@ -88 +92 @@
 int set_setint( set_t **head, char *key, int value );
 void set_del( set_t **head, char *key );
-void set_reset( set_t **head, char *key );
+int set_reset( set_t **head, char *key );
 
 /* Two very useful generic evaluators. */

storage.c

@@ -103 +103 @@
 }
 
-storage_status_t storage_load (const char *nick, const char *password, irc_t * irc)
-{
-        GList *gl;
+storage_status_t storage_load (irc_t * irc, const char *password)
+{
+        GList *gl;
+        
+        if (irc && irc->status & USTATUS_IDENTIFIED)
+                return STORAGE_OTHER_ERROR;
         
         /* Loop until we don't get NO_SUCH_USER */
@@ -112 +115 @@
                 storage_status_t status;
 
-                status = st->load(nick, password, irc);
-                if (status == STORAGE_OK) {
-                        irc_setpass(irc, password);
+                status = st->load(irc, password);
+                if (status == STORAGE_OK)
                         return status;
-                }
                 
                 if (status != STORAGE_NO_SUCH_USER) 
@@ -125 +126 @@
 }
 
-storage_status_t storage_save (irc_t *irc, int overwrite)
-{
-        return ((storage_t *)global.storage->data)->save(irc, overwrite);
+storage_status_t storage_save (irc_t *irc, char *password, int overwrite)
+{
+        storage_status_t st;
+        
+        if (password != NULL) {
+                /* Should only use this in the "register" command. */
+                if (irc->password || overwrite)
+                        return STORAGE_OTHER_ERROR;
+                
+                irc_setpass(irc, password);
+        } else if ((irc->status & USTATUS_IDENTIFIED) == 0) {
+                return STORAGE_NO_SUCH_USER;
+        }
+        
+        st = ((storage_t *)global.storage->data)->save(irc, overwrite);
+        
+        if (password != NULL) {
+                irc_setpass(irc, NULL);
+        }
+        
+        return st;
 }
 
@@ -143 +162 @@
 
                 status = st->remove(nick, password);
-                if (status != STORAGE_NO_SUCH_USER && 
-                        status != STORAGE_OK)
+                if (status != STORAGE_NO_SUCH_USER && status != STORAGE_OK)
                         ret = status;
         }
@@ -150 +168 @@
         return ret;
 }
+
+#if 0
+Not using this yet. Test thoroughly before adding UI hooks to this function.
 
 storage_status_t storage_rename (const char *onick, const char *nnick, const char *password)
@@ -189 +210 @@
         return STORAGE_OK;
 }
+#endif

storage.h

@@ -45 +45 @@
         storage_status_t (*check_pass) (const char *nick, const char *password);
 
-        storage_status_t (*load) (const char *nick, const char *password, irc_t * irc);
+        storage_status_t (*load) (irc_t *irc, const char *password);
         storage_status_t (*save) (irc_t *irc, int overwrite);
         storage_status_t (*remove) (const char *nick, const char *password);
@@ -55 +55 @@
 storage_status_t storage_check_pass (const char *nick, const char *password);
 
-storage_status_t storage_load (const char *nick, const char *password, irc_t * irc);
-storage_status_t storage_save (irc_t *irc, int overwrite);
+storage_status_t storage_load (irc_t * irc, const char *password);
+storage_status_t storage_save (irc_t *irc, char *password, int overwrite);
 storage_status_t storage_remove (const char *nick, const char *password);
 
-storage_status_t storage_rename (const char *onick, const char *nnick, const char *password);
+/* storage_status_t storage_rename (const char *onick, const char *nnick, const char *password); */
 
 void register_storage_backend(storage_t *);

storage_text.c

@@ -44 +44 @@
 }
 
-static storage_status_t text_load ( const char *my_nick, const char* password, irc_t *irc )
+static storage_status_t text_load( irc_t *irc, const char* password )
 {
         char s[512];
@@ -54 +54 @@
         account_t *acc, *acc_lookup[9];
         
-        if( irc->status & USTATUS_IDENTIFIED )
-                return( 1 );
-        
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, my_nick, ".accounts" );
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts" );
         fp = fopen( s, "r" );
         if( !fp ) return STORAGE_NO_SUCH_USER;
@@ -68 +65 @@
                 return STORAGE_INVALID_PASSWORD;
         }
-        
-        /* 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 )
@@ -101 +94 @@
         }
         
-        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, my_nick, ".nicks" );
+        g_snprintf( s, 511, "%s%s%s", global.conf->configdir, irc->nick, ".nicks" );
         fp = fopen( s, "r" );
         if( !fp ) return STORAGE_NO_SUCH_USER;

storage_xml.c

@@ -29 +29 @@
 #include "arc.h"
 #include "md5.h"
+#include "chat.h"
+
+#if GLIB_CHECK_VERSION(2,8,0)
 #include <glib/gstdio.h>
-
-#if !GLIB_CHECK_VERSION(2,8,0)
+#else
 /* GLib < 2.8.0 doesn't have g_access, so just use the system access(). */
+#include <unistd.h>
 #define g_access access
 #endif
@@ -52 +55 @@
         char *current_setting;
         account_t *current_account;
+        struct chat *current_chat;
+        set_t **current_set_head;
         char *given_nick;
         char *given_pass;
@@ -170 +175 @@
                 
                 if( ( setting = xml_attr( attr_names, attr_values, "name" ) ) )
+                {
+                        if( xd->current_chat != NULL )
+                                xd->current_set_head = &xd->current_chat->set;
+                        else if( xd->current_account != NULL )
+                                xd->current_set_head = &xd->current_account->set;
+                        else
+                                xd->current_set_head = &xd->irc->set;
+                        
                         xd->current_setting = g_strdup( setting );
+                }
                 else
                         g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
@@ -192 +206 @@
                 }
         }
+        else if( g_strcasecmp( element_name, "chat" ) == 0 )
+        {
+                char *handle, *channel;
+                
+                handle = xml_attr( attr_names, attr_values, "handle" );
+                channel = xml_attr( attr_names, attr_values, "channel" );
+                
+                if( xd->current_account && handle && channel )
+                {
+                        xd->current_chat = chat_add( xd->irc, xd->current_account, handle, channel );
+                }
+                else
+                {
+                        g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
+                                     "Missing attributes for %s element", element_name );
+                }
+        }
         else
         {
@@ -212 +243 @@
                 xd->current_account = NULL;
         }
+        else if( g_strcasecmp( element_name, "chat" ) == 0 )
+        {
+                xd->current_chat = NULL;
+        }
 }
 
@@ -218 +253 @@
         char text[text_len+1];
         struct xml_parsedata *xd = data;
-        irc_t *irc = xd->irc;
         
         strncpy( text, text_orig, text_len );
@@ -231 +265 @@
         else if( g_strcasecmp( g_markup_parse_context_get_element( ctx ), "setting" ) == 0 && xd->current_setting )
         {
-                set_setstr( xd->current_account ? &xd->current_account->set : &irc->set,
-                            xd->current_setting, (char*) text );
+                set_setstr( xd->current_set_head, xd->current_setting, (char*) text );
                 g_free( xd->current_setting );
                 xd->current_setting = NULL;
@@ -256 +289 @@
 }
 
-static storage_status_t xml_load_real( const char *my_nick, const char *password, irc_t *irc, xml_pass_st action )
+static storage_status_t xml_load_real( irc_t *irc, const char *my_nick, const char *password, xml_pass_st action )
 {
         GMarkupParseContext *ctx;
@@ -263 +296 @@
         GError *gerr = NULL;
         int fd, st;
-        
-        if( irc && irc->status & USTATUS_IDENTIFIED )
-                return( 1 );
         
         xd = g_new0( struct xml_parsedata, 1 );
@@ -318 +348 @@
                 return STORAGE_OK;
         
-        irc->status |= USTATUS_IDENTIFIED;
-        
         return STORAGE_OK;
 }
 
-static storage_status_t xml_load( const char *my_nick, const char *password, irc_t *irc )
-{
-        return xml_load_real( my_nick, password, irc, XML_PASS_UNKNOWN );
+static storage_status_t xml_load( irc_t *irc, const char *password )
+{
+        return xml_load_real( irc, irc->nick, password, XML_PASS_UNKNOWN );
 }
 
@@ -332 +360 @@
         /* This is a little bit risky because we have to pass NULL for the
            irc_t argument. This *should* be fine, if I didn't miss anything... */
-        return xml_load_real( my_nick, password, NULL, XML_PASS_CHECK_ONLY );
+        return xml_load_real( NULL, my_nick, password, XML_PASS_CHECK_ONLY );
 }
 
@@ -367 +395 @@
         md5_byte_t pass_md5[21];
         md5_state_t md5_state;
-        
-        if( irc->password == NULL )
-        {
-                irc_usermsg( irc, "Please register yourself if you want to save your settings." );
-                return STORAGE_OTHER_ERROR;
-        }
         
         path2 = g_strdup( irc->nick );
@@ -406 +428 @@
         
         for( set = irc->set; set; set = set->next )
-                if( set->value && set->def )
+                if( set->value )
                         if( !xml_printf( fd, 1, "<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
                                 goto write_error;
@@ -415 +437 @@
                 char *pass_b64;
                 int pass_len;
+                struct chat *c;
                 
                 pass_len = arc_encode( acc->pass, strlen( acc->pass ), (unsigned char**) &pass_cr, irc->password, 12 );
@@ -433 +456 @@
                 
                 for( set = acc->set; set; set = set->next )
-                        if( set->value && set->def && !( set->flags & ACC_SET_NOSAVE ) )
+                        if( set->value && !( set->flags & ACC_SET_NOSAVE ) )
                                 if( !xml_printf( fd, 2, "<setting name=\"%s\">%s</setting>\n", set->key, set->value ) )
                                         goto write_error;
@@ -447 +470 @@
                         goto write_error;
                 
+                for( c = irc->chatrooms; c; c = c->next )
+                {
+                        if( c->acc != acc )
+                                continue;
+                        
+                        if( !xml_printf( fd, 2, "<chat handle=\"%s\" channel=\"%s\" type=\"%s\">\n",
+                                                c->handle, c->channel, "room" ) )
+                                goto write_error;
+                        
+                        for( set = c->set; set; set = set->next )
+                                if( set->value && !( set->flags & ACC_SET_NOSAVE ) )
+                                        if( !xml_printf( fd, 3, "<setting name=\"%s\">%s</setting>\n",
+                                                                set->key, set->value ) )
+                                                goto write_error;
+
+                        if( !xml_printf( fd, 2, "</chat>\n" ) )
+                                goto write_error;
+                }
+                
                 if( !xml_printf( fd, 1, "</account>\n" ) )
                         goto write_error;

tests/Makefile

@@ -11 +11 @@
 distclean: clean
 
-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
+main_objs = account.o bitlbee.o chat.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_arc.o check_irc.o check_help.o check_user.o check_crypting.o check_set.o check_jabber_sasl.o check_jabber_util.o

tests/check_set.c

@@ -96 +96 @@
 END_TEST
 
-START_TEST(test_setstr_implicit)
-        void *data = "data";
-        set_t *s = NULL, *t;
-        set_setstr(&s, "name", "bloe");
-        fail_unless(set_find(&s, "name") != NULL);
-END_TEST
-
 START_TEST(test_set_get_int_unknown)
         set_t *s = NULL;
@@ -126 +119 @@
         tcase_add_test (tc_core, test_setint);
         tcase_add_test (tc_core, test_setstr);
-        tcase_add_test (tc_core, test_setstr_implicit);
         return s;
 }

user.c

@@ -141 +141 @@
 }
 
-user_t *user_findhandle( struct im_connection *ic, char *handle )
+user_t *user_findhandle( struct im_connection *ic, const char *handle )
 {
         user_t *u;

user.h

@@ -56 +56 @@
 int user_del( irc_t *irc, char *nick );
 G_MODULE_EXPORT user_t *user_find( irc_t *irc, char *nick );
-G_MODULE_EXPORT user_t *user_findhandle( struct im_connection *ic, char *handle );
+G_MODULE_EXPORT user_t *user_findhandle( struct im_connection *ic, const char *handle );
 void user_rename( irc_t *irc, char *oldnick, char *newnick );