Changes in / [051372c:41d415b]

Files:

• Makefile (modified) (4 diffs)
• account.c (deleted)
• account.h (deleted)
• bitlbee.c (modified) (3 diffs)
• bitlbee.h (modified) (3 diffs)
• chat.c (deleted)
• chat.h (deleted)
• conf.c (modified) (3 diffs)
• conf.h (modified) (1 diff)
• configure (modified) (6 diffs)
• crypting.c (deleted)
• crypting.h (deleted)
• dcc.c (added)
• dcc.h (added)
• debian/bitlbee-common.config (added)
• debian/bitlbee-common.docs (added)
• debian/bitlbee-common.examples (added)
• debian/bitlbee-common.templates (added)
• debian/bitlbee.init (modified) (1 prop)
• debian/bitlbee.postinst (added)
• debian/bitlbee.postrm (added)
• debian/bitlbee.prerm (added)
• debian/changelog (modified) (1 diff)
• debian/compat (added)
• debian/conffiles (deleted)
• debian/config (deleted)
• debian/control (modified) (2 diffs)
• debian/patches/bitlbee.conf.diff (modified) (1 diff)
• debian/po/POTFILES.in (modified) (1 diff)
• debian/postinst (deleted)
• debian/postrm (deleted)
• debian/prerm (deleted)
• debian/rules (modified) (1 diff)
• debian/templates (deleted)
• doc/Makefile (modified) (2 diffs)
• doc/user-guide/Makefile (modified) (2 diffs)
• doc/user-guide/commands.xml (modified) (6 diffs)
• doc/user-guide/help.xml (modified) (1 diff)
• doc/user-guide/misc.xml (modified) (1 diff)
• help.c (modified) (2 diffs)
• help.h (modified) (1 diff)
• ipc.c (modified) (8 diffs)
• irc.c (modified) (27 diffs)
• irc.h (modified) (5 diffs)
• irc_channel.c (added)
• irc_commands.c (modified) (20 diffs)
• irc_im.c (added)
• irc_send.c (added)
• irc_user.c (added)
• irc_util.c (added)
• lib/Makefile (modified) (2 diffs)
• lib/events.h (modified) (1 diff)
• lib/events_glib.c (modified) (4 diffs)
• lib/events_libevent.c (modified) (6 diffs)
• lib/ftutil.c (added)
• lib/ftutil.h (added)
• lib/http_client.c (modified) (2 diffs)
• lib/misc.c (modified) (1 diff)
• lib/misc.h (modified) (1 diff)
• lib/proxy.c (modified) (26 diffs)
• lib/ssl_bogus.c (modified) (1 diff)
• lib/ssl_client.h (modified) (1 diff)
• lib/ssl_gnutls.c (modified) (2 diffs)
• lib/ssl_nss.c (modified) (1 diff)
• lib/ssl_openssl.c (modified) (2 diffs)
• lib/ssl_sspi.c (modified) (1 diff)
• nick.c (modified) (3 diffs)
• protocols/Makefile (modified) (2 diffs)
• protocols/account.c (added)
• protocols/account.h (added)
• protocols/bee.c (added)
• protocols/bee.h (added)
• protocols/bee_chat.c (added)
• protocols/bee_ft.c (added)
• protocols/bee_user.c (added)
• protocols/chat.c (added)
• protocols/chat.h (added)
• protocols/ft.h (added)
• protocols/jabber/Makefile (modified) (2 diffs)
• protocols/jabber/conference.c (modified) (2 diffs)
• protocols/jabber/io.c (modified) (2 diffs)
• protocols/jabber/iq.c (modified) (11 diffs)
• protocols/jabber/jabber.c (modified) (4 diffs)
• protocols/jabber/jabber.h (modified) (7 diffs)
• protocols/jabber/jabber_util.c (modified) (5 diffs)
• protocols/jabber/presence.c (modified) (2 diffs)
• protocols/jabber/s5bytestream.c (added)
• protocols/jabber/si.c (added)
• protocols/msn/Makefile (modified) (2 diffs)
• protocols/msn/invitation.c (added)
• protocols/msn/invitation.h (added)
• protocols/msn/msn.c (modified) (9 diffs)
• protocols/msn/msn.h (modified) (4 diffs)
• protocols/msn/msn_util.c (modified) (3 diffs)
• protocols/msn/ns.c (modified) (3 diffs)
• protocols/msn/sb.c (modified) (6 diffs)
• protocols/nogaim.c (modified) (26 diffs)
• protocols/nogaim.h (modified) (9 diffs)
• protocols/oscar/Makefile (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (17 diffs)
• protocols/purple/Makefile (added)
• protocols/purple/ft-direct.c (added)
• protocols/purple/ft.c (added)
• protocols/purple/purple.c (added)
• protocols/twitter/Makefile (modified) (2 diffs)
• protocols/twitter/twitter_lib.c (modified) (1 diff)
• protocols/yahoo/Makefile (modified) (2 diffs)
• protocols/yahoo/yahoo.c (modified) (8 diffs)
• query.c (modified) (2 diffs)
• root_commands.c (modified) (39 diffs)
• set.c (modified) (13 diffs)
• set.h (modified) (2 diffs)
• storage.c (modified) (2 diffs)
• storage_text.c (deleted)
• storage_xml.c (modified) (8 diffs)
• tests/Makefile (modified) (2 diffs)
• unix.c (modified) (4 diffs)
• user.c (deleted)
• user.h (deleted)
• win32.c (modified) (1 diff)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o chat.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
-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
+objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS)
+headers = account.h bitlbee.h commands.h conf.h config.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
 
@@ -82 +82 @@
 install-dev:
         mkdir -p $(DESTDIR)$(INCLUDEDIR)
-        install -m 0644 $(headers) $(DESTDIR)$(INCLUDEDIR)
+        install -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
+        for i in $(headers); do install -m 0644 $(SRCDIR)$$i $(DESTDIR)$(INCLUDEDIR); done
         mkdir -p $(DESTDIR)$(PCDIR)
         install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
@@ -93 +94 @@
 install-etc:
         mkdir -p $(DESTDIR)$(ETCDIR)
-        install -m 0644 motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
-        install -m 0644 bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
+        install -m 0644 $(SRCDIR)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
+        install -m 0644 $(SRCDIR)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
 
 uninstall-etc:
@@ -110 +111 @@
         @$(MAKE) -C $@ $(MAKECMDGOALS)
 
-$(objects): %.o: %.c
+$(objects): %.o: $(SRCDIR)%.c
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@

bitlbee.c

@@ -121 +121 @@
         }
         
-        global.listen_watch_source_id = b_input_add( global.listen_socket, GAIM_INPUT_READ, bitlbee_io_new_client, NULL );
+        global.listen_watch_source_id = b_input_add( global.listen_socket, B_EV_IO_READ, bitlbee_io_new_client, NULL );
         
 #ifndef _WIN32
@@ -321 +321 @@
                         child->pid = client_pid;
                         child->ipc_fd = fds[0];
-                        child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+                        child->ipc_inpa = b_input_add( child->ipc_fd, B_EV_IO_READ, ipc_master_read, child );
                         child_list = g_slist_append( child_list, child );
                         
@@ -349 +349 @@
                         /* We can store the IPC fd there now. */
                         global.listen_socket = fds[1];
-                        global.listen_watch_source_id = b_input_add( fds[1], GAIM_INPUT_READ, ipc_child_read, irc );
+                        global.listen_watch_source_id = b_input_add( fds[1], B_EV_IO_READ, ipc_child_read, irc );
                         
                         close( fds[0] );

bitlbee.h

@@ -43 +43 @@
 
 #if HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
@@ -126 +126 @@
 #define CONF_FILE_DEF ETCDIR "bitlbee.conf"
 
+#include "bee.h"
 #include "irc.h"
 #include "storage.h"
@@ -160 +161 @@
 gboolean bitlbee_io_current_client_write( gpointer data, gint source, b_input_condition cond );
 
-void root_command_string( irc_t *irc, user_t *u, char *command, int flags );
+void root_command_string( irc_t *irc, char *command );
 void root_command( irc_t *irc, char *command[] );
 gboolean bitlbee_shutdown( gpointer data, gint fd, b_input_condition cond );

conf.c

@@ -63 +63 @@
         conf->ping_timeout = 300;
         conf->user = NULL;
+        conf->ft_max_size = SIZE_MAX;
+        conf->ft_max_kbps = G_MAXUINT;
+        conf->ft_listen = NULL;
         conf->protocols = NULL;
         proxytype = 0;
@@ -315 +318 @@
                                 conf->user = g_strdup( ini->value );
                         }
+                        else if( g_strcasecmp( ini->key, "ft_max_size" ) == 0 )
+                        {
+                                size_t ft_max_size;
+                                if( sscanf( ini->value, "%zu", &ft_max_size ) != 1 )
+                                {
+                                        fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
+                                        return 0;
+                                }
+                                conf->ft_max_size = ft_max_size;
+                        }
+                        else if( g_strcasecmp( ini->key, "ft_max_kbps" ) == 0 )
+                        {
+                                if( sscanf( ini->value, "%d", &i ) != 1 )
+                                {
+                                        fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
+                                        return 0;
+                                }
+                                conf->ft_max_kbps = i;
+                        }
+                        else if( g_strcasecmp( ini->key, "ft_listen" ) == 0 )
+                        {
+                                g_free( conf->ft_listen );
+                                conf->ft_listen = g_strdup( ini->value );
+                        }
                         else if( g_strcasecmp( ini->key, "protocols" ) == 0 )
                         {
@@ -349 +376 @@
                 if( g_strcasecmp( ini->section, "defaults" ) == 0 )
                 {
-                        set_t *s = set_find( &irc->set, ini->key );
+                        set_t *s = set_find( &irc->b->set, ini->key );
                         
                         if( s )

conf.h

@@ -50 +50 @@
         int ping_timeout;
         char *user;
+        size_t ft_max_size;
+        int ft_max_kbps;
+        char *ft_listen;
         char **protocols;
 } conf_t;

configure

@@ -27 +27 @@
 yahoo=1
 twitter=1
+twitter=1
+purple=0
 
 debug=0
@@ -67 +69 @@
 --oscar=0/1     Disable/enable Oscar part (ICQ, AIM)    $oscar
 --yahoo=0/1     Disable/enable Yahoo part               $yahoo
---twitter=0/1 Disable/enable Twitter part               $twitter
+--twitter=0/1   Disable/enable Twitter part             $twitter
+
+--purple=0/1    Disable/enable libpurple support        $purple
 
 --debug=0/1     Disable/enable debugging                $debug
@@ -121 +125 @@
 EOF
 
+srcdir="$(dirname $0)"
+if [ "$srcdir" != "." ]; then
+        echo
+        echo "configure script run from a different directory. Will create some symlinks..."
+        if [ ! -e Makefile -o -L Makefile ]; then
+                COPYDIRS="doc lib protocols tests utils"
+                mkdir -p $(cd "$srcdir"; find $COPYDIRS -type d)
+                find . -name Makefile -type l -print0 | xargs -0 rm 2> /dev/null
+                dst="$PWD"
+                cd "$srcdir"
+                for i in $(find . -name Makefile -type f); do
+                        ln -s "$PWD${i#.}" "$dst/$i";
+                done
+                cd "$dst"
+                rm -rf .bzr
+        fi
+        
+        echo "SRCDIR=$srcdir/" >> Makefile.settings
+        CFLAGS="$CFLAGS -I${dst}"
+else
+        srcdir=$PWD
+fi
+
 cat<<EOF>config.h
 /* BitlBee settings, generated by configure
@@ -158 +185 @@
 
 echo CFLAGS=$CFLAGS >> Makefile.settings
-echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings
+echo CFLAGS+=-I${srcdir} -I${srcdir}/lib -I${srcdir}/protocols -I. >> Makefile.settings
 
 echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings
@@ -398 +425 @@
 fi
 
-STORAGES="text xml"
+STORAGES="xml"
 
 if [ "$ldap" = "auto" ]; then
@@ -508 +535 @@
 protoobjs=''
 
+if [ "$purple" = 0 ]; then
+        echo '#undef WITH_PURPLE' >> config.h
+else
+        if ! $PKG_CONFIG purple; then
+                echo
+                echo 'Cannot find libpurple development libraries, aborting. (Install libpurple-dev?)'
+                exit 1
+        fi
+        echo '#define WITH_PURPLE' >> config.h
+        cat<<EOF>>Makefile.settings
+EFLAGS += $($PKG_CONFIG purple --libs)
+PURPLE_CFLAGS += $($PKG_CONFIG purple --cflags)
+EOF
+        protocols=$protocols'purple '
+        protoobjs=$protoobjs'purple_mod.o '
+
+        # Having both libpurple and native IM modules in one binary may
+        # do strange things. Let's not do that.
+        msn=0
+        jabber=0
+        oscar=0
+        yahoo=0
+        twitter=0
+        
+        if [ "$events" = "libevent" ]; then
+                echo
+                echo 'Warning: Some libpurple modules (including msn-pecan) do their event handling'
+                echo 'outside libpurple, talking to GLib directly. At least for now the combination'
+                echo 'libpurple + libevent is *not* recommended!'
+        fi
+fi
+
 if [ "$msn" = 0 ]; then
         echo '#undef WITH_MSN' >> config.h

debian/changelog

@@ +1 @@
+bitlbee (1.3-0) unstable; urgency=low
+
+  * Setting some bogus version number, fix that later.
+  * Now using debhelper to improve maintainability.
+  * Added a bitlbee-libpurple package, and split off docs and stuff into
+    bitlbee-common.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 05 Jun 2010 15:16:38 +0100
+
 bitlbee (1.2.7-1) unstable; urgency=high
 

debian/control

@@ -4 +4 @@
 Maintainer: Wilmer van der Gaast <wilmer@gaast.net>
 Uploaders: Jelmer Vernooij <jelmer@samba.org>
-Standards-Version: 3.8.0
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), debconf-2.0, po-debconf
+Standards-Version: 3.8.4
+Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, debhelper (>= 6)
 Homepage: http://www.bitlbee.org/
 Vcs-Bzr: http://code.bitlbee.org/bitlbee/
@@ -12 +12 @@
 Package: bitlbee
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, net-tools, ${debconf-depends}, debianutils (>= 1.16)
-Description: An IRC to other chat networks gateway
+Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
+Conflicts: bitlbee-libpurple
+Replaces: bitlbee-libpurple
+Description: An IRC to other chat networks gateway (default version)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber, ICQ, AIM, MSN, Yahoo! and
  Twitter.
 
+Package: bitlbee-libpurple
+Architecture: any
+Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
+Conflicts: bitlbee
+Replaces: bitlbee
+Description: An IRC to other chat networks gateway (using libpurple)
+ This program can be used as an IRC server which forwards everything you
+ say to people on other chat networks: Jabber, ICQ, AIM, MSN, Yahoo! and
+ Twitter.
+ .
+ This package contains a version of BitlBee that uses the libpurple instant
+ messaging library instead of built-in code, which adds support for more IM
+ protocols (all protocols supported by Pidgin/Finch) and features (like file
+ transfers), at the price of being less lightweight.
+ .
+ This variant may not be very suitable for BitlBee instances used by many
+ (tens or hundreds) of clients.
+
+Package: bitlbee-common
+Architecture: all
+Depends: ${misc:Depends}, net-tools
+Replaces: bitlbee
+Description: An IRC to other chat networks gateway (common files/docs)
+ This program can be used as an IRC server which forwards everything you
+ say to people on other chat networks: Jabber, ICQ, AIM, MSN, Yahoo! and
+ Twitter.
+ .
+ This package contains common files (mostly documentation) for bitlbee and
+ bitlbee-libpurple.
+
 Package: bitlbee-dev
 Architecture: all
-Depends: bitlbee (>= ${source:Version}), bitlbee (<< ${source:Version}.1~)
-Description: An IRC to other chat networks gateway
+Depends: ${misc:Depends}, bitlbee (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~)
+Description: An IRC to other chat networks gateway (dev files)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber, ICQ, AIM, MSN, Yahoo! and

debian/patches/bitlbee.conf.diff

@@ -1 @@
---- debian/bitlbee/etc/bitlbee/bitlbee.conf     2009-06-01 00:20:24.000000000 +0100
-+++ debian/bitlbee/etc/bitlbee/bitlbee.conf     2009-06-07 21:16:19.000000000 +0100
+--- bitlbee.conf        2009-06-01 00:20:24.000000000 +0100
++++ bitlbee.conf        2009-06-07 21:16:19.000000000 +0100
 @@ -23,13 +23,18 @@
  ## If BitlBee is started by root as a daemon, it can drop root privileges,

debian/po/POTFILES.in

@@ -1 @@
-[type: gettext/rfc822deb] templates
+[type: gettext/rfc822deb] bitlbee-common.templates

debian/rules

@@ -1 +1 @@
 #!/usr/bin/make -f
+#
+# Finally switching to debhelper.
+#
+# Not using debhelper was an exercise suggested to me by my AM (Gergely
+# Nagy). It was educating at the time but I finally decided that the
+# exercise is over now.
+#
 
+BITLBEE_CONFIGURE_FLAGS ?=
 DEBUG ?= 0
 
-ifdef BITLBEE_VERSION
-BITLBEE_FORCE_VERSION=1
-else
+ifndef BITLBEE_VERSION
 # Want to use the full package version number instead of just the release.
-BITLBEE_VERSION ?= "$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}')"
-export BITLBEE_VERSION
+BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION=\"$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}')\"
 endif
 
-build-arch: build-arch-stamp
-build-arch-stamp:
-        [ -d debian ]
-        ./configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent
-        $(MAKE)
-#       $(MAKE) -C doc/ all
-        touch build-arch-stamp
+build: build-stamp
+build-stamp:
+        dh_testdir
+
+        mkdir -p debian/build-native
+        ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent $(BITLBEE_CONFIGURE_FLAGS)
+        $(MAKE) -C debian/build-native
+
+        mkdir -p debian/build-libpurple
+        ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
+        $(MAKE) -C debian/build-libpurple
+
+        $(MAKE) -C doc
+
+        touch build-stamp
 
 clean:
-        [ "`whoami`" = "root" -a -d debian ]
-        rm -rf build-arch-stamp debian/bitlbee debian/*.substvars debian/files debian/bitlbee-dev
+        dh_testdir
+        dh_testroot
+        rm -f build-stamp
+
+        rm -rf build-arch-stamp debian/build-*
         $(MAKE) distclean
-#       -$(MAKE) -C doc/ clean
-                                
 
-install-arch: build-arch
-        [ "`whoami`" = "root" -a -d debian ]
-        mkdir -p debian/bitlbee/DEBIAN/
-        $(MAKE) install install-etc DESTDIR=`pwd`/debian/bitlbee
+        dh_clean
 
-        mkdir -p debian/bitlbee/usr/share/doc/bitlbee/
-        cp doc/user-guide/user-guide.txt debian/bitlbee/usr/share/doc/bitlbee/
-        cp doc/user-guide/user-guide.html debian/bitlbee/usr/share/doc/bitlbee/
+install: build
+        dh_testdir
+        dh_testroot
+        dh_clean -k
+        dh_installdirs
 
-install-indep: install-arch
-        [ "`whoami`" = "root" -a -d debian ]
-        mkdir -p debian/bitlbee-dev/DEBIAN/
-        $(MAKE) install-dev DESTDIR=`pwd`/debian/bitlbee-dev
+        $(MAKE) -C debian/build-native install install-etc DESTDIR=`pwd`/debian/bitlbee
+        $(MAKE) -C debian/build-libpurple install install-etc DESTDIR=`pwd`/debian/bitlbee-libpurple
+        $(MAKE) -C debian/build-native install-dev DESTDIR=`pwd`/debian/bitlbee-dev
 
-        mkdir -p debian/bitlbee-dev/usr/share/doc/bitlbee-dev/
+        patch debian/bitlbee/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
+        patch debian/bitlbee-libpurple/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
 
-binary-arch: build-arch install-arch
-        [ "`whoami`" = "root" -a -d debian ]
+        mkdir -p debian/bitlbee-common/usr
+        mv debian/bitlbee/usr/share debian/bitlbee-common/usr
+        rm -rf debian/bitlbee-libpurple/usr/share
 
-        chmod 755 debian/post* debian/pre* debian/config debian/bitlbee.init
+binary-common:
+        dh_testdir
+        dh_testroot
 
-        mkdir -p debian/bitlbee/usr/share/doc/bitlbee/examples/ debian/bitlbee/etc/init.d/
-        -cp doc/RELEASE-SPEECH* debian/bitlbee/usr/share/doc/bitlbee/ && gzip -9 debian/bitlbee/usr/share/doc/bitlbee/RELEASE-SPEECH*
-        cp doc/CREDITS doc/AUTHORS doc/README doc/FAQ debian/README.Debian debian/bitlbee/usr/share/doc/bitlbee/
-        cp debian/changelog debian/bitlbee/usr/share/doc/bitlbee/changelog.Debian
-        cp debian/copyright debian/bitlbee/usr/share/doc/bitlbee/copyright
-        cp doc/CHANGES debian/bitlbee/usr/share/doc/bitlbee/changelog
-        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/bitlbee/examples/* man/man8/bitlbee.8 man/man5/bitlbee.conf.5
-        
-        chown -R root:root debian/bitlbee/
-        find debian/bitlbee/usr/share/ -type d -exec chmod 755 {} \;
-        find debian/bitlbee/usr/share/ -type f -exec chmod 644 {} \;
-        
-        cp debian/prerm debian/bitlbee/DEBIAN/
-        cp debian/postinst debian/bitlbee/DEBIAN/
-        cp debian/postrm debian/bitlbee/DEBIAN/
-        cp debian/config debian/bitlbee/DEBIAN/
+        dh_installchangelogs doc/CHANGES
+        dh_installexamples
+        dh_installdocs #--link-doc=bitlbee-common
+        # TODO: Restore --link-doc up here and remove the hack below once
+        # Hardy and Lenny are deprecated.
+        for p in bitlbee bitlbee-libpurple bitlbee-dev; do rm -rf debian/$$p/usr/share/doc/$$p; ln -s bitlbee-common debian/$$p/usr/share/doc/$$p; done
+        dh_installdebconf
+        dh_installinit
+ifeq ($(DH_OPTIONS),-a)
+        cp -a debian/bitlbee/etc debian/bitlbee-libpurple
+endif
+        dh_installman
+        dh_strip
+        dh_link
+        dh_compress
+        dh_fixperms
+        dh_installdeb
+ifeq ($(DH_OPTIONS),-a)
+        cp -a debian/bitlbee/DEBIAN/post* debian/bitlbee/DEBIAN/pre* debian/bitlbee-libpurple/DEBIAN
+endif
+        dh_shlibdeps
+ifdef BITLBEE_VERSION
+        dh_gencontrol -- -v1:$(BITLBEE_VERSION)-0  -Vbee:Version=1:$(BITLBEE_VERSION)-0
+else
+        dh_gencontrol -- -Vbee:Version=$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}' | sed -e 's/+[^+]*$$//')
+endif
+        dh_md5sums
+        dh_builddeb
 
-        po2debconf debian/templates > debian/bitlbee/DEBIAN/templates
-        cp debian/conffiles debian/bitlbee/DEBIAN/
-        
-        if [ "$(DEBUG)" = "0" ]; then strip -R .comment -R .note debian/bitlbee/usr/sbin/bitlbee; fi
+binary-indep: build install
+        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
-        cd debian/bitlbee; \
-                find usr -type f -exec md5sum {} \; > DEBIAN/md5sums
-        dpkg-shlibdeps -Tdebian/bitlbee.substvars -dDepends debian/bitlbee/usr/sbin/bitlbee
-ifdef BITLBEE_FORCE_VERSION
-        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee -Tdebian/bitlbee.substvars -Pdebian/bitlbee -v1:$(BITLBEE_VERSION)-0 -V'debconf-depends=debconf (>= 1.2.0) | debconf-2.0'
-else
-        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee -Tdebian/bitlbee.substvars -Pdebian/bitlbee -V'debconf-depends=debconf (>= 1.2.0) | debconf-2.0'
-endif
+binary-arch: build install
+        $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
-        dpkg --build debian/bitlbee ..
+binary-%: build install
+        make -f debian/rules binary-common DH_OPTIONS=-p$*
 
-binary-indep: install-indep
-        [ "`whoami`" = "root" -a -d debian ]
-
-        chown -R root.root debian/bitlbee-dev/
-        find debian/bitlbee-dev/usr/share/ -type d -exec chmod 755 {} \;
-        find debian/bitlbee-dev/usr/share/ -type f -exec chmod 644 {} \;
-
-        cp debian/changelog debian/bitlbee-dev/usr/share/doc/bitlbee-dev/changelog.Debian
-        gzip -9 debian/bitlbee-dev/usr/share/doc/bitlbee-dev/changelog.Debian
-        cp debian/copyright debian/bitlbee-dev/usr/share/doc/bitlbee-dev/copyright
-
-        cd debian/bitlbee-dev; \
-                find usr -type f -exec md5sum {} \; > DEBIAN/md5sums
-
-ifdef BITLBEE_FORCE_VERSION
-        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev -v1:$(BITLBEE_VERSION)-0
-else
-        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev
-endif
-
-        dpkg --build debian/bitlbee-dev ..
-
-binary: binary-arch binary-indep
-build: build-arch
-install: install-arch install-indep
-
-.PHONY: build-arch build clean binary-arch binary install-arch install binary-indep install-indep
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary-common binary install

doc/Makefile

@@ -1 +1 @@
 -include ../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)doc/
+endif
 
 all:
@@ -7 +10 @@
 install:
         mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/
-        install -m 0644 bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
-        install -m 0644 bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
+        install -m 0644 $(SRCDIR)bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
+        install -m 0644 $(SRCDIR)bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
         $(MAKE) -C user-guide $@
 

doc/user-guide/Makefile

@@ -1 +1 @@
 -include ../../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)doc/user-guide/
+endif
+
 EXTRAPARANEWLINE = 1
 # EXTRAPARANEWLINE = 0
@@ -38 +42 @@
         chmod 0755 $(DESTDIR)$(DATADIR)
         rm -f $(DESTDIR)$(DATADIR)/help.txt # Prevent help function from breaking in running sessions
-        install -m 0644 help.txt $(DESTDIR)$(DATADIR)/help.txt
+        install -m 0644 $(SRCDIR)help.txt $(DESTDIR)$(DATADIR)/help.txt
 
 uninstall:

doc/user-guide/commands.xml

@@ -484 +484 @@
         </bitlbee-setting>
 
-        <bitlbee-setting name="buddy_sendbuffer" type="boolean" scope="global">
-                <default>false</default>
-
-                <description>
-                        <para>
-                                By default, when you send a message to someone, BitlBee forwards this message to the user immediately. When you paste a large number of lines, the lines will be sent in separate messages, which might not be very nice to read. If you enable this setting, BitlBee will buffer your messages and wait for more data.
-                        </para>
-
-                        <para>
-                                Using the <emphasis>buddy_sendbuffer_delay</emphasis> setting you can specify the number of seconds BitlBee should wait for more data before the complete message is sent.
-                        </para>
-
-                        <para>
-                                Please note that if you remove a buddy from your list (or if the connection to that user drops) and there's still data in the buffer, this data will be lost. BitlBee will not try to send the message to the user in those cases.
-                        </para>
-                </description>
-        </bitlbee-setting>
-
-        <bitlbee-setting name="buddy_sendbuffer_delay" type="integer" scope="global">
-                <default>200</default>
-
-                <description>
-
-                        <para>
-                                Tell BitlBee after how many (mili)seconds a buffered message should be sent. Values greater than 5 will be interpreted as miliseconds, 5 and lower as seconds.
-                        </para>
-
-                        <para>
-                                See also the <emphasis>buddy_sendbuffer</emphasis> setting.
+        <bitlbee-setting name="away_reply_timeout" type="integer" scope="global">
+                <default>3600</default>
+
+                <description>
+                        <para>
+                                Most IRC servers send a user's away message every time s/he gets a private message, to inform the sender that they may not get a response immediately. With this setting set to 0, BitlBee will also behave like this.
+                        </para>
+
+                        <para>
+                                Since not all IRC clients do an excellent job at suppressing these messages, this setting lets BitlBee do it instead. BitlBee will wait this many seconds (or until the away state/message changes) before re-informing you that the person's away.
                         </para>
                 </description>
@@ -593 +574 @@
 
         <bitlbee-setting name="handle_unknown" type="string" scope="global">
-                <default>root</default>
+                <default>add_channel</default>
                 <possible-values>root, add, add_private, add_channel, ignore</possible-values>
 
@@ -771 +752 @@
                 </description>
         </bitlbee-setting>
+
+        <bitlbee-setting name="paste_buffer" type="boolean" scope="global">
+                <default>false</default>
+
+                <description>
+                        <para>
+                                By default, when you send a message to someone, BitlBee forwards this message to the user immediately. When you paste a large number of lines, the lines will be sent in separate messages, which might not be very nice to read. If you enable this setting, BitlBee will buffer your messages and wait for more data.
+                        </para>
+
+                        <para>
+                                Using the <emphasis>paste_buffer_delay</emphasis> setting you can specify the number of seconds BitlBee should wait for more data before the complete message is sent.
+                        </para>
+
+                        <para>
+                                Please note that if you remove a buddy from your list (or if the connection to that user drops) and there's still data in the buffer, this data will be lost. BitlBee will not try to send the message to the user in those cases.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
+        <bitlbee-setting name="paste_buffer_delay" type="integer" scope="global">
+                <default>200</default>
+
+                <description>
+
+                        <para>
+                                Tell BitlBee after how many (mili)seconds a buffered message should be sent. Values greater than 5 will be interpreted as miliseconds, 5 and lower as seconds.
+                        </para>
+
+                        <para>
+                                See also the <emphasis>paste_buffer</emphasis> setting.
+                        </para>
+                </description>
+        </bitlbee-setting>
         
         <bitlbee-setting name="port" type="integer" scope="account">
@@ -1128 +1142 @@
 
         <bitlbee-command name="identify">
-                <syntax>identify &lt;password&gt;</syntax>
+                <syntax>identify [-noload|-force] &lt;password&gt;</syntax>
                 <short-description>Identify yourself with your password</short-description>
 
@@ -1138 +1152 @@
                         <para>
                                 Once you're registered, you can change your password using <emphasis>set password &lt;password&gt;</emphasis>.
+                        </para>
+
+                        <para>
+                                The <emphasis>-noload</emphasis> and <emphasis>-force</emphasis> flags can be used to identify when you're logged into some IM accounts already. <emphasis>-force</emphasis> will let you identify yourself and load all saved accounts (and keep the accounts you're logged into already).
+                        </para>
+                        
+                        <para>
+                                <emphasis>-noload</emphasis> will log you in but not load any accounts and settings saved under your current nickname. These will be overwritten once you save your settings (i.e. when you disconnect).
                         </para>
                 </description>
@@ -1182 +1204 @@
 
         </bitlbee-command>
+        
+        <bitlbee-command name="transfers">
+                <short-description>Monitor, cancel, or reject file transfers</short-description>
+                <syntax>transfers [&lt;cancel&gt; id | &lt;reject&gt;]</syntax>
+                
+                <description>
+                        <para>
+                                Without parameters the currently pending file transfers and their status will be listed. Available actions are <emphasis>cancel</emphasis> and <emphasis>reject</emphasis>. See <emphasis>help transfers &lt;action&gt;</emphasis> for more information.
+                        </para>
+
+                        <ircexample>
+                                <ircline nick="ulim">transfers</ircline>
+                        </ircexample>
+                </description>
+                
+                <bitlbee-command name="cancel">
+                        <short-description>Cancels the file transfer with the given id</short-description>
+                        <syntax>transfers &lt;cancel&gt; id</syntax>
+
+                        <description>
+                                <para>Cancels the file transfer with the given id</para>
+                        </description>
+
+                        <ircexample>
+                                <ircline nick="ulim">transfers cancel 1</ircline>
+                                <ircline nick="root">Canceling file transfer for test</ircline>
+                        </ircexample>
+                </bitlbee-command>
+
+                <bitlbee-command name="reject">
+                        <short-description>Rejects all incoming transfers</short-description>
+                        <syntax>transfers &lt;reject&gt;</syntax>
+
+                        <description>
+                                <para>Rejects all incoming (not already transferring) file transfers. Since you probably have only one incoming transfer at a time, no id is neccessary. Or is it?</para>
+                        </description>
+
+                        <ircexample>
+                                <ircline nick="ulim">transfers reject</ircline>
+                        </ircexample>
+                </bitlbee-command>
+        </bitlbee-command>
+        
 </chapter>

doc/user-guide/help.xml

@@ -14 +14 @@
   <varlistentry><term>quickstart</term><listitem><para>A short introduction into BitlBee</para></listitem></varlistentry>
   <varlistentry><term>commands</term><listitem><para>All available commands and settings</para></listitem></varlistentry>
+  <varlistentry><term>channels</term><listitem><para>About creating and customizing channels</para></listitem></varlistentry>
   <varlistentry><term>away</term><listitem><para>About setting away states</para></listitem></varlistentry>
   <varlistentry><term>smileys</term><listitem><para>A summary of some non-standard smileys you might find and fail to understand</para></listitem></varlistentry>

doc/user-guide/misc.xml

@@ -117 +117 @@
 </sect1>
 
+<sect1 id="nick_changes">
+<title>Changing your nickname</title>
+
+<para>
+BitlBee now allows you to change your nickname. So far this was not possible because it made managing saved accounts more complicated.
+</para>
+
+<para>
+The restriction no longer exists now though. When you change your nick (just using the <emphasis>/nick</emphasis> command), your logged-in status will be reset, which means any changes made to your settings/accounts will not be saved.
+</para>
+
+<para>
+To restore your logged-in status, you need to either use the <emphasis>register</emphasis> command to create an account under the new nickname, or use <emphasis>identify -noload</emphasis> to re-identify yourself under the new nickname. The <emphasis>-noload</emphasis> flag tells the command to verify your password and log you in, but not load any new settings. See <emphasis>help identify</emphasis> for more information.
+</para>
+
+</sect1>
+
+<sect1 id="channels">
+<title>Dealing with channels</title>
+
+<para>
+You can have as many channels in BitlBee as you want. You maintain your channel list using the <emphasis>channel</emphasis> command. You can create new channels by just joining them, like on regular IRC networks.
+</para>
+
+<para>
+You can create two kinds of channels. Control channels, and groupchat channels. By default, BitlBee will set up new channels as control channels if their name starts with an &amp;, and as chat channels if it starts with a #.
+</para>
+
+<para>
+Control channels are where you see your contacts. By default, you will have one control channel called &amp;bitlbee, containing all your contacts. But you can create more, if you want, and divide your contact list accross several channels.
+</para>
+
+<para>
+For example, you can have one channel with all contacts from your MSN Messenger account in it. Or all contacts from the group called "Work".
+</para>
+
+<para>
+Type <emphasis>help channels2</emphasis> to read more.
+</para>
+
+</sect1>
+
+<sect1 id="channels2">
+<title>Creating a channel</title>
+
+<para>
+When you create a new channel, BitlBee will try to guess from its name which contacts to fill it with. For example, if the channel name (excluding the &amp;) matches the name of a group in which you have one or more contacts, the channel will contain all those contacts.
+</para>
+
+<para>
+Any valid account ID (so a number, protocol name or part of screenname, as long as it's unique) can also be used as a channel name. So if you just join &amp;msn, it will contain all your MSN contacts (as long as you have only one MSN account set up). And if you have a Facebook account set up, you can see its contacts by just joining &amp;facebook.
+</para>
+
+<para>
+To start a simple group chat, you simply join a channel which a name starting with #, and invite people into it. All people you invite have to be on the same IM network and contact list.
+</para>
+
+<para>
+If you want to configure your own channels, you can use the <emphasis>channel set</emphasis>.
+</para>
+
+</sect1>
+
 </chapter>

help.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2005 Wilmer van der Gaast and others                *
+  * Copyright 2002-2009 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -169 +169 @@
         return NULL;
 }
+
+int help_add_mem( help_t **help, const char *title, const char *content )
+{
+        help_t *h, *l = NULL;
+        
+        for( h = *help; h; h = h->next )
+        {
+                if( g_strcasecmp( h->title, title ) == 0 )
+                        return 0;
+                
+                l = h;
+        }
+        
+        if( l )
+                h = l->next = g_new0( struct help, 1 );
+        else
+                *help = h = g_new0( struct help, 1 );
+        h->fd = -1;
+        h->title = g_strdup( title );
+        h->length = strlen( content );
+        h->offset.mem_offset = g_strdup( content );
+        
+        return 1;
+}

help.h

@@ -46 +46 @@
 void help_free( help_t **help );
 char *help_get( help_t **help, char *title );
+int help_add_mem( help_t **help, const char *title, const char *content_ );
 
 #endif

ipc.c

@@ -138 +138 @@
         
         if( strchr( irc->umode, 'w' ) )
-                irc_write( irc, ":%s WALLOPS :%s", irc->myhost, cmd[1] );
+                irc_write( irc, ":%s WALLOPS :%s", irc->root->host, cmd[1] );
 }
 
@@ -147 +147 @@
         
         if( strchr( irc->umode, 's' ) )
-                irc_write( irc, ":%s NOTICE %s :%s", irc->myhost, irc->nick, cmd[1] );
+                irc_write( irc, ":%s NOTICE %s :%s", irc->root->host, irc->user->nick, cmd[1] );
 }
 
@@ -156 +156 @@
         
         if( strchr( irc->umode, 'o' ) )
-                irc_write( irc, ":%s NOTICE %s :*** OperMsg *** %s", irc->myhost, irc->nick, cmd[1] );
+                irc_write( irc, ":%s NOTICE %s :*** OperMsg *** %s", irc->root->host, irc->user->nick, cmd[1] );
 }
 
@@ -176 +176 @@
                 return;
         
-        if( nick_cmp( cmd[1], irc->nick ) != 0 )
+        if( nick_cmp( cmd[1], irc->user->nick ) != 0 )
                 return;         /* It's not for us. */
         
-        irc_write( irc, ":%s!%s@%s KILL %s :%s", irc->mynick, irc->mynick, irc->myhost, irc->nick, cmd[2] );
+        irc_write( irc, ":%s!%s@%s KILL %s :%s", irc->root->nick, irc->root->nick, irc->root->host, irc->user->nick, cmd[2] );
         irc_abort( irc, 0, "Killed by operator: %s", cmd[2] );
 }
@@ -188 +188 @@
                 ipc_to_master_str( "HELLO\r\n" );
         else
-                ipc_to_master_str( "HELLO %s %s :%s\r\n", irc->host, irc->nick, irc->realname );
+                ipc_to_master_str( "HELLO %s %s :%s\r\n", irc->user->host, irc->user->nick, irc->user->fullname );
 }
 
@@ -514 +514 @@
         }
                 
-        child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+        child->ipc_inpa = b_input_add( child->ipc_fd, B_EV_IO_READ, ipc_master_read, child );
         
         child_list = g_slist_append( child_list, child );
@@ -552 +552 @@
         }
         
-        b_input_add( serversock, GAIM_INPUT_READ, new_ipc_client, NULL );
+        b_input_add( serversock, B_EV_IO_READ, new_ipc_client, NULL );
         
         return 1;
@@ -597 +597 @@
                         return 0;
                 }
-                child->ipc_inpa = b_input_add( child->ipc_fd, GAIM_INPUT_READ, ipc_master_read, child );
+                child->ipc_inpa = b_input_add( child->ipc_fd, B_EV_IO_READ, ipc_master_read, child );
                 
                 child_list = g_slist_append( child_list, child );

irc.c

@@ -5 +5 @@
   \********************************************************************/
 
-/* The big hairy IRCd part of the project                               */
+/* The IRC-based UI (for now the only one)                              */
 
 /*
@@ -24 +24 @@
 */
 
-#define BITLBEE_CORE
 #include "bitlbee.h"
-#include "sock.h"
-#include "crypting.h"
 #include "ipc.h"
-
-static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );
-
-GSList *irc_connection_list = NULL;
-
-static char *set_eval_password( set_t *set, char *value )
-{
-        irc_t *irc = set->data;
-        
-        if( irc->status & USTATUS_IDENTIFIED && value )
-        {
-                irc_setpass( irc, value );
-                return NULL;
-        }
-        else
-        {
-                return SET_INVALID;
-        }
-}
-
-static char *set_eval_charset( set_t *set, char *value )
-{
-        irc_t *irc = set->data;
-        char *test;
-        gsize test_bytes = 0;
-        GIConv ic, oc;
-
-        if( g_strcasecmp( value, "none" ) == 0 )
-                value = g_strdup( "utf-8" );
-
-        if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 )
-        {
-                return NULL;
-        }
-        
-        /* Do a test iconv to see if the user picked an IRC-compatible
-           charset (for example utf-16 goes *horribly* wrong). */
-        if( ( test = g_convert_with_iconv( " ", 1, oc, NULL, &test_bytes, NULL ) ) == NULL ||
-            test_bytes > 1 )
-        {
-                g_free( test );
-                g_iconv_close( oc );
-                irc_usermsg( irc, "Unsupported character set: The IRC protocol "
-                                  "only supports 8-bit character sets." );
-                return NULL;
-        }
-        g_free( test );
-        
-        if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 )
-        {
-                g_iconv_close( oc );
-                return NULL;
-        }
-        
-        if( irc->iconv != (GIConv) -1 )
-                g_iconv_close( irc->iconv );
-        if( irc->oconv != (GIConv) -1 )
-                g_iconv_close( irc->oconv );
-        
-        irc->iconv = ic;
-        irc->oconv = oc;
-
-        return value;
-}
-
-static char *set_eval_away_status( set_t *set, char *value )
-{
-        irc_t *irc = set->data;
-        account_t *a;
-        
-        g_free( set->value );
-        set->value = g_strdup( value );
-        
-        for( a = irc->accounts; a; a = a->next )
-        {
-                struct im_connection *ic = a->ic;
-                
-                if( ic && ic->flags & OPT_LOGGED_IN )
-                        imc_away_send_update( ic );
-        }
-        
-        return value;
-}
+#include "dcc.h"
+
+GSList *irc_connection_list;
+
+static gboolean irc_userping( gpointer _irc, gint fd, b_input_condition cond );
+static char *set_eval_charset( set_t *set, char *value );
+static char *set_eval_password( set_t *set, char *value );
 
 irc_t *irc_new( int fd )
@@ -118 +39 @@
         struct sockaddr_storage sock;
         socklen_t socklen = sizeof( sock );
+        char *host = NULL, *myhost = NULL;
+        irc_user_t *iu;
         set_t *s;
+        bee_t *b;
         
         irc = g_new0( irc_t, 1 );
@@ -125 +49 @@
         sock_make_nonblocking( irc->fd );
         
-        irc->r_watch_source_id = b_input_add( irc->fd, GAIM_INPUT_READ, bitlbee_io_current_client_read, irc );
+        irc->r_watch_source_id = b_input_add( irc->fd, B_EV_IO_READ, bitlbee_io_current_client_read, irc );
         
         irc->status = USTATUS_OFFLINE;
         irc->last_pong = gettime();
         
-        irc->userhash = g_hash_table_new( g_str_hash, g_str_equal );
+        irc->nick_user_hash = g_hash_table_new( g_str_hash, g_str_equal );
         irc->watches = g_hash_table_new( g_str_hash, g_str_equal );
-        
-        strcpy( irc->umode, UMODE );
-        irc->mynick = g_strdup( ROOT_NICK );
-        irc->channel = g_strdup( ROOT_CHAN );
         
         irc->iconv = (GIConv) -1;
@@ -142 +62 @@
         if( global.conf->hostname )
         {
-                irc->myhost = g_strdup( global.conf->hostname );
+                myhost = g_strdup( global.conf->hostname );
         }
         else if( getsockname( irc->fd, (struct sockaddr*) &sock, &socklen ) == 0 ) 
@@ -151 +71 @@
                                  NI_MAXHOST, NULL, 0, 0 ) == 0 )
                 {
-                        irc->myhost = g_strdup( ipv6_unwrap( buf ) );
+                        myhost = g_strdup( ipv6_unwrap( buf ) );
                 }
         }
@@ -162 +82 @@
                                  NI_MAXHOST, NULL, 0, 0 ) == 0 )
                 {
-                        irc->host = g_strdup( ipv6_unwrap( buf ) );
-                }
-        }
-        
-        if( irc->host == NULL )
-                irc->host = g_strdup( "localhost.localdomain" );
-        if( irc->myhost == NULL )
-                irc->myhost = g_strdup( "localhost.localdomain" );
+                        host = g_strdup( ipv6_unwrap( buf ) );
+                }
+        }
+        
+        if( host == NULL )
+                host = g_strdup( "localhost.localdomain" );
+        if( myhost == NULL )
+                myhost = g_strdup( "localhost.localdomain" );
         
         if( global.conf->ping_interval > 0 && global.conf->ping_timeout > 0 )
                 irc->ping_source_id = b_timeout_add( global.conf->ping_interval * 1000, irc_userping, irc );
-        
-        irc_write( irc, ":%s NOTICE AUTH :%s", irc->myhost, "BitlBee-IRCd initialized, please go on" );
 
         irc_connection_list = g_slist_append( irc_connection_list, irc );
         
-        s = set_add( &irc->set, "away", NULL,  set_eval_away_status, irc );
+        b = irc->b = bee_new();
+        b->ui_data = irc;
+        b->ui = &irc_ui_funcs;
+        
+        s = set_add( &b->set, "away_devoice", "true", set_eval_away_devoice, irc );
+        s = set_add( &b->set, "away_reply_timeout", "3600", set_eval_int, irc );
+        s = set_add( &b->set, "charset", "utf-8", set_eval_charset, irc );
+        s = set_add( &b->set, "default_target", "root", NULL, irc );
+        s = set_add( &b->set, "display_namechanges", "false", set_eval_bool, irc );
+        s = set_add( &b->set, "display_timestamps", "true", set_eval_bool, irc );
+        s = set_add( &b->set, "handle_unknown", "add_channel", NULL, irc );
+        s = set_add( &b->set, "lcnicks", "true", set_eval_bool, irc );
+        s = set_add( &b->set, "ops", "both", set_eval_irc_channel_ops, irc );
+        s = set_add( &b->set, "paste_buffer", "false", set_eval_bool, irc );
+        s->old_key = g_strdup( "buddy_sendbuffer" );
+        s = set_add( &b->set, "paste_buffer_delay", "200", set_eval_int, irc );
+        s->old_key = g_strdup( "buddy_sendbuffer_delay" );
+        s = set_add( &b->set, "password", NULL, set_eval_password, irc );
         s->flags |= SET_NULL_OK;
-        s = set_add( &irc->set, "away_devoice", "true",  set_eval_away_devoice, irc );
-        s = set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
-        s = set_add( &irc->set, "auto_reconnect", "true", 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, "control_channel", irc->channel, set_eval_control_channel, 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, "display_timestamps", "true", 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, "show_offline", "false", set_eval_bool, irc );
-        s = set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
-        s = set_add( &irc->set, "status", NULL,  set_eval_away_status, irc );
-        s->flags |= SET_NULL_OK;
-        s = set_add( &irc->set, "strip_html", "true", NULL, irc );
-        s = set_add( &irc->set, "timezone", "local", set_eval_timezone, 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 );
+        s = set_add( &b->set, "private", "true", set_eval_bool, irc );
+        s = set_add( &b->set, "query_order", "lifo", NULL, irc );
+        s = set_add( &b->set, "root_nick", ROOT_NICK, set_eval_root_nick, irc );
+        s = set_add( &b->set, "simulate_netsplit", "true", set_eval_bool, irc );
+        s = set_add( &b->set, "timezone", "local", set_eval_timezone, irc );
+        s = set_add( &b->set, "to_char", ": ", set_eval_to_char, irc );
+        s = set_add( &b->set, "typing_notice", "false", set_eval_bool, irc );
+
+        irc->root = iu = irc_user_new( irc, ROOT_NICK );
+        iu->host = g_strdup( myhost );
+        iu->fullname = g_strdup( ROOT_FN );
+        iu->f = &irc_user_root_funcs;
+        
+        iu = irc_user_new( irc, NS_NICK );
+        iu->host = g_strdup( myhost );
+        iu->fullname = g_strdup( ROOT_FN );
+        iu->f = &irc_user_root_funcs;
+        
+        irc->user = g_new0( irc_user_t, 1 );
+        irc->user->host = g_strdup( host );
         
         conf_loaddefaults( irc );
         
         /* Evaluator sets the iconv/oconv structures. */
-        set_eval_charset( set_find( &irc->set, "charset" ), set_getstr( &irc->set, "charset" ) );
-        
-        return( irc );
+        set_eval_charset( set_find( &b->set, "charset" ), set_getstr( &b->set, "charset" ) );
+        
+        irc_write( irc, ":%s NOTICE AUTH :%s", irc->root->host, "BitlBee-IRCd initialized, please go on" );
+        
+        g_free( myhost );
+        g_free( host );
+        
+        nogaim_init();
+        
+        return irc;
 }
 
@@ -236 +169 @@
                 
                 ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
-                                   irc->nick ? irc->nick : "(NONE)", irc->host, reason );
+                                   irc->user->nick ? irc->user->nick : "(NONE)", irc->user->host, reason );
                 
                 g_free( reason );
@@ -246 +179 @@
                 
                 ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
-                                   irc->nick ? irc->nick : "(NONE)", irc->host, "No reason given" );
+                                   irc->user->nick ? irc->user->nick : "(NONE)", irc->user->host, "No reason given" );
         }
         
@@ -267 +200 @@
 }
 
-static gboolean irc_free_hashkey( gpointer key, gpointer value, gpointer data )
-{
-        g_free( key );
-        
-        return( TRUE );
-}
-
-/* Because we have no garbage collection, this is quite annoying */
+static gboolean irc_free_hashkey( gpointer key, gpointer value, gpointer data );
+
 void irc_free( irc_t * irc )
 {
-        user_t *user, *usertmp;
-        
         log_message( LOGLVL_INFO, "Destroying connection with fd %d", irc->fd );
         
-        if( irc->status & USTATUS_IDENTIFIED && set_getbool( &irc->set, "save_on_quit" ) ) 
+        if( irc->status & USTATUS_IDENTIFIED && set_getbool( &irc->b->set, "save_on_quit" ) ) 
                 if( storage_save( irc, NULL, TRUE ) != STORAGE_OK )
-                        irc_usermsg( irc, "Error while saving settings!" );
+                        log_message( LOGLVL_WARNING, "Error while saving settings for user %s", irc->user->nick );
         
         irc_connection_list = g_slist_remove( irc_connection_list, irc );
-        
-        while( irc->accounts )
-        {
-                if( irc->accounts->ic )
-                        imc_logout( irc->accounts->ic, FALSE );
-                else if( irc->accounts->reconnect )
-                        cancel_auto_reconnect( irc->accounts );
-                
-                if( irc->accounts->ic == NULL )
-                        account_del( irc, irc->accounts );
-                else
-                        /* Nasty hack, but account_del() doesn't work in this
-                           case and we don't want infinite loops, do we? ;-) */
-                        irc->accounts = irc->accounts->next;
-        }
         
         while( irc->queries != NULL )
                 query_del( irc, irc->queries );
         
-        while( irc->set )
-                set_del( &irc->set, irc->set->key );
-        
-        if (irc->users != NULL)
-        {
-                user = irc->users;
-                while( user != NULL )
-                {
-                        g_free( user->nick );
-                        g_free( user->away );
-                        g_free( user->handle );
-                        if( user->user != user->nick ) g_free( user->user );
-                        if( user->host != user->nick ) g_free( user->host );
-                        if( user->realname != user->nick ) g_free( user->realname );
-                        b_event_remove( user->sendbuf_timer );
-                                        
-                        usertmp = user;
-                        user = user->next;
-                        g_free( usertmp );
-                }
-        }
+        /* This is a little bit messy: bee_free() frees all b->users which
+           calls us back to free the corresponding irc->users. So do this
+           before we clear the remaining ones ourselves. */
+        bee_free( irc->b );
+        
+        while( irc->users )
+                irc_user_free( irc, (irc_user_t *) irc->users->data );
+        
+        while( irc->channels )
+                irc_channel_free( irc->channels->data );
         
         if( irc->ping_source_id > 0 )
@@ -337 +236 @@
         irc->fd = -1;
         
-        g_hash_table_foreach_remove( irc->userhash, irc_free_hashkey, NULL );
-        g_hash_table_destroy( irc->userhash );
+        g_hash_table_foreach_remove( irc->nick_user_hash, irc_free_hashkey, NULL );
+        g_hash_table_destroy( irc->nick_user_hash );
         
         g_hash_table_foreach_remove( irc->watches, irc_free_hashkey, NULL );
@@ -350 +249 @@
         g_free( irc->sendbuffer );
         g_free( irc->readbuffer );
-        
-        g_free( irc->nick );
-        g_free( irc->user );
-        g_free( irc->host );
-        g_free( irc->realname );
         g_free( irc->password );
-        
-        g_free( irc->myhost );
-        g_free( irc->mynick );
-        
-        g_free( irc->channel );
-        
-        g_free( irc->last_target );
+        g_free( irc->last_root_cmd );
         
         g_free( irc );
@@ -374 +262 @@
 }
 
+static gboolean irc_free_hashkey( gpointer key, gpointer value, gpointer data )
+{
+        g_free( key );
+        
+        return( TRUE );
+}
+
 /* USE WITH CAUTION!
    Sets pass without checking */
-void irc_setpass (irc_t *irc, const char *pass) 
+void irc_setpass (irc_t *irc, const char *pass)
 {
         g_free (irc->password);
@@ -387 +282 @@
 }
 
+static char *set_eval_password( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
+        
+        if( irc->status & USTATUS_IDENTIFIED && value )
+        {
+                irc_setpass( irc, value );
+                return NULL;
+        }
+        else
+        {
+                return SET_INVALID;
+        }
+}
+
+static char **irc_splitlines( char *buffer );
+
 void irc_process( irc_t *irc )
 {
@@ -394 +306 @@
         if( irc->readbuffer != NULL )
         {
-                lines = irc_tokenize( irc->readbuffer );
+                lines = irc_splitlines( irc->readbuffer );
                 
                 for( i = 0; *lines[i] != '\0'; i ++ )
@@ -431 +343 @@
                                                                   "`help set charset' for more information. Your "
                                                                   "message was ignored.",
-                                                                  set_getstr( &irc->set, "charset" ) );
+                                                                  set_getstr( &irc->b->set, "charset" ) );
                                                 
                                                 g_free( conv );
@@ -438 +350 @@
                                         else
                                         {
-                                                irc_write( irc, ":%s NOTICE AUTH :%s", irc->myhost,
+                                                irc_write( irc, ":%s NOTICE AUTH :%s", irc->root->host,
                                                            "Warning: invalid characters received at login time." );
                                                 
@@ -476 +388 @@
 }
 
-/* Splits a long string into separate lines. The array is NULL-terminated and, unless the string
-   contains an incomplete line at the end, ends with an empty string. */
-char **irc_tokenize( char *buffer )
+/* Splits a long string into separate lines. The array is NULL-terminated
+   and, unless the string contains an incomplete line at the end, ends with
+   an empty string. Could use g_strsplit() but this one does it in-place.
+   (So yes, it's destructive.) */
+static char **irc_splitlines( char *buffer )
 {
         int i, j, n = 3;
@@ -609 +523 @@
 }
 
-void irc_reply( irc_t *irc, int code, char *format, ... )
-{
-        char text[IRC_MAX_LINE];
-        va_list params;
-        
-        va_start( params, format );
-        g_vsnprintf( text, IRC_MAX_LINE, format, params );
-        va_end( params );
-        irc_write( irc, ":%s %03d %s %s", irc->myhost, code, irc->nick?irc->nick:"*", text );
-        
-        return;
-}
-
-int irc_usermsg( irc_t *irc, char *format, ... )
-{
-        char text[1024];
-        va_list params;
-        char is_private = 0;
-        user_t *u;
-        
-        u = user_find( irc, irc->mynick );
-        is_private = u->is_private;
-        
-        va_start( params, format );
-        g_vsnprintf( text, sizeof( text ), format, params );
-        va_end( params );
-        
-        return( irc_msgfrom( irc, u->nick, text ) );
-}
-
 void irc_write( irc_t *irc, char *format, ... ) 
 {
@@ -649 +533 @@
         return;
 }
+
+void irc_write_all( int now, char *format, ... )
+{
+        va_list params;
+        GSList *temp;   
+        
+        va_start( params, format );
+        
+        temp = irc_connection_list;
+        while( temp != NULL )
+        {
+                irc_t *irc = temp->data;
+                
+                if( now )
+                {
+                        g_free( irc->sendbuffer );
+                        irc->sendbuffer = g_strdup( "\r\n" );
+                }
+                irc_vawrite( temp->data, format, params );
+                if( now )
+                {
+                        bitlbee_io_current_client_write( irc, irc->fd, B_EV_IO_WRITE );
+                }
+                temp = temp->next;
+        }
+        
+        va_end( params );
+        return;
+} 
 
 void irc_vawrite( irc_t *irc, char *format, va_list params )
@@ -696 +609 @@
                    in the event queue. */
                 /* Really can't be done as long as the code doesn't do error checking very well:
-                if( bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE ) ) */
+                if( bitlbee_io_current_client_write( irc, irc->fd, B_EV_IO_WRITE ) ) */
                 
                 /* So just always do it via the event handler. */
-                irc->w_watch_source_id = b_input_add( irc->fd, GAIM_INPUT_WRITE, bitlbee_io_current_client_write, irc );
+                irc->w_watch_source_id = b_input_add( irc->fd, B_EV_IO_WRITE, bitlbee_io_current_client_write, irc );
         }
         
@@ -705 +618 @@
 }
 
-void irc_write_all( int now, char *format, ... )
-{
-        va_list params;
-        GSList *temp;   
-        
-        va_start( params, format );
-        
-        temp = irc_connection_list;
-        while( temp != NULL )
-        {
-                irc_t *irc = temp->data;
-                
-                if( now )
-                {
-                        g_free( irc->sendbuffer );
-                        irc->sendbuffer = g_strdup( "\r\n" );
-                }
-                irc_vawrite( temp->data, format, params );
-                if( now )
-                {
-                        bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE );
-                }
-                temp = temp->next;
-        }
-        
-        va_end( params );
-        return;
-} 
-
-void irc_names( irc_t *irc, char *channel )
-{
-        user_t *u;
-        char namelist[385] = "";
-        struct groupchat *c = NULL;
-        char *ops = set_getstr( &irc->set, "ops" );
-        
-        /* RFCs say there is no error reply allowed on NAMES, so when the
-           channel is invalid, just give an empty reply. */
-        
-        if( g_strcasecmp( channel, irc->channel ) == 0 )
-        {
-                for( u = irc->users; u; u = u->next ) if( u->online )
-                {
-                        if( strlen( namelist ) + strlen( u->nick ) > sizeof( namelist ) - 4 )
+int irc_check_login( irc_t *irc )
+{
+        if( irc->user->user && irc->user->nick )
+        {
+                if( global.conf->authmode == AUTHMODE_CLOSED && !( irc->status & USTATUS_AUTHORIZED ) )
+                {
+                        irc_send_num( irc, 464, ":This server is password-protected." );
+                        return 0;
+                }
+                else
+                {
+                        irc_channel_t *ic;
+                        irc_user_t *iu = irc->user;
+                        
+                        irc->user = irc_user_new( irc, iu->nick );
+                        irc->user->user = iu->user;
+                        irc->user->host = iu->host;
+                        irc->user->fullname = iu->fullname;
+                        irc->user->f = &irc_user_self_funcs;
+                        g_free( iu->nick );
+                        g_free( iu );
+                        
+                        if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )
+                                ipc_to_master_str( "CLIENT %s %s :%s\r\n", irc->user->host, irc->user->nick, irc->user->fullname );
+                        
+                        irc->status |= USTATUS_LOGGED_IN;
+                        
+                        irc_send_login( irc );
+                        
+                        irc->umode[0] = '\0';
+                        irc_umode_set( irc, "+" UMODE, TRUE );
+                        
+                        ic = irc->default_channel = irc_channel_new( irc, ROOT_CHAN );
+                        irc_channel_set_topic( ic, CONTROL_TOPIC, irc->root );
+                        irc_channel_add_user( ic, irc->user );
+                        
+                        irc->last_root_cmd = g_strdup( ROOT_CHAN );
+                        
+                        irc_send_msg( irc->root, "PRIVMSG", ROOT_CHAN,
+                                      "Welcome to the BitlBee gateway!\n\n"
+                                      "If you've never used BitlBee before, please do read the help "
+                                      "information using the \x02help\x02 command. Lots of FAQs are "
+                                      "answered there.\n"
+                                      "If you already have an account on this server, just use the "
+                                      "\x02identify\x02 command to identify yourself.", NULL );
+                        
+                        /* This is for bug #209 (use PASS to identify to NickServ). */
+                        if( irc->password != NULL )
                         {
-                                irc_reply( irc, 353, "= %s :%s", channel, namelist );
-                                *namelist = 0;
+                                char *send_cmd[] = { "identify", g_strdup( irc->password ), NULL };
+                                
+                                irc_setpass( irc, NULL );
+                                root_command( irc, send_cmd );
+                                g_free( send_cmd[1] );
                         }
                         
-                        if( u->ic && !u->away && set_getbool( &irc->set, "away_devoice" ) )
-                                strcat( namelist, "+" );
-                        else if( ( strcmp( u->nick, irc->mynick ) == 0 && ( strcmp( ops, "root" ) == 0 || strcmp( ops, "both" ) == 0 ) ) ||
-                                 ( strcmp( u->nick, irc->nick ) == 0 && ( strcmp( ops, "user" ) == 0 || strcmp( ops, "both" ) == 0 ) ) )
-                                strcat( namelist, "@" );
-                        
-                        strcat( namelist, u->nick );
-                        strcat( namelist, " " );
-                }
-        }
-        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
-        {
-                GList *l;
-                
-                /* root and the user aren't in the channel userlist but should
-                   show up in /NAMES, so list them first: */
-                sprintf( namelist, "%s%s %s%s ", strcmp( ops, "root" ) == 0 || strcmp( ops, "both" ) ? "@" : "", irc->mynick,
-                                                 strcmp( ops, "user" ) == 0 || strcmp( ops, "both" ) ? "@" : "", irc->nick );
-                
-                for( l = c->in_room; l; l = l->next ) if( ( u = user_findhandle( c->ic, l->data ) ) )
-                {
-                        if( strlen( namelist ) + strlen( u->nick ) > sizeof( namelist ) - 4 )
-                        {
-                                irc_reply( irc, 353, "= %s :%s", channel, namelist );
-                                *namelist = 0;
-                        }
-                        
-                        strcat( namelist, u->nick );
-                        strcat( namelist, " " );
-                }
-        }
-        
-        if( *namelist )
-                irc_reply( irc, 353, "= %s :%s", channel, namelist );
-        
-        irc_reply( irc, 366, "%s :End of /NAMES list", channel );
-}
-
-int irc_check_login( irc_t *irc )
-{
-        if( irc->user && irc->nick )
-        {
-                if( global.conf->authmode == AUTHMODE_CLOSED && !( irc->status & USTATUS_AUTHORIZED ) )
-                {
-                        irc_reply( irc, 464, ":This server is password-protected." );
-                        return 0;
-                }
-                else
-                {
-                        irc_login( irc );
                         return 1;
                 }
@@ -814 +684 @@
 }
 
-void irc_login( irc_t *irc )
-{
-        user_t *u;
-        
-        irc_reply( irc,   1, ":Welcome to the BitlBee gateway, %s", irc->nick );
-        irc_reply( irc,   2, ":Host %s is running BitlBee " BITLBEE_VERSION " " ARCH "/" CPU ".", irc->myhost );
-        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=%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';
-        irc_umode_set( irc, "+" UMODE, 1 );
-
-        u = user_add( irc, irc->mynick );
-        u->host = g_strdup( irc->myhost );
-        u->realname = g_strdup( ROOT_FN );
-        u->online = 1;
-        u->send_handler = root_command_string;
-        u->is_private = 0; /* [SH] The channel is root's personal playground. */
-        irc_spawn( irc, u );
-        
-        u = user_add( irc, NS_NICK );
-        u->host = g_strdup( irc->myhost );
-        u->realname = g_strdup( ROOT_FN );
-        u->online = 0;
-        u->send_handler = root_command_string;
-        u->is_private = 1; /* [SH] NickServ is not in the channel, so should always /query. */
-        
-        u = user_add( irc, irc->nick );
-        u->user = g_strdup( irc->user );
-        u->host = g_strdup( irc->host );
-        u->realname = g_strdup( irc->realname );
-        u->online = 1;
-        irc_spawn( irc, u );
-        
-        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\n"
-                          "If you've never used BitlBee before, please do read the help "
-                          "information using the \x02help\x02 command. Lots of FAQs are "
-                          "answered there.\n"
-                          "If you already have an account on this server, just use the "
-                          "\x02identify\x02 command to identify yourself." );
-        
-        if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )
-                ipc_to_master_str( "CLIENT %s %s :%s\r\n", irc->host, irc->nick, irc->realname );
-        
-        irc->status |= USTATUS_LOGGED_IN;
-        
-        /* This is for bug #209 (use PASS to identify to NickServ). */
-        if( irc->password != NULL )
-        {
-                char *send_cmd[] = { "identify", g_strdup( irc->password ), NULL };
-                
-                irc_setpass( irc, NULL );
-                root_command( irc, send_cmd );
-                g_free( send_cmd[1] );
-        }
-}
-
-void irc_motd( irc_t *irc )
-{
-        int fd;
-        
-        fd = open( global.conf->motdfile, O_RDONLY );
-        if( fd == -1 )
-        {
-                irc_reply( irc, 422, ":We don't need MOTDs." );
-        }
-        else
-        {
-                char linebuf[80];       /* Max. line length for MOTD's is 79 chars. It's what most IRC networks seem to do. */
-                char *add, max;
-                int len;
-                
-                linebuf[79] = len = 0;
-                max = sizeof( linebuf ) - 1;
-                
-                irc_reply( irc, 375, ":- %s Message Of The Day - ", irc->myhost );
-                while( read( fd, linebuf + len, 1 ) == 1 )
-                {
-                        if( linebuf[len] == '\n' || len == max )
-                        {
-                                linebuf[len] = 0;
-                                irc_reply( irc, 372, ":- %s", linebuf );
-                                len = 0;
-                        }
-                        else if( linebuf[len] == '%' )
-                        {
-                                read( fd, linebuf + len, 1 );
-                                if( linebuf[len] == 'h' )
-                                        add = irc->myhost;
-                                else if( linebuf[len] == 'v' )
-                                        add = BITLBEE_VERSION;
-                                else if( linebuf[len] == 'n' )
-                                        add = irc->nick;
-                                else
-                                        add = "%";
-                                
-                                strncpy( linebuf + len, add, max - len );
-                                while( linebuf[++len] );
-                        }
-                        else if( len < max )
-                        {
-                                len ++;
-                        }
-                }
-                irc_reply( irc, 376, ":End of MOTD" );
-                close( fd );
-        }
-}
-
-void irc_topic( irc_t *irc, char *channel )
-{
-        struct groupchat *c = irc_chat_by_channel( irc, channel );
-        
-        if( c && c->topic )
-                irc_reply( irc, 332, "%s :%s", channel, c->topic );
-        else if( g_strcasecmp( channel, irc->channel ) == 0 )
-                irc_reply( irc, 332, "%s :%s", channel, CONTROL_TOPIC );
-        else
-                irc_reply( irc, 331, "%s :No topic for this channel", channel );
-}
-
-void irc_umode_set( irc_t *irc, char *s, int allow_priv )
+void irc_umode_set( irc_t *irc, const char *s, gboolean allow_priv )
 {
         /* allow_priv: Set to 0 if s contains user input, 1 if you want
            to set a "privileged" mode (+o, +R, etc). */
-        char m[256], st = 1, *t;
+        char m[128], st = 1;
+        const char *t;
         int i;
         char changes[512], *p, st2 = 2;
@@ -950 +697 @@
         
         for( t = irc->umode; *t; t ++ )
-                m[(int)*t] = 1;
-
+                if( *t < sizeof( m ) )
+                        m[(int)*t] = 1;
+        
         p = changes;
         for( t = s; *t; t ++ )
@@ -957 +705 @@
                 if( *t == '+' || *t == '-' )
                         st = *t == '+';
-                else if( st == 0 || ( strchr( UMODES, *t ) || ( allow_priv && strchr( UMODES_PRIV, *t ) ) ) )
+                else if( ( st == 0 && ( !strchr( UMODES_KEEP, *t ) || allow_priv ) ) ||
+                         ( st == 1 && strchr( UMODES, *t ) ) ||
+                         ( st == 1 && allow_priv && strchr( UMODES_PRIV, *t ) ) )
                 {
                         if( m[(int)*t] != st)
@@ -974 +724 @@
         memset( irc->umode, 0, sizeof( irc->umode ) );
         
-        for( i = 0; i < 256 && strlen( irc->umode ) < ( sizeof( irc->umode ) - 1 ); i ++ )
+        for( i = 'A'; i <= 'z' && strlen( irc->umode ) < ( sizeof( irc->umode ) - 1 ); i ++ )
                 if( m[i] )
                         irc->umode[strlen(irc->umode)] = i;
         
         if( badflag )
-                irc_reply( irc, 501, ":Unknown MODE flag" );
-        /* Deliberately no !user@host on the prefix here */
+                irc_send_num( irc, 501, ":Unknown MODE flag" );
         if( *changes )
-                irc_write( irc, ":%s MODE %s %s", irc->nick, irc->nick, changes );
-}
-
-void irc_spawn( irc_t *irc, user_t *u )
-{
-        irc_join( irc, u, irc->channel );
-}
-
-void irc_join( irc_t *irc, user_t *u, char *channel )
-{
-        char *nick;
-        
-        if( ( g_strcasecmp( channel, irc->channel ) != 0 ) || user_find( irc, irc->nick ) )
-                irc_write( irc, ":%s!%s@%s JOIN :%s", u->nick, u->user, u->host, channel );
-        
-        if( nick_cmp( u->nick, irc->nick ) == 0 )
-        {
-                irc_write( irc, ":%s MODE %s +%s", irc->myhost, channel, CMODE );
-                irc_names( irc, channel );
-                irc_topic( irc, channel );
-        }
-        
-        nick = g_strdup( u->nick );
-        nick_lc( nick );
-        if( g_hash_table_lookup( irc->watches, nick ) )
-        {
-                irc_reply( irc, 600, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "logged online" );
-        }
-        g_free( nick );
-}
-
-void irc_part( irc_t *irc, user_t *u, char *channel )
-{
-        irc_write( irc, ":%s!%s@%s PART %s :%s", u->nick, u->user, u->host, channel, "" );
-}
-
-void irc_kick( irc_t *irc, user_t *u, char *channel, user_t *kicker )
-{
-        irc_write( irc, ":%s!%s@%s KICK %s %s :%s", kicker->nick, kicker->user, kicker->host, channel, u->nick, "" );
-}
-
-void irc_kill( irc_t *irc, user_t *u )
-{
-        char *nick, *s;
-        char reason[128];
-        
-        if( u->ic && u->ic->flags & OPT_LOGGING_OUT && set_getbool( &irc->set, "simulate_netsplit" ) )
-        {
-                if( u->ic->acc->server )
-                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
-                                    u->ic->acc->server );
-                else if( ( s = strchr( u->ic->acc->user, '@' ) ) )
-                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
-                                    s + 1 );
-                else
-                        g_snprintf( reason, sizeof( reason ), "%s %s.%s", irc->myhost,
-                                    u->ic->acc->prpl->name, irc->myhost );
-                
-                /* proto_opt might contain garbage after the : */
-                if( ( s = strchr( reason, ':' ) ) )
-                        *s = 0;
-        }
-        else
-        {
-                strcpy( reason, "Leaving..." );
-        }
-        
-        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, reason );
-        
-        nick = g_strdup( u->nick );
-        nick_lc( nick );
-        if( g_hash_table_lookup( irc->watches, nick ) )
-        {
-                irc_reply( irc, 601, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "logged offline" );
-        }
-        g_free( nick );
-}
-
-int irc_send( irc_t *irc, char *nick, char *s, int flags )
-{
-        struct groupchat *c = NULL;
-        user_t *u = NULL;
-        
-        if( strchr( CTYPES, *nick ) )
-        {
-                if( !( c = irc_chat_by_channel( irc, nick ) ) )
-                {
-                        irc_reply( irc, 403, "%s :Channel does not exist", nick );
-                        return( 0 );
-                }
-        }
-        else
-        {
-                u = user_find( irc, nick );
-                
-                if( !u )
-                {
-                        if( irc->is_private )
-                                irc_reply( irc, 401, "%s :Nick does not exist", nick );
-                        else
-                                irc_usermsg( irc, "Nick `%s' does not exist!", nick );
-                        return( 0 );
-                }
-        }
-        
-        if( *s == 1 && s[strlen(s)-1] == 1 )
-        {
-                if( g_strncasecmp( s + 1, "ACTION", 6 ) == 0 )
-                {
-                        if( s[7] == ' ' ) s ++;
-                        s += 3;
-                        *(s++) = '/';
-                        *(s++) = 'm';
-                        *(s++) = 'e';
-                        *(s++) = ' ';
-                        s -= 4;
-                        s[strlen(s)-1] = 0;
-                }
-                else if( g_strncasecmp( s + 1, "VERSION", 7 ) == 0 )
-                {
-                        u = user_find( irc, irc->mynick );
-                        irc_privmsg( irc, u, "NOTICE", irc->nick, "", "\001VERSION BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\001" );
-                        return( 1 );
-                }
-                else if( g_strncasecmp( s + 1, "PING", 4 ) == 0 )
-                {
-                        u = user_find( irc, irc->mynick );
-                        irc_privmsg( irc, u, "NOTICE", irc->nick, "", s );
-                        return( 1 );
-                }
-                else if( g_strncasecmp( s + 1, "TYPING", 6 ) == 0 )
-                {
-                        if( u && u->ic && u->ic->acc->prpl->send_typing && strlen( s ) >= 10 )
-                        {
-                                time_t current_typing_notice = time( NULL );
-                                
-                                if( current_typing_notice - u->last_typing_notice >= 5 )
-                                {
-                                        u->ic->acc->prpl->send_typing( u->ic, u->handle, ( s[8] - '0' ) << 8 );
-                                        u->last_typing_notice = current_typing_notice;
-                                }
-                        }
-                        return( 1 );
-                }
-                else
-                {
-                        irc_usermsg( irc, "Non-ACTION CTCP's aren't supported" );
-                        return( 0 );
-                }
-        }
-        
-        if( u )
-        {
-                /* For the next message, we probably do have to send new notices... */
-                u->last_typing_notice = 0;
-                u->is_private = irc->is_private;
-                
-                if( u->is_private )
-                {
-                        if( !u->online )
-                                irc_reply( irc, 301, "%s :%s", u->nick, "User is offline" );
-                        else if( u->away )
-                                irc_reply( irc, 301, "%s :%s", u->nick, u->away );
-                }
-                
-                if( u->send_handler )
-                {
-                        u->send_handler( irc, u, s, flags );
-                        return 1;
-                }
-        }
-        else if( c && c->ic && c->ic->acc && c->ic->acc->prpl )
-        {
-                return( imc_chat_msg( c, s, 0 ) );
-        }
-        
-        return( 0 );
-}
-
-static gboolean buddy_send_handler_delayed( gpointer data, gint fd, b_input_condition cond )
-{
-        user_t *u = data;
-        
-        /* Shouldn't happen, but just to be sure. */
-        if( u->sendbuf_len < 2 )
-                return FALSE;
-        
-        u->sendbuf[u->sendbuf_len-2] = 0; /* Cut off the last newline */
-        imc_buddy_msg( u->ic, u->handle, u->sendbuf, u->sendbuf_flags );
-        
-        g_free( u->sendbuf );
-        u->sendbuf = NULL;
-        u->sendbuf_len = 0;
-        u->sendbuf_timer = 0;
-        u->sendbuf_flags = 0;
-        
-        return FALSE;
-}
-
-void buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags )
-{
-        if( !u || !u->ic ) return;
-        
-        if( set_getbool( &irc->set, "buddy_sendbuffer" ) && set_getint( &irc->set, "buddy_sendbuffer_delay" ) > 0 )
-        {
-                int delay;
-                
-                if( u->sendbuf_len > 0 && u->sendbuf_flags != flags)
-                {
-                        /* Flush the buffer */
-                        b_event_remove( u->sendbuf_timer );
-                        buddy_send_handler_delayed( u, -1, 0 );
-                }
-
-                if( u->sendbuf_len == 0 )
-                {
-                        u->sendbuf_len = strlen( msg ) + 2;
-                        u->sendbuf = g_new( char, u->sendbuf_len );
-                        u->sendbuf[0] = 0;
-                        u->sendbuf_flags = flags;
-                }
-                else
-                {
-                        u->sendbuf_len += strlen( msg ) + 1;
-                        u->sendbuf = g_renew( char, u->sendbuf, u->sendbuf_len );
-                }
-                
-                strcat( u->sendbuf, msg );
-                strcat( u->sendbuf, "\n" );
-                
-                delay = set_getint( &irc->set, "buddy_sendbuffer_delay" );
-                if( delay <= 5 )
-                        delay *= 1000;
-                
-                if( u->sendbuf_timer > 0 )
-                        b_event_remove( u->sendbuf_timer );
-                u->sendbuf_timer = b_timeout_add( delay, buddy_send_handler_delayed, u );
-        }
-        else
-        {
-                imc_buddy_msg( u->ic, u->handle, msg, flags );
-        }
-}
-
-int irc_privmsg( irc_t *irc, user_t *u, char *type, char *to, char *prefix, char *msg )
-{
-        char last = 0;
-        char *s = msg, *line = msg;
-        
-        /* The almighty linesplitter .. woohoo!! */
-        while( !last )
-        {
-                if( *s == '\r' && *(s+1) == '\n' )
-                        *(s++) = 0;
-                if( *s == '\n' )
-                {
-                        last = s[1] == 0;
-                        *s = 0;
-                }
-                else
-                {
-                        last = s[0] == 0;
-                }
-                if( *s == 0 )
-                {
-                        if( g_strncasecmp( line, "/me ", 4 ) == 0 && ( !prefix || !*prefix ) && g_strcasecmp( type, "PRIVMSG" ) == 0 )
-                        {
-                                irc_write( irc, ":%s!%s@%s %s %s :\001ACTION %s\001", u->nick, u->user, u->host,
-                                           type, to, line + 4 );
-                        }
-                        else
-                        {
-                                irc_write( irc, ":%s!%s@%s %s %s :%s%s", u->nick, u->user, u->host,
-                                           type, to, prefix ? prefix : "", line );
-                        }
-                        line = s + 1;
-                }
-                s ++;
-        }
-        
-        return( 1 );
-}
-
-int irc_msgfrom( irc_t *irc, char *nick, char *msg )
-{
-        user_t *u = user_find( irc, nick );
-        static char *prefix = NULL;
-        
-        if( !u ) return( 0 );
-        if( prefix && *prefix ) g_free( prefix );
-        
-        if( !u->is_private && nick_cmp( u->nick, irc->mynick ) != 0 )
-        {
-                int len = strlen( irc->nick) + 3;
-                prefix = g_new (char, len );
-                g_snprintf( prefix, len, "%s%s", irc->nick, set_getstr( &irc->set, "to_char" ) );
-                prefix[len-1] = 0;
-        }
-        else
-        {
-                prefix = "";
-        }
-        
-        return( irc_privmsg( irc, u, "PRIVMSG", u->is_private ? irc->nick : irc->channel, prefix, msg ) );
-}
-
-int irc_noticefrom( irc_t *irc, char *nick, char *msg )
-{
-        user_t *u = user_find( irc, nick );
-        
-        if( u )
-                return( irc_privmsg( irc, u, "NOTICE", irc->nick, "", msg ) );
-        else
-                return( 0 );
+                irc_write( irc, ":%s!%s@%s MODE %s :%s", irc->user->nick,
+                           irc->user->user, irc->user->host, irc->user->nick,
+                           changes );
 }
 
@@ -1334 +772 @@
 }
 
-struct groupchat *irc_chat_by_channel( irc_t *irc, char *channel )
-{
-        struct groupchat *c;
-        account_t *a;
-        
-        /* This finds the connection which has a conversation which belongs to this channel */
-        for( a = irc->accounts; a; a = a->next )
-        {
-                if( a->ic == NULL )
-                        continue;
-                
-                c = a->ic->groupchats;
-                while( c )
-                {
-                        if( c->channel && g_strcasecmp( c->channel, channel ) == 0 )
-                                return c;
-                        
-                        c = c->next;
-                }
-        }
-        
-        return NULL;
-}
+static char *set_eval_charset( set_t *set, char *value )
+{
+        irc_t *irc = (irc_t*) set->data;
+        char *test;
+        gsize test_bytes = 0;
+        GIConv ic, oc;
+
+        if( g_strcasecmp( value, "none" ) == 0 )
+                value = g_strdup( "utf-8" );
+
+        if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 )
+        {
+                return NULL;
+        }
+        
+        /* Do a test iconv to see if the user picked an IRC-compatible
+           charset (for example utf-16 goes *horribly* wrong). */
+        if( ( test = g_convert_with_iconv( " ", 1, oc, NULL, &test_bytes, NULL ) ) == NULL ||
+            test_bytes > 1 )
+        {
+                g_free( test );
+                g_iconv_close( oc );
+                irc_usermsg( irc, "Unsupported character set: The IRC protocol "
+                                  "only supports 8-bit character sets." );
+                return NULL;
+        }
+        g_free( test );
+        
+        if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 )
+        {
+                g_iconv_close( oc );
+                return NULL;
+        }
+        
+        if( irc->iconv != (GIConv) -1 )
+                g_iconv_close( irc->iconv );
+        if( irc->oconv != (GIConv) -1 )
+                g_iconv_close( irc->oconv );
+        
+        irc->iconv = ic;
+        irc->oconv = oc;
+
+        return value;
+}
+
+char *set_eval_away_devoice( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
+        
+        if( !is_bool( value ) )
+                return SET_INVALID;
+        
+        /* The usual problem: The setting isn't actually changed at this
+           point and we need it to be, so do it by hand. */
+        g_free( set->value );
+        set->value = g_strdup( value );
+        
+        bee_irc_channel_update( irc, NULL, NULL );
+        
+        return value;
+}

irc.h

@@ -5 +5 @@
   \********************************************************************/
 
-/* The big hairy IRCd part of the project                               */
+/* The IRC-based UI (for now the only one)                              */
 
 /*
@@ -33 +33 @@
 #define IRC_PING_STRING "PinglBee"
 
-#define UMODES "abisw"
-#define UMODES_PRIV "Ro"
-#define CMODES "nt"
-#define CMODE "t"
-#define UMODE "s"
-#define CTYPES "&#"
+#define UMODES "abisw"     /* Allowed umodes (although they mostly do nothing) */
+#define UMODES_PRIV "Ro"   /* Allowed, but not by user directly */
+#define UMODES_KEEP "R"    /* Don't allow unsetting using /MODE */
+#define CMODES "nt"        /* Allowed modes */
+#define CMODE "t"          /* Default mode */
+#define UMODE "s"          /* Default mode */
+
+#define CTYPES "&#"        /* Valid channel name prefixes */
 
 typedef enum
@@ -48 +50 @@
         USTATUS_SHUTDOWN = 8
 } irc_status_t;
+
+struct irc_user;
 
 typedef struct irc
@@ -59 +63 @@
         GIConv iconv, oconv;
 
-        int sentbytes;
-        time_t oldtime;
-
+        struct irc_user *root;
+        struct irc_user *user;
+        
+        char *last_root_cmd;
+
+        char *password; /* HACK: Used to save the user's password, but before
+                           logging in, this may contain a password we should
+                           send to identify after USER/NICK are received. */
+
+        char umode[8];
+        
+        struct query *queries;
+        GSList *file_transfers;
+        
+        GSList *users, *channels;
+        struct irc_channel *default_channel;
+        GHashTable *nick_user_hash;
+        GHashTable *watches;
+
+        gint r_watch_source_id;
+        gint w_watch_source_id;
+        gint ping_source_id;
+        
+        struct bee *b;
+} irc_t;
+
+typedef enum
+{
+        IRC_USER_PRIVATE = 1,
+        IRC_USER_AWAY = 2,
+} irc_user_flags_t;
+
+typedef struct irc_user
+{
+        irc_t *irc;
+        
         char *nick;
         char *user;
         char *host;
-        char *realname;
-        char *password; /* HACK: Used to save the user's password, but before
-                           logging in, this may contain a password we should
-                           send to identify after USER/NICK are received. */
-
-        char umode[8];
-        
-        char *myhost;
-        char *mynick;
-
-        char *channel;
-        int c_id;
-
-        char is_private;                /* Not too nice... */
-        char *last_target;
-        
-        struct query *queries;
-        struct account *accounts;
-        struct chat *chatrooms;
-        
-        struct __USER *users;
-        GHashTable *userhash;
-        GHashTable *watches;
-        struct __NICK *nicks;
+        char *fullname;
+        
+        /* Nickname in lowercase for case sensitive searches */
+        char *key;
+        
+        irc_user_flags_t flags;
+        
+        GString *pastebuf; /* Paste buffer (combine lines into a multiline msg). */
+        guint pastebuf_timer;
+        time_t away_reply_timeout; /* Only send a 301 if this time passed. */
+        
+        struct bee_user *bu;
+        
+        const struct irc_user_funcs *f;
+} irc_user_t;
+
+struct irc_user_funcs
+{
+        gboolean (*privmsg)( irc_user_t *iu, const char *msg );
+        gboolean (*ctcp)( irc_user_t *iu, char * const* ctcp );
+};
+
+extern const struct irc_user_funcs irc_user_root_funcs;
+extern const struct irc_user_funcs irc_user_self_funcs;
+
+typedef enum
+{
+        IRC_CHANNEL_JOINED = 1,
+        
+        /* Hack: Set this flag right before jumping into IM when we expect
+           a call to imcb_chat_new(). */
+        IRC_CHANNEL_CHAT_PICKME = 0x10000,
+} irc_channel_flags_t;
+
+typedef struct irc_channel
+{
+        irc_t *irc;
+        char *name;
+        char mode[8];
+        int flags;
+        
+        char *topic;
+        char *topic_who;
+        time_t topic_time;
+        
+        GSList *users; /* struct irc_channel_user */
         struct set *set;
-
-        gint r_watch_source_id;
-        gint w_watch_source_id;
-        gint ping_source_id;
-} irc_t;
-
-#include "user.h"
-
+        
+        GString *pastebuf; /* Paste buffer (combine lines into a multiline msg). */
+        guint pastebuf_timer;
+        
+        const struct irc_channel_funcs *f;
+        void *data;
+} irc_channel_t;
+
+struct irc_channel_funcs
+{
+        gboolean (*privmsg)( irc_channel_t *ic, const char *msg );
+        gboolean (*join)( irc_channel_t *ic );
+        gboolean (*part)( irc_channel_t *ic, const char *msg );
+        gboolean (*topic)( irc_channel_t *ic, const char *new );
+        gboolean (*invite)( irc_channel_t *ic, irc_user_t *iu );
+        
+        gboolean (*_init)( irc_channel_t *ic );
+        gboolean (*_free)( irc_channel_t *ic );
+};
+
+typedef enum
+{
+        IRC_CHANNEL_USER_OP = 1,
+        IRC_CHANNEL_USER_HALFOP = 2,
+        IRC_CHANNEL_USER_VOICE = 4,
+} irc_channel_user_flags_t;
+
+typedef struct irc_channel_user
+{
+        irc_user_t *iu;
+        int flags;
+} irc_channel_user_t;
+
+typedef enum
+{
+        IRC_CC_TYPE_DEFAULT,
+        IRC_CC_TYPE_REST,
+        IRC_CC_TYPE_GROUP,
+        IRC_CC_TYPE_ACCOUNT,
+} irc_control_channel_type_t;
+
+struct irc_control_channel
+{
+        irc_control_channel_type_t type;
+        struct bee_group *group;
+        struct account *account;
+};
+
+extern const struct bee_ui_funcs irc_ui_funcs;
+
+/* irc.c */
 extern GSList *irc_connection_list;
 
@@ -103 +205 @@
 void irc_abort( irc_t *irc, int immed, char *format, ... ) G_GNUC_PRINTF( 3, 4 );
 void irc_free( irc_t *irc );
-
-void irc_exec( irc_t *irc, char **cmd );
+void irc_setpass (irc_t *irc, const char *pass);
+
 void irc_process( irc_t *irc );
 char **irc_parse_line( char *line );
 char *irc_build_line( char **cmd );
 
-void irc_vawrite( irc_t *irc, char *format, va_list params );
 void irc_write( irc_t *irc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
 void irc_write_all( int now, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
-void irc_reply( irc_t *irc, int code, char *format, ... ) G_GNUC_PRINTF( 3, 4 );
-G_MODULE_EXPORT int irc_usermsg( irc_t *irc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
-char **irc_tokenize( char *buffer );
-
-void irc_login( irc_t *irc );
+void irc_vawrite( irc_t *irc, char *format, va_list params );
+
 int irc_check_login( irc_t *irc );
-void irc_motd( irc_t *irc );
-void irc_names( irc_t *irc, char *channel );
-void irc_topic( irc_t *irc, char *channel );
-void irc_umode_set( irc_t *irc, char *s, int allow_priv );
-void irc_who( irc_t *irc, char *channel );
-void irc_spawn( irc_t *irc, user_t *u );
-void irc_join( irc_t *irc, user_t *u, char *channel );
-void irc_part( irc_t *irc, user_t *u, char *channel );
-void irc_kick( irc_t *irc, user_t *u, char *channel, user_t *kicker );
-void irc_kill( irc_t *irc, user_t *u );
-void irc_invite( irc_t *irc, char *nick, char *channel );
-void irc_whois( irc_t *irc, char *nick );
-void irc_setpass( irc_t *irc, const char *pass ); /* USE WITH CAUTION! */
-
-int irc_send( irc_t *irc, char *nick, char *s, int flags );
-int irc_privmsg( irc_t *irc, user_t *u, char *type, char *to, char *prefix, char *msg );
-int irc_msgfrom( irc_t *irc, char *nick, char *msg );
-int irc_noticefrom( irc_t *irc, char *nick, char *msg );
-
-void buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags );
-struct groupchat *irc_chat_by_channel( irc_t *irc, char *channel );
+
+void irc_umode_set( irc_t *irc, const char *s, gboolean allow_priv );
+
+/* irc_channel.c */
+irc_channel_t *irc_channel_new( irc_t *irc, const char *name );
+irc_channel_t *irc_channel_by_name( irc_t *irc, const char *name );
+irc_channel_t *irc_channel_get( irc_t *irc, char *id );
+int irc_channel_free( irc_channel_t *ic );
+int irc_channel_add_user( irc_channel_t *ic, irc_user_t *iu );
+int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu, gboolean silent, const char *msg );
+irc_channel_user_t *irc_channel_has_user( irc_channel_t *ic, irc_user_t *iu );
+int irc_channel_set_topic( irc_channel_t *ic, const char *topic, const irc_user_t *who );
+void irc_channel_user_set_mode( irc_channel_t *ic, irc_user_t *iu, irc_channel_user_flags_t flags );
+void irc_channel_printf( irc_channel_t *ic, char *format, ... );
+gboolean irc_channel_name_ok( const char *name );
+int irc_channel_name_cmp( const char *a_, const char *b_ );
+void irc_channel_update_ops( irc_channel_t *ic, char *value );
+char *set_eval_irc_channel_ops( struct set *set, char *value );
+
+/* irc_commands.c */
+void irc_exec( irc_t *irc, char **cmd );
+
+/* irc_send.c */
+void irc_send_num( irc_t *irc, int code, char *format, ... ) G_GNUC_PRINTF( 3, 4 );
+void irc_send_login( irc_t *irc );
+void irc_send_motd( irc_t *irc );
+void irc_usermsg( irc_t *irc, char *format, ... );
+void irc_send_join( irc_channel_t *ic, irc_user_t *iu );
+void irc_send_part( irc_channel_t *ic, irc_user_t *iu, const char *reason );
+void irc_send_quit( irc_user_t *iu, const char *reason );
+void irc_send_names( irc_channel_t *ic );
+void irc_send_topic( irc_channel_t *ic, gboolean topic_change );
+void irc_send_whois( irc_user_t *iu );
+void irc_send_who( irc_t *irc, GSList *l, const char *channel );
+void irc_send_msg( irc_user_t *iu, const char *type, const char *dst, const char *msg, const char *prefix );
+void irc_send_msg_raw( irc_user_t *iu, const char *type, const char *dst, const char *msg );
+void irc_send_msg_f( irc_user_t *iu, const char *type, const char *dst, const char *format, ... ) G_GNUC_PRINTF( 4, 5 );
+void irc_send_nick( irc_user_t *iu, const char *new );
+void irc_send_channel_user_mode_diff( irc_channel_t *ic, irc_user_t *iu,
+                                      irc_channel_user_flags_t old, irc_channel_user_flags_t new );
+
+/* irc_user.c */
+irc_user_t *irc_user_new( irc_t *irc, const char *nick );
+int irc_user_free( irc_t *irc, irc_user_t *iu );
+irc_user_t *irc_user_by_name( irc_t *irc, const char *nick );
+int irc_user_set_nick( irc_user_t *iu, const char *new );
+gint irc_user_cmp( gconstpointer a_, gconstpointer b_ );
+const char *irc_user_get_away( irc_user_t *iu );
+
+/* irc_util.c */
+char *set_eval_timezone( struct set *set, char *value );
+char *irc_format_timestamp( irc_t *irc, time_t msg_ts );
+
+/* irc_im.c */
+void bee_irc_channel_update( irc_t *irc, irc_channel_t *ic, irc_user_t *iu );
 
 #endif

irc_commands.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2006 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -53 +53 @@
         else if( global.conf->auth_pass )
         {
-                irc_reply( irc, 464, ":Incorrect password" );
+                irc_send_num( irc, 464, ":Incorrect password" );
         }
         else
@@ -65 +65 @@
 static void irc_cmd_user( irc_t *irc, char **cmd )
 {
-        irc->user = g_strdup( cmd[1] );
-        irc->realname = g_strdup( cmd[4] );
+        irc->user->user = g_strdup( cmd[1] );
+        irc->user->fullname = g_strdup( cmd[4] );
         
         irc_check_login( irc );
@@ -73 +73 @@
 static void irc_cmd_nick( irc_t *irc, char **cmd )
 {
-        if( irc->status & USTATUS_IDENTIFIED && irc->nick )
-        {
-                irc_reply( irc, 438, "%s %s :You can only change your nick if you're not "
-                           "logged in (i.e. pre-identify)", irc->nick, cmd[1] );
-        }
-        /* This is not clean, but for now it'll have to be like this... */
-        else if( ( nick_cmp( cmd[1], irc->mynick ) == 0 ) || ( nick_cmp( cmd[1], NS_NICK ) == 0 ) || ( user_find( irc, cmd[1] ) != NULL ) )
-        {
-                irc_reply( irc, 433, "%s :This nick is already in use", cmd[1] );
+        if( irc_user_by_name( irc, cmd[1] ) )
+        {
+                irc_send_num( irc, 433, ":This nick is already in use" );
         }
         else if( !nick_ok( cmd[1] ) )
         {
                 /* [SH] Invalid characters. */
-                irc_reply( irc, 432, "%s :This nick contains invalid characters", cmd[1] );
-        }
-        else if(irc->nick) 
-        {
-                if( user_find( irc, irc->nick ) )
-                        user_rename(irc, irc->nick, cmd[1]);
-
-                irc_write( irc, ":%s!%s@%s NICK %s", irc->nick, irc->user, irc->host, cmd[1] );
-                g_free(irc->nick);
-                irc->nick = g_strdup( cmd[1] );
-        }
-        else
-        {
-                irc->nick = g_strdup( cmd[1] );
+                irc_send_num( irc, 432, ":This nick contains invalid characters" );
+        }
+        else if( irc->user->nick )
+        {
+                if( irc->status & USTATUS_IDENTIFIED )
+                {
+                        irc_setpass( irc, NULL );
+                        irc->status &= ~USTATUS_IDENTIFIED;
+                        irc_umode_set( irc, "-R", 1 );
+                        irc_usermsg( irc, "Changing nicks resets your identify status. "
+                                     "Re-identify or register a new account if you want "
+                                     "your configuration to be saved. See \x02help "
+                                     "nick_changes\x02." );
+                }
+                
+                irc_user_set_nick( irc->user, cmd[1] );
+        }
+        else
+        {
+                irc->user->nick = g_strdup( cmd[1] );
                 
                 irc_check_login( irc );
@@ -115 +115 @@
 static void irc_cmd_ping( irc_t *irc, char **cmd )
 {
-        irc_write( irc, ":%s PONG %s :%s", irc->myhost, irc->myhost, cmd[1]?cmd[1]:irc->myhost );
-}
+        irc_write( irc, ":%s PONG %s :%s", irc->root->host,
+                   irc->root->host, cmd[1]?cmd[1]:irc->root->host );
+}
+
+static void irc_cmd_pong( irc_t *irc, char **cmd )
+{
+        /* We could check the value we get back from the user, but in
+           fact we don't care, we're just happy s/he's still alive. */
+        irc->last_pong = gettime();
+        irc->pinging = 0;
+}
+
+static void irc_cmd_join( irc_t *irc, char **cmd )
+{
+        irc_channel_t *ic;
+        
+        if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL )
+                ic = irc_channel_new( irc, cmd[1] );
+        
+        if( ic == NULL )
+        {
+                irc_send_num( irc, 479, "%s :Invalid channel name", cmd[1] );
+                return;
+        }
+        
+        if( ic->flags & IRC_CHANNEL_JOINED )
+                return; /* Dude, you're already there...
+                           RFC doesn't have any reply for that though? */
+        
+        if( ic->f->join && !ic->f->join( ic ) )
+                /* The story is: FALSE either means the handler showed an error
+                   message, or is doing some work before the join should be
+                   confirmed. (In the latter case, the caller should take care
+                   of that confirmation.)
+                   TRUE means all's good, let the user join the channel right away. */
+                return;
+        
+        irc_channel_add_user( ic, irc->user );
+}
+
+static void irc_cmd_names( irc_t *irc, char **cmd )
+{
+        irc_channel_t *ic;
+        
+        if( cmd[1] && ( ic = irc_channel_by_name( irc, cmd[1] ) ) )
+                irc_send_names( ic );
+        /* With no args, we should show /names of all chans. Make the code
+           below work well if necessary.
+        else
+        {
+                GSList *l;
+                
+                for( l = irc->channels; l; l = l->next )
+                        irc_send_names( l->data );
+        }
+        */
+}
+
+static void irc_cmd_part( irc_t *irc, char **cmd )
+{
+        irc_channel_t *ic;
+        
+        if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL )
+        {
+                irc_send_num( irc, 403, "%s :No such channel", cmd[1] );
+        }
+        else if( irc_channel_del_user( ic, irc->user, FALSE, cmd[2] ) )
+        {
+                if( ic->f->part )
+                        ic->f->part( ic, NULL );
+        }
+        else
+        {
+                irc_send_num( irc, 442, "%s :You're not on that channel", cmd[1] );
+        }
+}
+
+static void irc_cmd_whois( irc_t *irc, char **cmd )
+{
+        char *nick = cmd[1];
+        irc_user_t *iu = irc_user_by_name( irc, nick );
+        
+        if( iu )
+                irc_send_whois( iu );
+        else
+                irc_send_num( irc, 401, "%s :Nick does not exist", nick );
+}
+
+static void irc_cmd_whowas( irc_t *irc, char **cmd )
+{
+        /* For some reason irssi tries a whowas when whois fails. We can
+           ignore this, but then the user never gets a "user not found"
+           message from irssi which is a bit annoying. So just respond
+           with not-found and irssi users will get better error messages */
+        
+        irc_send_num( irc, 406, "%s :Nick does not exist", cmd[1] );
+        irc_send_num( irc, 369, "%s :End of WHOWAS", cmd[1] );
+}
+
+static void irc_cmd_motd( irc_t *irc, char **cmd )
+{
+        irc_send_motd( irc );
+}
+
+static void irc_cmd_mode( irc_t *irc, char **cmd )
+{
+        if( irc_channel_name_ok( cmd[1] ) )
+        {
+                irc_channel_t *ic;
+                
+                if( ( ic = irc_channel_by_name( irc, cmd[1] ) ) == NULL )
+                        irc_send_num( irc, 403, "%s :No such channel", cmd[1] );
+                else if( cmd[2] )
+                {
+                        if( *cmd[2] == '+' || *cmd[2] == '-' )
+                                irc_send_num( irc, 477, "%s :Can't change channel modes", cmd[1] );
+                        else if( *cmd[2] == 'b' )
+                                irc_send_num( irc, 368, "%s :No bans possible", cmd[1] );
+                }
+                else
+                        irc_send_num( irc, 324, "%s +%s", cmd[1], ic->mode );
+        }
+        else
+        {
+                if( nick_cmp( cmd[1], irc->user->nick ) == 0 )
+                {
+                        if( cmd[2] )
+                                irc_umode_set( irc, cmd[2], 0 );
+                        else
+                                irc_send_num( irc, 221, "+%s", irc->umode );
+                }
+                else
+                        irc_send_num( irc, 502, ":Don't touch their modes" );
+        }
+}
+
+static void irc_cmd_who( irc_t *irc, char **cmd )
+{
+        char *channel = cmd[1];
+        irc_channel_t *ic;
+        
+        if( !channel || *channel == '0' || *channel == '*' || !*channel )
+                irc_send_who( irc, irc->users, "**" );
+        else if( ( ic = irc_channel_by_name( irc, channel ) ) )
+                irc_send_who( irc, ic->users, channel );
+        else
+                irc_send_num( irc, 403, "%s :No such channel", channel );
+}
+
+static void irc_cmd_privmsg( irc_t *irc, char **cmd )
+{
+        irc_channel_t *ic;
+        irc_user_t *iu;
+        
+        if( !cmd[2] ) 
+        {
+                irc_send_num( irc, 412, ":No text to send" );
+                return;
+        }
+        
+        /* Don't treat CTCP actions as real CTCPs, just convert them right now. */
+        if( g_strncasecmp( cmd[2], "\001ACTION", 7 ) == 0 )
+        {
+                cmd[2] += 4;
+                strcpy( cmd[2], "/me" );
+                if( cmd[2][strlen(cmd[2])-1] == '\001' )
+                        cmd[2][strlen(cmd[2])-1] = '\0';
+        }
+        
+        if( irc_channel_name_ok( cmd[1] ) &&
+            ( ic = irc_channel_by_name( irc, cmd[1] ) ) )
+        {
+                if( ic->f->privmsg )
+                        ic->f->privmsg( ic, cmd[2] );
+        }
+        else if( ( iu = irc_user_by_name( irc, cmd[1] ) ) )
+        {
+                if( cmd[2][0] == '\001' )
+                {
+                        char **ctcp;
+                        
+                        if( iu->f->ctcp == NULL )
+                                return;
+                        if( cmd[2][strlen(cmd[2])-1] == '\001' )
+                                cmd[2][strlen(cmd[2])-1] = '\0';
+                        
+                        ctcp = split_command_parts( cmd[2] + 1 );
+                        iu->f->ctcp( iu, ctcp );
+                }
+                else if( iu->f->privmsg )
+                {
+                        iu->flags |= IRC_USER_PRIVATE;
+                        iu->f->privmsg( iu, cmd[2] );
+                }
+        }
+        else
+        {
+                irc_send_num( irc, 401, "%s :No such nick/channel", cmd[1] );
+        }
+}
+
+static void irc_cmd_nickserv( irc_t *irc, char **cmd )
+{
+        /* [SH] This aliases the NickServ command to PRIVMSG root */
+        /* [TV] This aliases the NS command to PRIVMSG root as well */
+        root_command( irc, cmd + 1 );
+}
+
+
 
 static void irc_cmd_oper( irc_t *irc, char **cmd )
@@ -126 +333 @@
         {
                 irc_umode_set( irc, "+o", 1 );
-                irc_reply( irc, 381, ":Password accepted" );
-        }
-        else
-        {
-                irc_reply( irc, 432, ":Incorrect password" );
-        }
-}
-
-static void irc_cmd_mode( irc_t *irc, char **cmd )
-{
-        if( strchr( CTYPES, *cmd[1] ) )
-        {
-                if( cmd[2] )
-                {
-                        if( *cmd[2] == '+' || *cmd[2] == '-' )
-                                irc_reply( irc, 477, "%s :Can't change channel modes", cmd[1] );
-                        else if( *cmd[2] == 'b' )
-                                irc_reply( irc, 368, "%s :No bans possible", cmd[1] );
-                }
-                else
-                        irc_reply( irc, 324, "%s +%s", cmd[1], CMODE );
-        }
-        else
-        {
-                if( nick_cmp( cmd[1], irc->nick ) == 0 )
-                {
-                        if( cmd[2] )
-                                irc_umode_set( irc, cmd[2], 0 );
-                        else
-                                irc_reply( irc, 221, "+%s", irc->umode );
-                }
-                else
-                        irc_reply( irc, 502, ":Don't touch their modes" );
-        }
-}
-
-static void irc_cmd_names( irc_t *irc, char **cmd )
-{
-        irc_names( irc, cmd[1]?cmd[1]:irc->channel );
-}
-
-static void irc_cmd_part( irc_t *irc, char **cmd )
-{
-        struct groupchat *c;
-        
-        if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
-        {
-                user_t *u = user_find( irc, irc->nick );
-                
-                /* Not allowed to leave control channel */
-                irc_part( irc, u, irc->channel );
-                irc_join( irc, u, irc->channel );
-        }
-        else if( ( c = irc_chat_by_channel( irc, cmd[1] ) ) )
-        {
-                user_t *u = user_find( irc, irc->nick );
-                
-                irc_part( irc, u, c->channel );
-                
-                if( c->ic )
-                {
-                        c->joined = 0;
-                        c->ic->acc->prpl->chat_leave( c );
-                }
-        }
-        else
-        {
-                irc_reply( irc, 403, "%s :No such channel", cmd[1] );
-        }
-}
-
-static void irc_cmd_join( irc_t *irc, char **cmd )
-{
-        if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
-                ; /* Dude, you're already there...
-                     RFC doesn't have any reply for that though? */
-        else if( 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] );
+                irc_send_num( irc, 381, ":Password accepted" );
+        }
+        else
+        {
+                irc_send_num( irc, 432, ":Incorrect password" );
         }
 }
@@ -217 +343 @@
 static void irc_cmd_invite( irc_t *irc, char **cmd )
 {
-        char *nick = cmd[1], *channel = cmd[2];
-        struct groupchat *c = irc_chat_by_channel( irc, channel );
-        user_t *u = user_find( irc, nick );
-        
-        if( u && c && ( u->ic == c->ic ) )
-                if( c->ic && c->ic->acc->prpl->chat_invite )
-                {
-                        c->ic->acc->prpl->chat_invite( c, u->handle, NULL );
-                        irc_reply( irc, 341, "%s %s", nick, channel );
-                        return;
-                }
-        
-        irc_reply( irc, 482, "%s :Invite impossible; User/Channel non-existent or incompatible", channel );
-}
-
-static void irc_cmd_privmsg( irc_t *irc, char **cmd )
-{
-        if ( !cmd[2] ) 
-        {
-                irc_reply( irc, 412, ":No text to send" );
-        }
-        else if ( irc->nick && g_strcasecmp( cmd[1], irc->nick ) == 0 ) 
-        {
-                irc_write( irc, ":%s!%s@%s %s %s :%s", irc->nick, irc->user, irc->host, cmd[0], cmd[1], cmd[2] ); 
-        }
-        else 
-        {
-                if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
-                {
-                        unsigned int i;
-                        char *t = set_getstr( &irc->set, "default_target" );
-                        
-                        if( g_strcasecmp( t, "last" ) == 0 && irc->last_target )
-                                cmd[1] = irc->last_target;
-                        else if( g_strcasecmp( t, "root" ) == 0 )
-                                cmd[1] = irc->mynick;
-                        
-                        for( i = 0; i < strlen( cmd[2] ); i ++ )
-                        {
-                                if( cmd[2][i] == ' ' ) break;
-                                if( cmd[2][i] == ':' || cmd[2][i] == ',' )
-                                {
-                                        cmd[1] = cmd[2];
-                                        cmd[2] += i;
-                                        *cmd[2] = 0;
-                                        while( *(++cmd[2]) == ' ' );
-                                        break;
-                                }
-                        }
-                        
-                        irc->is_private = 0;
-                        
-                        if( cmd[1] != irc->last_target )
-                        {
-                                g_free( irc->last_target );
-                                irc->last_target = g_strdup( cmd[1] );
-                        }
-                }
-                else
-                {
-                        irc->is_private = 1;
-                }
-                irc_send( irc, cmd[1], cmd[2], ( g_strcasecmp( cmd[0], "NOTICE" ) == 0 ) ? OPT_AWAY : 0 );
-        }
-}
-
-static void irc_cmd_who( irc_t *irc, char **cmd )
-{
-        char *channel = cmd[1];
-        user_t *u = irc->users;
-        struct groupchat *c;
-        GList *l;
-        
-        if( !channel || *channel == '0' || *channel == '*' || !*channel )
-                while( u )
-                {
-                        irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", u->online ? irc->channel : "*", u->user, u->host, irc->myhost, u->nick, u->online ? ( u->away ? 'G' : 'H' ) : 'G', u->realname );
-                        u = u->next;
-                }
-        else if( g_strcasecmp( channel, irc->channel ) == 0 )
-                while( u )
-                {
-                        if( u->online )
-                                irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->away ? 'G' : 'H', u->realname );
-                        u = u->next;
-                }
-        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
-                for( l = c->in_room; l; l = l->next )
-                {
-                        if( ( u = user_findhandle( c->ic, l->data ) ) )
-                                irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->away ? 'G' : 'H', u->realname );
-                }
-        else if( ( u = user_find( irc, channel ) ) )
-                irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->online ? ( u->away ? 'G' : 'H' ) : 'G', u->realname );
-        
-        irc_reply( irc, 315, "%s :End of /WHO list", channel?channel:"**" );
+        irc_channel_t *ic;
+        irc_user_t *iu;
+        
+        if( ( iu = irc_user_by_name( irc, cmd[1] ) ) == NULL )
+        {
+                irc_send_num( irc, 401, "%s :No such nick", cmd[1] );
+                return;
+        }
+        else if( ( ic = irc_channel_by_name( irc, cmd[2] ) ) == NULL )
+        {
+                irc_send_num( irc, 403, "%s :No such channel", cmd[2] );
+                return;
+        }
+        
+        if( !ic->f->invite )
+                irc_send_num( irc, 482, "%s :Can't invite people here", cmd[2] );
+        else if( ic->f->invite( ic, iu ) )
+                irc_send_num( irc, 341, "%s %s", iu->nick, ic->name );
 }
 
 static void irc_cmd_userhost( irc_t *irc, char **cmd )
 {
-        user_t *u;
         int i;
         
@@ -327 +374 @@
         
         for( i = 1; cmd[i]; i ++ )
-                if( ( u = user_find( irc, cmd[i] ) ) )
-                {
-                        if( u->online && u->away )
-                                irc_reply( irc, 302, ":%s=-%s@%s", u->nick, u->user, u->host );
-                        else
-                                irc_reply( irc, 302, ":%s=+%s@%s", u->nick, u->user, u->host );
-                }
+        {
+                irc_user_t *iu = irc_user_by_name( irc, cmd[i] );
+                
+                if( iu )
+                        irc_send_num( irc, 302, ":%s=%c%s@%s", iu->nick,
+                                      irc_user_get_away( iu ) ? '-' : '+',
+                                      iu->user, iu->host );
+        }
 }
 
 static void irc_cmd_ison( irc_t *irc, char **cmd )
 {
-        user_t *u;
         char buff[IRC_MAX_LINE];
         int lenleft, i;
@@ -354 +401 @@
                 while( *this )
                 {
+                        irc_user_t *iu;
+                        
                         if( ( next = strchr( this, ' ' ) ) )
                                 *next = 0;
                         
-                        if( ( u = user_find( irc, this ) ) && u->online )
-                        {
-                                lenleft -= strlen( u->nick ) + 1;
+                        if( ( iu = irc_user_by_name( irc, this ) ) &&
+                            iu->bu && iu->bu->flags & BEE_USER_ONLINE )
+                        {
+                                lenleft -= strlen( iu->nick ) + 1;
                                 
                                 if( lenleft < 0 )
                                         break;
                                 
-                                strcat( buff, u->nick );
+                                strcat( buff, iu->nick );
                                 strcat( buff, " " );
                         }
@@ -387 +437 @@
                 buff[strlen(buff)-1] = '\0';
         
-        irc_reply( irc, 303, ":%s", buff );
+        irc_send_num( irc, 303, ":%s", buff );
 }
 
@@ -400 +450 @@
         {
                 char *nick;
-                user_t *u;
+                irc_user_t *iu;
                 
                 if( !cmd[i][0] || !cmd[i][1] )
@@ -408 +458 @@
                 nick_lc( nick );
                 
-                u = user_find( irc, nick );
+                iu = irc_user_by_name( irc, nick );
                 
                 if( cmd[i][0] == '+' )
@@ -415 +465 @@
                                 g_hash_table_insert( irc->watches, nick, nick );
                         
-                        if( u && u->online )
-                                irc_reply( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "is online" );
+                        if( iu && iu->bu && iu->bu->flags & BEE_USER_ONLINE )
+                                irc_send_num( irc, 604, "%s %s %s %d :%s", iu->nick, iu->user,
+                                              iu->host, (int) time( NULL ), "is online" );
                         else
-                                irc_reply( irc, 605, "%s %s %s %d :%s", nick, "*", "*", (int) time( NULL ), "is offline" );
+                                irc_send_num( irc, 605, "%s %s %s %d :%s", nick, "*", "*",
+                                              (int) time( NULL ), "is offline" );
                 }
                 else if( cmd[i][0] == '-' )
@@ -429 +481 @@
                                 g_free( okey );
                                 
-                                irc_reply( irc, 602, "%s %s %s %d :%s", nick, "*", "*", 0, "Stopped watching" );
+                                irc_send_num( irc, 602, "%s %s %s %d :%s", nick, "*", "*", 0, "Stopped watching" );
                         }
                 }
@@ -437 +489 @@
 static void irc_cmd_topic( irc_t *irc, char **cmd )
 {
-        char *channel = cmd[1];
-        char *topic = cmd[2];
-        
-        if( topic )
-        {
-                /* Send the topic */
-                struct groupchat *c = irc_chat_by_channel( irc, channel );
-                if( c && c->ic && c->ic->acc->prpl->chat_topic )
-                        c->ic->acc->prpl->chat_topic( c, topic );
-        }
-        else
-        {
-                /* Get the topic */
-                irc_topic( irc, channel );
+        irc_channel_t *ic = irc_channel_by_name( irc, cmd[1] );
+        const char *new = cmd[2];
+        
+        if( ic == NULL )
+        {
+                irc_send_num( irc, 403, "%s :No such channel", cmd[1] );
+        }
+        else if( new )
+        {
+                if( ic->f->topic == NULL )
+                        irc_send_num( irc, 482, "%s :Can't change this channel's topic", ic->name );
+                else if( ic->f->topic( ic, new ) )
+                        irc_send_topic( ic, TRUE );
+        }
+        else
+        {
+                irc_send_topic( ic, FALSE );
         }
 }
@@ -456 +511 @@
 static void irc_cmd_away( irc_t *irc, char **cmd )
 {
-        user_t *u = user_find( irc, irc->nick );
-        char *away = cmd[1];
-        
-        if( !u ) return;
-        
-        if( away && *away )
-        {
+        if( cmd[1] && *cmd[1] )
+        {
+                char away[strlen(cmd[1])+1];
                 int i, j;
                 
                 /* Copy away string, but skip control chars. Mainly because
                    Jabber really doesn't like them. */
-                u->away = g_malloc( strlen( away ) + 1 );
-                for( i = j = 0; away[i]; i ++ )
-                        if( ( u->away[j] = away[i] ) >= ' ' )
+                for( i = j = 0; cmd[1][i]; i ++ )
+                        if( ( away[j] = cmd[1][i] ) >= ' ' )
                                 j ++;
-                u->away[j] = 0;
-                
-                irc_reply( irc, 306, ":You're now away: %s", u->away );
-                /* irc_umode_set( irc, irc->myhost, "+a" ); */
-        }
-        else
-        {
-                if( u->away ) g_free( u->away );
-                u->away = NULL;
-                /* irc_umode_set( irc, irc->myhost, "-a" ); */
-                irc_reply( irc, 305, ":Welcome back" );
-        }
-        
-        set_setstr( &irc->set, "away", u->away );
-}
-
-static void irc_cmd_whois( irc_t *irc, char **cmd )
-{
-        char *nick = cmd[1];
-        user_t *u = user_find( irc, nick );
-        
-        if( u )
-        {
-                irc_reply( irc, 311, "%s %s %s * :%s", u->nick, u->user, u->host, u->realname );
-                
-                if( u->ic )
-                        irc_reply( irc, 312, "%s %s.%s :%s network", u->nick, u->ic->acc->user,
-                                   u->ic->acc->server && *u->ic->acc->server ? u->ic->acc->server : "",
-                                   u->ic->acc->prpl->name );
-                else
-                        irc_reply( irc, 312, "%s %s :%s", u->nick, irc->myhost, IRCD_INFO );
-                
-                if( !u->online )
-                        irc_reply( irc, 301, "%s :%s", u->nick, "User is offline" );
-                else if( u->away )
-                        irc_reply( irc, 301, "%s :%s", u->nick, u->away );
-                if( u->status_msg )
-                        irc_reply( irc, 320, "%s :%s", u->nick, u->status_msg );
-                
-                irc_reply( irc, 318, "%s :End of /WHOIS list", nick );
-        }
-        else
-        {
-                irc_reply( irc, 401, "%s :Nick does not exist", nick );
-        }
-}
-
-static void irc_cmd_whowas( irc_t *irc, char **cmd )
-{
-        /* For some reason irssi tries a whowas when whois fails. We can
-           ignore this, but then the user never gets a "user not found"
-           message from irssi which is a bit annoying. So just respond
-           with not-found and irssi users will get better error messages */
-        
-        irc_reply( irc, 406, "%s :Nick does not exist", cmd[1] );
-        irc_reply( irc, 369, "%s :End of WHOWAS", cmd[1] );
-}
-
-static void irc_cmd_nickserv( irc_t *irc, char **cmd )
-{
-        /* [SH] This aliases the NickServ command to PRIVMSG root */
-        /* [TV] This aliases the NS command to PRIVMSG root as well */
-        root_command( irc, cmd + 1 );
-}
-
-static void irc_cmd_motd( irc_t *irc, char **cmd )
-{
-        irc_motd( irc );
-}
-
-static void irc_cmd_pong( irc_t *irc, char **cmd )
-{
-        /* We could check the value we get back from the user, but in
-           fact we don't care, we're just happy he's still alive. */
-        irc->last_pong = gettime();
-        irc->pinging = 0;
+                away[j] = '\0';
+                
+                irc_send_num( irc, 306, ":You're now away: %s", away );
+                set_setstr( &irc->b->set, "away", away );
+        }
+        else
+        {
+                irc_send_num( irc, 305, ":Welcome back" );
+                set_setstr( &irc->b->set, "away", NULL );
+        }
 }
 
 static void irc_cmd_version( irc_t *irc, char **cmd )
 {
-        irc_reply( irc, 351, "bitlbee-%s. %s :%s/%s ", BITLBEE_VERSION, irc->myhost, ARCH, CPU );
+        irc_send_num( irc, 351, "bitlbee-%s. %s :%s/%s ",
+                      BITLBEE_VERSION, irc->root->host, ARCH, CPU );
 }
 
 static void irc_cmd_completions( irc_t *irc, char **cmd )
 {
-        user_t *u = user_find( irc, irc->mynick );
         help_t *h;
         set_t *s;
         int i;
         
-        irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS ", "OK" );
+        irc_send_msg_raw( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS OK" );
         
         for( i = 0; commands[i].command; i ++ )
-                irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS ", commands[i].command );
+                irc_send_msg_f( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS %s", commands[i].command );
         
         for( h = global.help; h; h = h->next )
-                irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS help ", h->title );
-        
-        for( s = irc->set; s; s = s->next )
-                irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS set ", s->key );
-        
-        irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS ", "END" );
+                irc_send_msg_f( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS help %s", h->title );
+        
+        for( s = irc->b->set; s; s = s->next )
+                irc_send_msg_f( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS set %s", s->key );
+        
+        irc_send_msg_raw( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS END" );
 }
 
@@ -582 +566 @@
                 ipc_to_master( cmd );
         
-        irc_reply( irc, 382, "%s :Rehashing", global.conf_file );
+        irc_send_num( irc, 382, "%s :Rehashing", global.conf_file );
 }
 
@@ -591 +575 @@
         { "quit",        0, irc_cmd_quit,        0 },
         { "ping",        0, irc_cmd_ping,        0 },
-        { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
+        { "pong",        0, irc_cmd_pong,        IRC_CMD_LOGGED_IN },
+        { "join",        1, irc_cmd_join,        IRC_CMD_LOGGED_IN },
+        { "names",       1, irc_cmd_names,       IRC_CMD_LOGGED_IN },
+        { "part",        1, irc_cmd_part,        IRC_CMD_LOGGED_IN },
+        { "whois",       1, irc_cmd_whois,       IRC_CMD_LOGGED_IN },
+        { "whowas",      1, irc_cmd_whowas,      IRC_CMD_LOGGED_IN },
+        { "motd",        0, irc_cmd_motd,        IRC_CMD_LOGGED_IN },
         { "mode",        1, irc_cmd_mode,        IRC_CMD_LOGGED_IN },
-        { "names",       0, irc_cmd_names,       IRC_CMD_LOGGED_IN },
-        { "part",        1, irc_cmd_part,        IRC_CMD_LOGGED_IN },
-        { "join",        1, irc_cmd_join,        IRC_CMD_LOGGED_IN },
-        { "invite",      2, irc_cmd_invite,      IRC_CMD_LOGGED_IN },
+        { "who",         0, irc_cmd_who,         IRC_CMD_LOGGED_IN },
         { "privmsg",     1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
-        { "notice",      1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
-        { "who",         0, irc_cmd_who,         IRC_CMD_LOGGED_IN },
+        { "nickserv",    1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
+        { "ns",          1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
+        { "away",        0, irc_cmd_away,        IRC_CMD_LOGGED_IN },
+        { "version",     0, irc_cmd_version,     IRC_CMD_LOGGED_IN },
+        { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
         { "userhost",    1, irc_cmd_userhost,    IRC_CMD_LOGGED_IN },
         { "ison",        1, irc_cmd_ison,        IRC_CMD_LOGGED_IN },
         { "watch",       1, irc_cmd_watch,       IRC_CMD_LOGGED_IN },
+        { "invite",      2, irc_cmd_invite,      IRC_CMD_LOGGED_IN },
+#if 0
+        { "notice",      1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
+#endif
         { "topic",       1, irc_cmd_topic,       IRC_CMD_LOGGED_IN },
-        { "away",        0, irc_cmd_away,        IRC_CMD_LOGGED_IN },
-        { "whois",       1, irc_cmd_whois,       IRC_CMD_LOGGED_IN },
-        { "whowas",      1, irc_cmd_whowas,      IRC_CMD_LOGGED_IN },
-        { "nickserv",    1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
-        { "ns",          1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
-        { "motd",        0, irc_cmd_motd,        IRC_CMD_LOGGED_IN },
-        { "pong",        0, irc_cmd_pong,        IRC_CMD_LOGGED_IN },
-        { "version",     0, irc_cmd_version,     IRC_CMD_LOGGED_IN },
-        { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
+        { "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
         { "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "deaf",        0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
@@ -638 +624 @@
                         if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status & USTATUS_LOGGED_IN )
                         {
-                                irc_reply( irc, 462, ":Only allowed before logging in" );
+                                irc_send_num( irc, 462, ":Only allowed before logging in" );
                         }
                         else if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && !( irc->status & USTATUS_LOGGED_IN ) )
                         {
-                                irc_reply( irc, 451, ":Register first" );
+                                irc_send_num( irc, 451, ":Register first" );
                         }
                         else if( irc_commands[i].flags & IRC_CMD_OPER_ONLY && !strchr( irc->umode, 'o' ) )
                         {
-                                irc_reply( irc, 481, ":Permission denied - You're not an IRC operator" );
+                                irc_send_num( irc, 481, ":Permission denied - You're not an IRC operator" );
                         }
                         else if( n_arg < irc_commands[i].required_parameters )
                         {
-                                irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
+                                irc_send_num( irc, 461, "%s :Need more parameters", cmd[0] );
                         }
                         else if( irc_commands[i].flags & IRC_CMD_TO_MASTER )
@@ -667 +653 @@
         
         if( irc->status >= USTATUS_LOGGED_IN )
-                irc_reply( irc, 421, "%s :Unknown command", cmd[0] );
-}
+                irc_send_num( irc, 421, "%s :Unknown command", cmd[0] );
+}

lib/Makefile

@@ -8 +8 @@
 
 -include ../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)lib/
+endif
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
 
 CFLAGS += -Wall
@@ -37 +40 @@
 $(objects): ../Makefile.settings Makefile
 
-$(objects): %.o: %.c
+$(objects): %.o: $(SRCDIR)%.c
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@

lib/events.h

@@ -48 +48 @@
    the given callback function. */
 typedef enum {
-        GAIM_INPUT_READ = 1 << 1,
-        GAIM_INPUT_WRITE = 1 << 2
+        B_EV_IO_READ = 1 << 0,
+        B_EV_IO_WRITE = 1 << 1,
+        B_EV_FLAG_FORCE_ONCE = 1 << 16,
+        B_EV_FLAG_FORCE_REPEAT = 1 << 17,
 } b_input_condition;
 typedef gboolean (*b_event_handler)(gpointer data, gint fd, b_input_condition cond);

lib/events_glib.c

@@ -49 +49 @@
         b_event_handler function;
         gpointer data;
+        guint flags;
 } GaimIOClosure;
 
@@ -76 +77 @@
 
         if (condition & GAIM_READ_COND)
-                gaim_cond |= GAIM_INPUT_READ;
+                gaim_cond |= B_EV_IO_READ;
         if (condition & GAIM_WRITE_COND)
-                gaim_cond |= GAIM_INPUT_WRITE;
+                gaim_cond |= B_EV_IO_WRITE;
         
         event_debug( "gaim_io_invoke( %d, %d, 0x%x )\n", g_io_channel_unix_get_fd(source), condition, data );
@@ -87 +88 @@
                 event_debug( "Returned FALSE, cancelling.\n" );
         
-        return st;
+        if (closure->flags & B_EV_FLAG_FORCE_ONCE)
+                return FALSE;
+        else if (closure->flags & B_EV_FLAG_FORCE_REPEAT)
+                return TRUE;
+        else
+                return st;
 }
 
@@ -105 +111 @@
         closure->function = function;
         closure->data = data;
+        closure->flags = condition;
         
-        if (condition & GAIM_INPUT_READ)
+        if (condition & B_EV_IO_READ)
                 cond |= GAIM_READ_COND;
-        if (condition & GAIM_INPUT_WRITE)
+        if (condition & B_EV_IO_WRITE)
                 cond |= GAIM_WRITE_COND;
         

lib/events_libevent.c

@@ -60 +60 @@
         b_event_handler function;
         void *data;
+        guint flags;
 };
 
@@ -126 +127 @@
         {
                 if( event & EV_READ )
-                        cond |= GAIM_INPUT_READ;
+                        cond |= B_EV_IO_READ;
                 if( event & EV_WRITE )
-                        cond |= GAIM_INPUT_WRITE;
+                        cond |= B_EV_IO_WRITE;
         }
         
@@ -150 +151 @@
                 return;
         }
-        else if( !st )
+        else if( !st && !( b_ev->flags & B_EV_FLAG_FORCE_REPEAT ) )
         {
                 event_debug( "Handler returned FALSE: " );
@@ -174 +175 @@
         event_debug( "b_input_add( %d, %d, 0x%x, 0x%x ) ", fd, condition, function, data );
         
-        if( ( condition & GAIM_INPUT_READ  && ( b_ev = g_hash_table_lookup( read_hash,  &fd ) ) ) ||
-            ( condition & GAIM_INPUT_WRITE && ( b_ev = g_hash_table_lookup( write_hash, &fd ) ) ) )
+        if( ( condition & B_EV_IO_READ  && ( b_ev = g_hash_table_lookup( read_hash,  &fd ) ) ) ||
+            ( condition & B_EV_IO_WRITE && ( b_ev = g_hash_table_lookup( write_hash, &fd ) ) ) )
         {
                 /* We'll stick with this libevent entry, but give it a new BitlBee id. */
@@ -198 +199 @@
                 
                 out_cond = EV_PERSIST;
-                if( condition & GAIM_INPUT_READ )
+                if( condition & B_EV_IO_READ )
                         out_cond |= EV_READ;
-                if( condition & GAIM_INPUT_WRITE )
+                if( condition & B_EV_IO_WRITE )
                         out_cond |= EV_WRITE;
                 
@@ -212 +213 @@
         }
         
+        b_ev->flags = condition;
         g_hash_table_insert( id_hash, &b_ev->id, b_ev );
         return b_ev->id;

lib/http_client.c

@@ -149 +149 @@
         if( req->bytes_written < req->request_length )
                 req->inpa = b_input_add( source,
-                                         req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_WRITE,
+                                         req->ssl ? ssl_getdirection( req->ssl ) : B_EV_IO_WRITE,
                                          http_connected, req );
         else
-                req->inpa = b_input_add( source, GAIM_INPUT_READ, http_incoming_data, req );
+                req->inpa = b_input_add( source, B_EV_IO_READ, http_incoming_data, req );
         
         return FALSE;
@@ -234 +234 @@
         /* There will be more! */
         req->inpa = b_input_add( req->fd,
-                                 req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_READ,
+                                 req->ssl ? ssl_getdirection( req->ssl ) : B_EV_IO_READ,
                                  http_incoming_data, req );
         

lib/misc.c

@@ -647 +647 @@
         return ret;
 }
+
+char **split_command_parts( char *command )
+{
+        static char *cmd[IRC_MAX_ARGS+1];
+        char *s, q = 0;
+        int k;
+        
+        memset( cmd, 0, sizeof( cmd ) );
+        cmd[0] = command;
+        k = 1;
+        for( s = command; *s && k < IRC_MAX_ARGS; s ++ )
+                if( *s == ' ' && !q )
+                {
+                        *s = 0;
+                        while( *++s == ' ' );
+                        if( *s == '"' || *s == '\'' )
+                        {
+                                q = *s;
+                                s ++;
+                        }
+                        if( *s )
+                        {
+                                cmd[k++] = s;
+                                s --;
+                        }
+                        else
+                        {
+                                break;
+                        }
+                }
+                else if( *s == '\\' && ( ( !q && s[1] ) || ( q && q == s[1] ) ) )
+                {
+                        char *cpy;
+                        
+                        for( cpy = s; *cpy; cpy ++ )
+                                cpy[0] = cpy[1];
+                }
+                else if( *s == q )
+                {
+                        q = *s = 0;
+                }
+        
+        /* Full zero-padding for easier argc checking. */
+        while( k <= IRC_MAX_ARGS )
+                cmd[k++] = NULL;
+        
+        return cmd;
+}

lib/misc.h

@@ -69 +69 @@
 G_MODULE_EXPORT int md5_verify_password( char *password, char *hash );
 
+G_MODULE_EXPORT char **split_command_parts( char *command );
+
 #endif

lib/proxy.c

@@ -91 +91 @@
                 b_event_remove(phb->inpa);
                 if( phb->proxy_func )
-                        phb->proxy_func(phb->proxy_data, -1, GAIM_INPUT_READ);
+                        phb->proxy_func(phb->proxy_data, -1, B_EV_IO_READ);
                 else {
-                        phb->func(phb->data, -1, GAIM_INPUT_READ);
+                        phb->func(phb->data, -1, B_EV_IO_READ);
                         g_free(phb);
                 }
@@ -102 +102 @@
         b_event_remove(phb->inpa);
         if( phb->proxy_func )
-                phb->proxy_func(phb->proxy_data, source, GAIM_INPUT_READ);
+                phb->proxy_func(phb->proxy_data, source, B_EV_IO_READ);
         else {
-                phb->func(phb->data, source, GAIM_INPUT_READ);
+                phb->func(phb->data, source, B_EV_IO_READ);
                 g_free(phb);
         }
@@ -147 +147 @@
                 return -1;
         } else {
-                phb->inpa = b_input_add(fd, GAIM_INPUT_WRITE, gaim_io_connected, phb);
+                phb->inpa = b_input_add(fd, B_EV_IO_WRITE, gaim_io_connected, phb);
                 phb->fd = fd;
                 
@@ -179 +179 @@
         if ((memcmp(HTTP_GOODSTRING, inputline, strlen(HTTP_GOODSTRING)) == 0) ||
             (memcmp(HTTP_GOODSTRING2, inputline, strlen(HTTP_GOODSTRING2)) == 0)) {
-                phb->func(phb->data, source, GAIM_INPUT_READ);
+                phb->func(phb->data, source, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -186 +186 @@
 
         close(source);
-        phb->func(phb->data, -1, GAIM_INPUT_READ);
+        phb->func(phb->data, -1, B_EV_IO_READ);
         g_free(phb->host);
         g_free(phb);
@@ -204 +204 @@
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -215 +215 @@
         if (send(source, cmd, strlen(cmd), 0) < 0) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -230 +230 @@
                 if (send(source, cmd, strlen(cmd), 0) < 0) {
                         close(source);
-                        phb->func(phb->data, -1, GAIM_INPUT_READ);
+                        phb->func(phb->data, -1, B_EV_IO_READ);
                         g_free(phb->host);
                         g_free(phb);
@@ -240 +240 @@
         if (send(source, cmd, strlen(cmd), 0) < 0) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
-        }
-
-        phb->inpa = b_input_add(source, GAIM_INPUT_READ, http_canread, phb);
+                phb->func(phb->data, -1, B_EV_IO_READ);
+                g_free(phb->host);
+                g_free(phb);
+                return FALSE;
+        }
+
+        phb->inpa = b_input_add(source, B_EV_IO_READ, http_canread, phb);
         
         return FALSE;
@@ -273 +273 @@
         memset(packet, 0, sizeof(packet));
         if (read(source, packet, 9) >= 4 && packet[1] == 90) {
-                phb->func(phb->data, source, GAIM_INPUT_READ);
+                phb->func(phb->data, source, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -280 +280 @@
 
         close(source);
-        phb->func(phb->data, -1, GAIM_INPUT_READ);
+        phb->func(phb->data, -1, B_EV_IO_READ);
         g_free(phb->host);
         g_free(phb);
@@ -299 +299 @@
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -309 +309 @@
         if (!(hp = gethostbyname(phb->host))) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -326 +326 @@
         if (write(source, packet, 9) != 9) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
-        }
-
-        phb->inpa = b_input_add(source, GAIM_INPUT_READ, s4_canread, phb);
+                phb->func(phb->data, -1, B_EV_IO_READ);
+                g_free(phb->host);
+                g_free(phb);
+                return FALSE;
+        }
+
+        phb->inpa = b_input_add(source, B_EV_IO_READ, s4_canread, phb);
         
         return FALSE;
@@ -359 +359 @@
         if (read(source, buf, 10) < 10) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -366 +366 @@
         if ((buf[0] != 0x05) || (buf[1] != 0x00)) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
-        }
-
-        phb->func(phb->data, source, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
+                g_free(phb->host);
+                g_free(phb);
+                return FALSE;
+        }
+
+        phb->func(phb->data, source, B_EV_IO_READ);
         g_free(phb->host);
         g_free(phb);
@@ -396 +396 @@
         if (write(source, buf, (5 + strlen(phb->host) + 2)) < (5 + strlen(phb->host) + 2)) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -402 +402 @@
         }
 
-        phb->inpa = b_input_add(source, GAIM_INPUT_READ, s5_canread_again, phb);
+        phb->inpa = b_input_add(source, B_EV_IO_READ, s5_canread_again, phb);
 }
 
@@ -414 +414 @@
         if (read(source, buf, 2) < 2) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -422 +422 @@
         if ((buf[0] != 0x01) || (buf[1] != 0x00)) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -442 +442 @@
         if (read(source, buf, 2) < 2) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -450 +450 @@
         if ((buf[0] != 0x05) || (buf[1] == 0xff)) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -465 +465 @@
                 if (write(source, buf, 3 + i + j) < 3 + i + j) {
                         close(source);
-                        phb->func(phb->data, -1, GAIM_INPUT_READ);
+                        phb->func(phb->data, -1, B_EV_IO_READ);
                         g_free(phb->host);
                         g_free(phb);
@@ -471 +471 @@
                 }
 
-                phb->inpa = b_input_add(source, GAIM_INPUT_READ, s5_readauth, phb);
+                phb->inpa = b_input_add(source, B_EV_IO_READ, s5_readauth, phb);
         } else {
                 s5_sendconnect(phb, source);
@@ -491 +491 @@
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
+                phb->func(phb->data, -1, B_EV_IO_READ);
                 g_free(phb->host);
                 g_free(phb);
@@ -513 +513 @@
         if (write(source, buf, i) < i) {
                 close(source);
-                phb->func(phb->data, -1, GAIM_INPUT_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
-        }
-
-        phb->inpa = b_input_add(source, GAIM_INPUT_READ, s5_canread, phb);
+                phb->func(phb->data, -1, B_EV_IO_READ);
+                g_free(phb->host);
+                g_free(phb);
+                return FALSE;
+        }
+
+        phb->inpa = b_input_add(source, B_EV_IO_READ, s5_canread, phb);
         
         return FALSE;

lib/ssl_bogus.c

@@ -59 +59 @@
 b_input_condition ssl_getdirection( void *conn )
 {
-        return GAIM_INPUT_READ;
+        return B_EV_IO_READ;
 }
 

lib/ssl_client.h

@@ -71 +71 @@
 G_MODULE_EXPORT int ssl_getfd( void *conn );
 
-/* This function returns GAIM_INPUT_READ/WRITE. With SSL connections it's
+/* This function returns B_EV_IO_READ/WRITE. With SSL connections it's
    possible that something has to be read while actually were trying to
    write something (think about key exchange/refresh/etc). So when an

lib/ssl_gnutls.c

@@ -106 +106 @@
         struct scd *conn = data;
         
-        return ssl_connected( conn, conn->fd, GAIM_INPUT_WRITE );
+        return ssl_connected( conn, conn->fd, B_EV_IO_WRITE );
 }
 
@@ -244 +244 @@
 {
         return( gnutls_record_get_direction( ((struct scd*)conn)->session ) ?
-                GAIM_INPUT_WRITE : GAIM_INPUT_READ );
-}
+                B_EV_IO_WRITE : B_EV_IO_READ );
+}

lib/ssl_nss.c

@@ -193 +193 @@
 {
         /* Just in case someone calls us, let's return the most likely case: */
-        return GAIM_INPUT_READ;
+        return B_EV_IO_READ;
 }

lib/ssl_openssl.c

@@ -102 +102 @@
         struct scd *conn = data;
         
-        return ssl_connected( conn, conn->fd, GAIM_INPUT_WRITE );
+        return ssl_connected( conn, conn->fd, B_EV_IO_WRITE );
 }
 
@@ -270 +270 @@
 b_input_condition ssl_getdirection( void *conn )
 {
-        return( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE ? GAIM_INPUT_WRITE : GAIM_INPUT_READ );
-}
+        return( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE ? B_EV_IO_WRITE : B_EV_IO_READ );
+}

lib/ssl_sspi.c

@@ -275 +275 @@
 GaimInputCondition ssl_getdirection( void *conn )
 {
-        return GAIM_INPUT_WRITE; /* FIXME: or GAIM_INPUT_READ */
-}
+        return B_EV_IO_WRITE; /* FIXME: or B_EV_IO_READ */
+}

nick.c

@@ -78 +78 @@
                 
                 nick_strip( nick );
-                if( set_getbool( &acc->irc->set, "lcnicks" ) )
+                if( set_getbool( &acc->bee->set, "lcnicks" ) )
                         nick_lc( nick );
         }
@@ -92 +92 @@
 void nick_dedupe( account_t *acc, const char *handle, char nick[MAX_NICK_LENGTH+1] )
 {
+        irc_t *irc = (irc_t*) acc->bee->ui_data;
         int inf_protection = 256;
         
         /* Now, find out if the nick is already in use at the moment, and make
            subtle changes to make it unique. */
-        while( !nick_ok( nick ) || user_find( acc->irc, nick ) )
+        while( !nick_ok( nick ) || irc_user_by_name( irc, nick ) )
         {
                 if( strlen( nick ) < ( MAX_NICK_LENGTH - 1 ) )
@@ -112 +113 @@
                         int i;
                         
-                        irc_usermsg( acc->irc, "Warning: Almost had an infinite loop in nick_get()! "
-                                               "This used to be a fatal BitlBee bug, but we tried to fix it. "
-                                               "This message should *never* appear anymore. "
-                                               "If it does, please *do* send us a bug report! "
-                                               "Please send all the following lines in your report:" );
-                        
-                        irc_usermsg( acc->irc, "Trying to get a sane nick for handle %s", handle );
+                        irc_usermsg( irc, "Warning: Almost had an infinite loop in nick_get()! "
+                                          "This used to be a fatal BitlBee bug, but we tried to fix it. "
+                                          "This message should *never* appear anymore. "
+                                          "If it does, please *do* send us a bug report! "
+                                          "Please send all the following lines in your report:" );
+                        
+                        irc_usermsg( irc, "Trying to get a sane nick for handle %s", handle );
                         for( i = 0; i < MAX_NICK_LENGTH; i ++ )
-                                irc_usermsg( acc->irc, "Char %d: %c/%d", i, nick[i], nick[i] );
-                        
-                        irc_usermsg( acc->irc, "FAILED. Returning an insane nick now. Things might break. "
-                                               "Good luck, and please don't forget to paste the lines up here "
-                                               "in #bitlbee on OFTC or in a mail to wilmer@gaast.net" );
+                                irc_usermsg( irc, "Char %d: %c/%d", i, nick[i], nick[i] );
+                        
+                        irc_usermsg( irc, "FAILED. Returning an insane nick now. Things might break. "
+                                          "Good luck, and please don't forget to paste the lines up here "
+                                          "in #bitlbee on OFTC or in a mail to wilmer@gaast.net" );
                         
                         g_snprintf( nick, MAX_NICK_LENGTH + 1, "xx%x", rand() );

protocols/Makefile

@@ -8 +8 @@
 
 -include ../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)protocols/
+endif
 
 # [SH] Program variables
-objects = nogaim.o
+objects = account.o bee.o bee_chat.o bee_ft.o bee_user.o nogaim.o
+
 
 # [SH] The next two lines should contain the directory name (in $(subdirs))
@@ -49 +53 @@
 $(objects): ../Makefile.settings Makefile
 
-$(objects): %.o: %.c
+$(objects): %.o: $(SRCDIR)%.c
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@

protocols/jabber/Makefile

@@ -8 +8 @@
 
 -include ../../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)protocols/jabber/
+endif
 
 # [SH] Program variables
-objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o
+objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o
 
 CFLAGS += -Wall
@@ -33 +36 @@
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: %.c
+$(objects): %.o: $(SRCDIR)%.c
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@

protocols/jabber/conference.c

@@ -92 +92 @@
 {
         char *normalized = jabber_normalize( name );
+        GSList *l;
         struct groupchat *ret;
         struct jabber_chat *jc;
         
-        for( ret = ic->groupchats; ret; ret = ret->next )
-        {
+        for( l = ic->groupchats; l; l = l->next )
+        {
+                ret = l->data;
                 jc = ret->data;
                 if( strcmp( normalized, jc->name ) == 0 )
@@ -103 +105 @@
         g_free( normalized );
         
-        return ret;
+        return l ? ret : NULL;
 }
 

protocols/jabber/io.c

@@ -64 +64 @@
                    most cases it probably won't be necessary.) */
                 if( ( ret = jabber_write_queue( ic ) ) && jd->tx_len > 0 )
-                        jd->w_inpa = b_input_add( jd->fd, GAIM_INPUT_WRITE, jabber_write_callback, ic );
+                        jd->w_inpa = b_input_add( jd->fd, B_EV_IO_WRITE, jabber_write_callback, ic );
         }
         else
@@ -504 +504 @@
         
         if( jd->r_inpa <= 0 )
-                jd->r_inpa = b_input_add( jd->fd, GAIM_INPUT_READ, jabber_read_callback, ic );
+                jd->r_inpa = b_input_add( jd->fd, B_EV_IO_READ, jabber_read_callback, ic );
         
         greet = g_strdup_printf( "%s<stream:stream to=\"%s\" xmlns=\"jabber:client\" "

protocols/jabber/iq.c

@@ -91 +91 @@
                         pack = 0;
                 }
-                else if( strcmp( s, XMLNS_DISCOVER ) == 0 )
-                {
-                        const char *features[] = { XMLNS_DISCOVER,
+                else if( strcmp( s, XMLNS_DISCO_INFO ) == 0 )
+                {
+                        const char *features[] = { XMLNS_DISCO_INFO,
                                                    XMLNS_VERSION,
                                                    XMLNS_TIME,
@@ -99 +99 @@
                                                    XMLNS_MUC,
                                                    XMLNS_PING,
+                                                   XMLNS_SI,
+                                                   XMLNS_BYTESTREAMS,
+                                                   XMLNS_FILETRANSFER,
                                                    NULL };
                         const char **f;
@@ -118 +121 @@
                 {
                         xt_free_node( reply );
-                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel" );
+                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel", NULL );
                         pack = 0;
                 }
@@ -124 +127 @@
         else if( strcmp( type, "set" ) == 0 )
         {
-                if( !( c = xt_find_node( node->children, "query" ) ) ||
-                    !( s = xt_find_attr( c, "xmlns" ) ) )
+                if( ( c = xt_find_node( node->children, "si" ) ) &&
+                    ( s = xt_find_attr( c, "xmlns" ) ) &&
+                    ( strcmp( s, XMLNS_SI ) == 0 ) )
+                {
+                        return jabber_si_handle_request( ic, node, c );
+                }
+                else if( !( c = xt_find_node( node->children, "query" ) ) ||
+                         !( s = xt_find_attr( c, "xmlns" ) ) )
                 {
                         return XT_HANDLED;
                 }
-                
+                else if( strcmp( s, XMLNS_ROSTER ) == 0 )
+                {
                 /* This is a roster push. XMPP servers send this when someone
                    was added to (or removed from) the buddy list. AFAIK they're
                    sent even if we added this buddy in our own session. */
-                if( strcmp( s, XMLNS_ROSTER ) == 0 )
-                {
                         int bare_len = strlen( ic->acc->user );
                         
@@ -151 +159 @@
                                 
                                 xt_free_node( reply );
-                                reply = jabber_make_error_packet( node, "not-allowed", "cancel" );
+                                reply = jabber_make_error_packet( node, "not-allowed", "cancel", NULL );
                                 pack = 0;
                         }
                 }
+                else if( strcmp( s, XMLNS_BYTESTREAMS ) == 0 )
+                {
+                        /* Bytestream Request (stage 2 of file transfer) */
+                        return jabber_bs_recv_request( ic, node, c );
+                }
                 else
                 {
                         xt_free_node( reply );
-                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel" );
+                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel", NULL );
                         pack = 0;
                 }
@@ -369 +382 @@
         while( ( c = xt_find_node( c, "item" ) ) )
         {
-                struct xt_node *group = xt_find_node( node->children, "group" );
+                struct xt_node *group = xt_find_node( c->children, "group" );
                 char *jid = xt_find_attr( c, "jid" );
                 char *name = xt_find_attr( c, "name" );
@@ -378 +391 @@
                         if( ( strcmp( sub, "both" ) == 0 || strcmp( sub, "to" ) == 0 ) )
                         {
-                                if( initial || imcb_find_buddy( ic, jid ) == NULL )
-                                        imcb_add_buddy( ic, jid, ( group && group->text_len ) ?
-                                                                   group->text : NULL );
+                                imcb_add_buddy( ic, jid, ( group && group->text_len ) ?
+                                                           group->text : NULL );
                                 
                                 if( name )
@@ -543 +555 @@
 static xt_status jabber_add_to_roster_callback( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
 
-int jabber_add_to_roster( struct im_connection *ic, char *handle, char *name )
+int jabber_add_to_roster( struct im_connection *ic, const char *handle, const char *name, const char *group )
 {
         struct xt_node *node;
@@ -553 +565 @@
         if( name )
                 xt_add_attr( node, "name", name );
+        if( group )
+                xt_add_child( node, xt_new_node( "group", group, NULL ) );
         
         /* And pack it into a roster-add packet */
@@ -576 +590 @@
             strcmp( s, "result" ) == 0 )
         {
-                if( imcb_find_buddy( ic, jid ) == NULL )
+                if( bee_user_by_handle( ic->bee, ic, jid ) == NULL )
                         imcb_add_buddy( ic, jid, NULL );
         }
@@ -608 +622 @@
         return st;
 }
+
+xt_status jabber_iq_parse_features( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
+
+xt_status jabber_iq_query_features( struct im_connection *ic, char *bare_jid )
+{
+        struct xt_node *node, *query;
+        struct jabber_buddy *bud;
+        
+        if( ( bud = jabber_buddy_by_jid( ic, bare_jid , 0 ) ) == NULL )
+        {
+                /* Who cares about the unknown... */
+                imcb_log( ic, "Couldn't find buddy: %s", bare_jid);
+                return XT_HANDLED;
+        }
+        
+        if( bud->features ) /* been here already */
+                return XT_HANDLED;
+        
+        node = xt_new_node( "query", NULL, NULL );
+        xt_add_attr( node, "xmlns", XMLNS_DISCO_INFO );
+        
+        if( !( query = jabber_make_packet( "iq", "get", bare_jid, node ) ) )
+        {
+                imcb_log( ic, "WARNING: Couldn't generate feature query" );
+                xt_free_node( node );
+                return XT_HANDLED;
+        }
+
+        jabber_cache_add( ic, query, jabber_iq_parse_features );
+
+        return jabber_write_packet( ic, query ) ? XT_HANDLED : XT_ABORT;
+}
+
+xt_status jabber_iq_parse_features( struct im_connection *ic, struct xt_node *node, struct xt_node *orig )
+{
+        struct xt_node *c;
+        struct jabber_buddy *bud;
+        char *feature, *xmlns, *from;
+
+        if( !( from = xt_find_attr( node, "from" ) ) ||
+            !( c = xt_find_node( node->children, "query" ) ) ||
+            !( xmlns = xt_find_attr( c, "xmlns" ) ) ||
+            !( strcmp( xmlns, XMLNS_DISCO_INFO ) == 0 ) )
+        {
+                imcb_log( ic, "WARNING: Received incomplete IQ-result packet for discover" );
+                return XT_HANDLED;
+        }
+        if( ( bud = jabber_buddy_by_jid( ic, from, 0 ) ) == NULL )
+        {
+                /* Who cares about the unknown... */
+                imcb_log( ic, "Couldn't find buddy: %s", from );
+                return XT_HANDLED;
+        }
+        
+        c = c->children;
+        while( ( c = xt_find_node( c, "feature" ) ) )
+        {
+                feature = xt_find_attr( c, "var" );
+                if( feature )
+                        bud->features = g_slist_append( bud->features, g_strdup( feature ) );
+                c = c->next;
+        }
+
+        return XT_HANDLED;
+}
+
+xt_status jabber_iq_parse_server_features( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
+
+xt_status jabber_iq_query_server( struct im_connection *ic, char *jid, char *xmlns )
+{
+        struct xt_node *node, *query;
+        struct jabber_data *jd = ic->proto_data;
+        
+        node = xt_new_node( "query", NULL, NULL );
+        xt_add_attr( node, "xmlns", xmlns );
+        
+        if( !( query = jabber_make_packet( "iq", "get", jid, node ) ) )
+        {
+                imcb_log( ic, "WARNING: Couldn't generate server query" );
+                xt_free_node( node );
+        }
+
+        jd->have_streamhosts--;
+        jabber_cache_add( ic, query, jabber_iq_parse_server_features );
+
+        return jabber_write_packet( ic, query ) ? XT_HANDLED : XT_ABORT;
+}
+
+/*
+ * Query the server for "items", query each "item" for identities, query each "item" that's a proxy for it's bytestream info
+ */
+xt_status jabber_iq_parse_server_features( struct im_connection *ic, struct xt_node *node, struct xt_node *orig )
+{
+        struct xt_node *c;
+        struct jabber_data *jd = ic->proto_data;
+        char *xmlns, *from;
+
+        if( !( c = xt_find_node( node->children, "query" ) ) ||
+            !( from = xt_find_attr( node, "from" ) ) ||
+            !( xmlns = xt_find_attr( c, "xmlns" ) ) )
+        {
+                imcb_log( ic, "WARNING: Received incomplete IQ-result packet for discover" );
+                return XT_HANDLED;
+        }
+
+        jd->have_streamhosts++;
+
+        if( strcmp( xmlns, XMLNS_DISCO_ITEMS ) == 0 )
+        {
+                char *itemjid;
+
+                /* answer from server */
+        
+                c = c->children;
+                while( ( c = xt_find_node( c, "item" ) ) )
+                {
+                        itemjid = xt_find_attr( c, "jid" );
+                        
+                        if( itemjid )
+                                jabber_iq_query_server( ic, itemjid, XMLNS_DISCO_INFO );
+
+                        c = c->next;
+                }
+        }
+        else if( strcmp( xmlns, XMLNS_DISCO_INFO ) == 0 )
+        {
+                char *category, *type;
+
+                /* answer from potential proxy */
+
+                c = c->children;
+                while( ( c = xt_find_node( c, "identity" ) ) )
+                {
+                        category = xt_find_attr( c, "category" );
+                        type = xt_find_attr( c, "type" );
+
+                        if( type && ( strcmp( type, "bytestreams" ) == 0 ) &&
+                            category && ( strcmp( category, "proxy" ) == 0 ) )
+                                jabber_iq_query_server( ic, from, XMLNS_BYTESTREAMS );
+
+                        c = c->next;
+                }
+        }
+        else if( strcmp( xmlns, XMLNS_BYTESTREAMS ) == 0 )
+        {
+                char *host, *jid, *port_s;
+                int port;
+
+                /* answer from proxy */
+
+                if( ( c = xt_find_node( c->children, "streamhost" ) ) &&
+                    ( host = xt_find_attr( c, "host" ) ) &&
+                    ( port_s = xt_find_attr( c, "port" ) ) &&
+                    ( sscanf( port_s, "%d", &port ) == 1 ) &&
+                    ( jid = xt_find_attr( c, "jid" ) ) )
+                {
+                        jabber_streamhost_t *sh = g_new0( jabber_streamhost_t, 1 );
+                        
+                        sh->jid = g_strdup( jid );
+                        sh->host = g_strdup( host );
+                        g_snprintf( sh->port, sizeof( sh->port ), "%u", port );
+
+                        imcb_log( ic, "Proxy found: jid %s host %s port %u", jid, host, port );
+                        jd->streamhosts = g_slist_append( jd->streamhosts, sh );
+                }
+        }
+
+        if( jd->have_streamhosts == 0 )
+                jd->have_streamhosts++;
+
+        return XT_HANDLED;
+}

protocols/jabber/jabber.c

@@ -65 +65 @@
         
         s = set_add( &acc->set, "priority", "0", set_eval_priority, acc );
+
+        s = set_add( &acc->set, "proxy", "<local>;<auto>", NULL, acc );
         
         s = set_add( &acc->set, "resource", "BitlBee", NULL, acc );
@@ -266 +268 @@
         struct jabber_data *jd = ic->proto_data;
         
+        while( jd->filetransfers )
+                imcb_file_canceled( ic, ( ( struct jabber_transfer *) jd->filetransfers->data )->ft, "Logging out" );
+
+        while( jd->streamhosts )
+        {
+                jabber_streamhost_t *sh = jd->streamhosts->data;
+                jd->streamhosts = g_slist_remove( jd->streamhosts, sh );
+                g_free( sh->jid );
+                g_free( sh->host );
+                g_free( sh );
+        }
+
         if( jd->fd >= 0 )
                 jabber_end_stream( ic );
         
         while( ic->groupchats )
-                jabber_chat_free( ic->groupchats );
+                jabber_chat_free( ic->groupchats->data );
         
         if( jd->r_inpa >= 0 )
@@ -401 +415 @@
         }
         
-        if( jabber_add_to_roster( ic, who, NULL ) )
+        if( jabber_add_to_roster( ic, who, NULL, group ) )
                 presence_send_request( ic, who, "subscribe" );
 }
@@ -549 +563 @@
         ret->send_typing = jabber_send_typing;
         ret->handle_cmp = g_strcasecmp;
+        ret->transfer_request = jabber_si_transfer_request;
 
         register_protocol( ret );

protocols/jabber/jabber.h

@@ -61 +61 @@
 } jabber_buddy_flags_t;
 
+/* Stores a streamhost's (a.k.a. proxy) data */
+typedef struct
+{
+        char *jid;
+        char *host;
+        char port[6];
+} jabber_streamhost_t;
+
 typedef enum
 {
@@ -91 +99 @@
         GHashTable *node_cache;
         GHashTable *buddies;
+
+        GSList *filetransfers;
+        GSList *streamhosts;
+        int have_streamhosts;
 };
 
@@ -127 +139 @@
         struct jabber_away_state *away_state;
         char *away_message;
+        GSList *features;
         
         time_t last_msg;
@@ -140 +153 @@
         char *my_full_jid; /* Separate copy because of case sensitivity. */
         struct jabber_buddy *me;
+};
+
+struct jabber_transfer
+{
+        /* bitlbee's handle for this transfer */
+        file_transfer_t *ft;
+
+        /* the stream's private handle */
+        gpointer streamhandle;
+
+        /* timeout for discover queries */
+        gint disco_timeout;
+        gint disco_timeout_fired;
+
+        struct im_connection *ic;
+
+        struct jabber_buddy *bud;
+
+        int watch_in;
+        int watch_out;
+
+        char *ini_jid;
+        char *tgt_jid;
+        char *iq_id;
+        char *sid;
+        int accepted;
+
+        size_t bytesread, byteswritten;
+        int fd;
+        struct sockaddr_storage saddr;
 };
 
@@ -167 +210 @@
 
 /* Some supported extensions/legacy stuff */
-#define XMLNS_AUTH         "jabber:iq:auth"                     /* XEP-0078 */
-#define XMLNS_VERSION      "jabber:iq:version"                  /* XEP-0092 */
-#define XMLNS_TIME         "jabber:iq:time"                     /* XEP-0090 */
-#define XMLNS_PING         "urn:xmpp:ping"                      /* XEP-0199 */
-#define XMLNS_VCARD        "vcard-temp"                         /* XEP-0054 */
-#define XMLNS_DELAY        "jabber:x:delay"                     /* XEP-0091 */
-#define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"  /* 0085 */
-#define XMLNS_DISCOVER     "http://jabber.org/protocol/disco#info"  /* 0030 */
-#define XMLNS_MUC          "http://jabber.org/protocol/muc"     /* XEP-0045 */
-#define XMLNS_MUC_USER     "http://jabber.org/protocol/muc#user"/* XEP-0045 */
-#define XMLNS_CAPS         "http://jabber.org/protocol/caps"    /* XEP-0115 */
+#define XMLNS_AUTH         "jabber:iq:auth"                                      /* XEP-0078 */
+#define XMLNS_VERSION      "jabber:iq:version"                                   /* XEP-0092 */
+#define XMLNS_TIME         "jabber:iq:time"                                      /* XEP-0090 */
+#define XMLNS_PING         "urn:xmpp:ping"                                       /* XEP-0199 */
+#define XMLNS_VCARD        "vcard-temp"                                          /* XEP-0054 */
+#define XMLNS_DELAY        "jabber:x:delay"                                      /* XEP-0091 */
+#define XMLNS_XDATA        "jabber:x:data"                                       /* XEP-0004 */
+#define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"               /* XEP-0085 */
+#define XMLNS_DISCO_INFO   "http://jabber.org/protocol/disco#info"               /* XEP-0030 */
+#define XMLNS_DISCO_ITEMS  "http://jabber.org/protocol/disco#items"              /* XEP-0030 */
+#define XMLNS_MUC          "http://jabber.org/protocol/muc"                      /* XEP-0045 */
+#define XMLNS_MUC_USER     "http://jabber.org/protocol/muc#user"                 /* XEP-0045 */
+#define XMLNS_CAPS         "http://jabber.org/protocol/caps"                     /* XEP-0115 */
+#define XMLNS_FEATURE      "http://jabber.org/protocol/feature-neg"              /* XEP-0020 */
+#define XMLNS_SI           "http://jabber.org/protocol/si"                       /* XEP-0095 */
+#define XMLNS_FILETRANSFER "http://jabber.org/protocol/si/profile/file-transfer" /* XEP-0096 */
+#define XMLNS_BYTESTREAMS  "http://jabber.org/protocol/bytestreams"              /* XEP-0065 */
+#define XMLNS_IBB          "http://jabber.org/protocol/ibb"                      /* XEP-0047 */
 
 /* iq.c */
@@ -185 +235 @@
 int jabber_get_roster( struct im_connection *ic );
 int jabber_get_vcard( struct im_connection *ic, char *bare_jid );
-int jabber_add_to_roster( struct im_connection *ic, char *handle, char *name );
+int jabber_add_to_roster( struct im_connection *ic, const char *handle, const char *name, const char *group );
 int jabber_remove_from_roster( struct im_connection *ic, char *handle );
+xt_status jabber_iq_query_features( struct im_connection *ic, char *bare_jid );
+xt_status jabber_iq_query_server( struct im_connection *ic, char *jid, char *xmlns );
+
+/* si.c */
+int jabber_si_handle_request( struct im_connection *ic, struct xt_node *node, struct xt_node *sinode );
+void jabber_si_transfer_request( struct im_connection *ic, file_transfer_t *ft, char *who );
+void jabber_si_free_transfer( file_transfer_t *ft);
+
+/* s5bytestream.c */
+int jabber_bs_recv_request( struct im_connection *ic, struct xt_node *node, struct xt_node *qnode);
+gboolean jabber_bs_send_start( struct jabber_transfer *tf );
+gboolean jabber_bs_send_write( file_transfer_t *ft, char *buffer, unsigned int len );
 
 /* message.c */
@@ -200 +262 @@
 char *set_eval_tls( set_t *set, char *value );
 struct xt_node *jabber_make_packet( char *name, char *type, char *to, struct xt_node *children );
-struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type );
+struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type, char *err_code );
 void jabber_cache_add( struct im_connection *ic, struct xt_node *node, jabber_cache_event func );
 struct xt_node *jabber_cache_get( struct im_connection *ic, char *id );

protocols/jabber/jabber_util.c

@@ -99 +99 @@
 }
 
-struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type )
+struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type, char *err_code )
 {
         struct xt_node *node, *c;
@@ -111 +111 @@
         c = xt_new_node( "error", NULL, c );
         xt_add_attr( c, "type", err_type );
+        
+        /* Add the error code, if present */
+        if (err_code)
+                xt_add_attr( c, "code", err_code );
         
         /* To make the actual error packet, we copy the original packet and
@@ -275 +279 @@
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         
-        if( imcb_find_buddy( bla->ic, bla->handle ) == NULL )
-                imcb_ask_add( bla->ic, bla->handle, NULL );
+        imcb_ask_add( bla->ic, bla->handle, NULL );
         
         g_free( bla->handle );
@@ -458 +461 @@
                 
                 if( bud == NULL && ( flags & GET_BUDDY_CREAT ) &&
-                    ( bare_exists || imcb_find_buddy( ic, jid ) ) )
+                    ( bare_exists || bee_user_by_handle( ic->bee, ic, jid ) ) )
                 {
                         *s = '/';
@@ -479 +482 @@
                 if( bud == NULL )
                         /* No match. Create it now? */
-                        return ( ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid_ ) ) ?
+                        return ( ( flags & GET_BUDDY_CREAT ) &&
+                                 bee_user_by_handle( ic->bee, ic, jid_ ) ) ?
                                    jabber_buddy_add( ic, jid_ ) : NULL;
                 else if( bud->resource && ( flags & GET_BUDDY_EXACT ) )

protocols/jabber/presence.c

@@ -205 +205 @@
         struct jabber_data *jd = ic->proto_data;
         struct xt_node *node, *cap;
-        struct groupchat *c;
+        GSList *l;
         int st;
         
@@ -229 +229 @@
         /* Have to send this update to all groupchats too, the server won't
            do this automatically. */
-        for( c = ic->groupchats; c && st; c = c->next )
-        {
+        for( l = ic->groupchats; l && st; l = l->next )
+        {
+                struct groupchat *c = l->data;
                 struct jabber_chat *jc = c->data;
                 

protocols/msn/Makefile

@@ -8 +8 @@
 
 -include ../../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)protocols/msn/
+endif
 
 # [SH] Program variables
@@ -33 +36 @@
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: %.c
+$(objects): %.o: $(SRCDIR)%.c
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@

protocols/msn/msn.c

@@ -79 +79 @@
         if( md )
         {
+                /** Disabling MSN ft support for now.
+                while( md->filetransfers ) {
+                        imcb_file_canceled( md->filetransfers->data, "Closing connection" );
+                }
+                */
+                
                 if( md->fd >= 0 )
                         closesocket( md->fd );
@@ -98 +104 @@
                 g_free( md->grouplist );
                 
+                while( md->grpq )
+                {
+                        struct msn_groupadd *ga = md->grpq->data;
+                        g_free( ga->group );
+                        g_free( ga->who );
+                        g_free( ga );
+                        md->grpq = g_slist_remove( md->grpq, ga );
+                }
+                
                 g_free( md );
         }
@@ -116 +131 @@
         struct msn_switchboard *sb;
         
+#ifdef DEBUG
+        if( strcmp( who, "raw" ) == 0 )
+        {
+                msn_write( ic, message, strlen( message ) );
+                msn_write( ic, "\r\n", 2 );
+        }
+        else
+#endif
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
         {
@@ -176 +199 @@
 static void msn_add_buddy( struct im_connection *ic, char *who, char *group )
 {
-        msn_buddy_list_add( ic, "FL", who, who );
+        msn_buddy_list_add( ic, "FL", who, who, group );
 }
 
@@ -217 +240 @@
 {
         struct msn_switchboard *sb;
+        struct groupchat *c = imcb_chat_new( ic, who );
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -234 +258 @@
                 msn_sb_write_msg( ic, m );
 
-                return NULL;
-        }
-        
-        return NULL;
+                return c;
+        }
 }
 
@@ -247 +269 @@
 static void msn_add_permit( struct im_connection *ic, char *who )
 {
-        msn_buddy_list_add( ic, "AL", who, who );
+        msn_buddy_list_add( ic, "AL", who, who, NULL );
 }
 
@@ -259 +281 @@
         struct msn_switchboard *sb;
         
-        msn_buddy_list_add( ic, "BL", who, who );
+        msn_buddy_list_add( ic, "BL", who, who, NULL );
         
         /* If there's still a conversation with this person, close it. */
@@ -328 +350 @@
         ret->send_typing = msn_send_typing;
         ret->handle_cmp = g_strcasecmp;
+        //ret->transfer_request = msn_ftp_transfer_request;
 
         register_protocol(ret);

protocols/msn/msn.h

@@ -70 +70 @@
         int trId;
         
-        GSList *msgq;
+        GSList *msgq, *grpq;
         GSList *switchboards;
         int sb_failures;
         time_t first_sb_failure;
+        GSList *filetransfers;
         
         const struct msn_away_state *away_state;
@@ -118 +119 @@
         char *who;
         char *text;
+};
+
+struct msn_groupadd
+{
+        char *who;
+        char *group;
 };
 
@@ -159 +166 @@
 int msn_write( struct im_connection *ic, char *s, int len );
 int msn_logged_in( struct im_connection *ic );
-int msn_buddy_list_add( struct im_connection *ic, char *list, char *who, char *realname );
+int msn_buddy_list_add( struct im_connection *ic, const char *list, const char *who, const char *realname_, const char *group );
 int msn_buddy_list_remove( struct im_connection *ic, char *list, char *who );
 void msn_buddy_ask( struct im_connection *ic, char *handle, char *realname );
@@ -189 +196 @@
 void msn_sb_stop_keepalives( struct msn_switchboard *sb );
 
+/* invitation.c */
+void msn_ftp_transfer_request( struct im_connection *ic, file_transfer_t *ft, char *who );
+
 #endif //_MSN_H

protocols/msn/msn_util.c

@@ -51 +51 @@
 }
 
-int msn_buddy_list_add( struct im_connection *ic, char *list, char *who, char *realname_ )
+int msn_buddy_list_add( struct im_connection *ic, const char *list, const char *who, const char *realname_, const char *group )
 {
         struct msn_data *md = ic->proto_data;
-        char buf[1024], *realname;
+        char buf[1024], *realname, groupid[8];
+        
+        *groupid = '\0';
+        if( group )
+        {
+                int i;
+                for( i = 0; i < md->groupcount; i ++ )
+                        if( g_strcasecmp( md->grouplist[i], group ) == 0 )
+                        {
+                                g_snprintf( groupid, sizeof( groupid ), " %d", i );
+                                break;
+                        }
+                
+                if( *groupid == '\0' )
+                {
+                        /* Have to create this group, it doesn't exist yet. */
+                        struct msn_groupadd *ga;
+                        GSList *l;
+                        
+                        for( l = md->grpq; l; l = l->next )
+                        {
+                                ga = l->data;
+                                if( g_strcasecmp( ga->group, group ) == 0 )
+                                        break;
+                        }
+                        
+                        ga = g_new0( struct msn_groupadd, 1 );
+                        ga->who = g_strdup( who );
+                        ga->group = g_strdup( group );
+                        md->grpq = g_slist_prepend( md->grpq, ga );
+                        
+                        if( l == NULL )
+                        {
+                                char *groupname = msn_http_encode( group );
+                                g_snprintf( buf, sizeof( buf ), "ADG %d %s %d\r\n", ++md->trId, groupname, 0 );
+                                g_free( groupname );
+                                return msn_write( ic, buf, strlen( buf ) );
+                        }
+                        else
+                        {
+                                /* This can happen if the user's doing lots of adds to a
+                                   new group at once; we're still waiting for the server
+                                   to confirm group creation. */
+                                return 1;
+                        }
+                }
+        }
         
         realname = msn_http_encode( realname_ );
-        
-        g_snprintf( buf, sizeof( buf ), "ADD %d %s %s %s\r\n", ++md->trId, list, who, realname );
-        if( msn_write( ic, buf, strlen( buf ) ) )
-        {
-                g_free( realname );
-                
-                return( 1 );
-        }
-        
+        g_snprintf( buf, sizeof( buf ), "ADD %d %s %s %s%s\r\n", ++md->trId, list, who, realname, groupid );
         g_free( realname );
         
-        return( 0 );
+        return msn_write( ic, buf, strlen( buf ) );
 }
 
@@ -94 +132 @@
         struct msn_buddy_ask_data *bla = data;
         
-        msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname );
-        
-        if( imcb_find_buddy( bla->ic, bla->handle ) == NULL )
-                imcb_ask_add( bla->ic, bla->handle, NULL );
+        msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname, NULL );
+        
+        imcb_ask_add( bla->ic, bla->handle, NULL );
         
         g_free( bla->handle );
@@ -108 +145 @@
         struct msn_buddy_ask_data *bla = data;
         
-        msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname );
+        msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname, NULL );
         
         g_free( bla->handle );

protocols/msn/ns.c

@@ -76 +76 @@
         if( msn_write( ic, s, strlen( s ) ) )
         {
-                ic->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, ic );
+                ic->inpa = b_input_add( md->fd, B_EV_IO_READ, msn_ns_callback, ic );
                 imcb_log( ic, "Connected to server, waiting for reply" );
         }
@@ -533 +533 @@
                 else if( num_parts >= 6 && strcmp( cmd[2], "FL" ) == 0 )
                 {
+                        const char *group = NULL;
+                        int num;
+                        
+                        if( cmd[6] != NULL && sscanf( cmd[6], "%d", &num ) == 1 && num < md->groupcount )
+                                group = md->grouplist[num];
+                        
                         http_decode( cmd[5] );
-                        imcb_add_buddy( ic, cmd[4], NULL );
+                        imcb_add_buddy( ic, cmd[4], group );
                         imcb_rename_buddy( ic, cmd[4], cmd[5] );
                 }
@@ -604 +610 @@
                         imc_logout( ic, TRUE );
                         return( 0 );
+                }
+        }
+        else if( strcmp( cmd[0], "ADG" ) == 0 )
+        {
+                char *group = g_strdup( cmd[3] );
+                int groupnum, i;
+                GSList *l, *next;
+                
+                http_decode( group );
+                if( sscanf( cmd[4], "%d", &groupnum ) == 1 )
+                {
+                        if( groupnum >= md->groupcount )
+                        {
+                                md->grouplist = g_renew( char *, md->grouplist, groupnum + 1 );
+                                for( i = md->groupcount; i <= groupnum; i ++ )
+                                        md->grouplist[i] = NULL;
+                                md->groupcount = groupnum + 1;
+                        }
+                        g_free( md->grouplist[groupnum] );
+                        md->grouplist[groupnum] = group;
+                }
+                else
+                {
+                        /* Shouldn't happen, but if it does, give up on the group. */
+                        g_free( group );
+                        imcb_error( ic, "Syntax error" );
+                        imc_logout( ic, TRUE );
+                        return 0;
+                }
+                
+                for( l = md->grpq; l; l = next )
+                {
+                        struct msn_groupadd *ga = l->data;
+                        next = l->next;
+                        if( g_strcasecmp( ga->group, group ) == 0 )
+                        {
+                                if( !msn_buddy_list_add( ic, "FL", ga->who, ga->who, group ) )
+                                        return 0;
+                                
+                                g_free( ga->group );
+                                g_free( ga->who );
+                                g_free( ga );
+                                md->grpq = g