Changes in / [3dc6d86:1fdb0a4]

Files:

• Makefile (modified) (4 diffs)
• bitlbee.c (modified) (3 diffs)
• bitlbee.h (modified) (1 diff)
• conf.c (modified) (2 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) (1 diff)
• help.c (modified) (2 diffs)
• help.h (modified) (1 diff)
• ipc.c (modified) (3 diffs)
• irc.c (modified) (6 diffs)
• irc.h (modified) (1 diff)
• 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/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)
• protocols/Makefile (modified) (2 diffs)
• protocols/ft.h (added)
• protocols/jabber/Makefile (modified) (2 diffs)
• protocols/jabber/io.c (modified) (2 diffs)
• protocols/jabber/iq.c (modified) (6 diffs)
• protocols/jabber/jabber.c (modified) (3 diffs)
• protocols/jabber/jabber.h (modified) (7 diffs)
• protocols/jabber/jabber_util.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) (2 diffs)
• protocols/msn/msn.h (modified) (2 diffs)
• protocols/msn/ns.c (modified) (1 diff)
• protocols/msn/sb.c (modified) (4 diffs)
• protocols/nogaim.c (modified) (3 diffs)
• protocols/nogaim.h (modified) (3 diffs)
• protocols/oscar/Makefile (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (6 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/yahoo/Makefile (modified) (2 diffs)
• protocols/yahoo/yahoo.c (modified) (2 diffs)
• root_commands.c (modified) (3 diffs)
• set.c (modified) (10 diffs)
• set.h (modified) (1 diff)
• storage.c (modified) (2 diffs)
• storage_text.c (deleted)
• tests/Makefile (modified) (2 diffs)
• unix.c (modified) (4 diffs)
• 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 = account.o bitlbee.o chat.o dcc.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
+headers = account.h bitlbee.h commands.h conf.h 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
 

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 )
                         {

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
+purple=0
 
 debug=0
@@ -68 +69 @@
 --yahoo=0/1     Disable/enable Yahoo part               $yahoo
 --twitter=0/1 Disable/enable Twitter part               $twitter
+
+--purple=0/1    Disable/enable libpurple support        $purple
 
 --debug=0/1     Disable/enable debugging                $debug
@@ -121 +124 @@
 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 +184 @@
 
 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 +424 @@
 fi
 
-STORAGES="text xml"
+STORAGES="xml"
 
 if [ "$ldap" = "auto" ]; then
@@ -508 +534 @@
 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 (>= 7)
 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
+
+        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_prep
+        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_installdocs --link-doc=bitlbee-common
+        dh_installchangelogs doc/CHANGES
+        dh_installexamples
+        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,pre}* debian/bitlbee-libpurple/DEBIAN
+endif
+        dh_shlibdeps
+ifdef BITLBEE_VERSION
+        echo source:Version=1:$(BITLBEE_VERSION)-0 > debian/substvars
+        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

@@ -1168 +1168 @@
 
         </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>

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

@@ -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

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "sock.h"
-#include "crypting.h"
 #include "ipc.h"
+#include "dcc.h"
 
 static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );
@@ -125 +125 @@
         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;
@@ -214 +214 @@
         /* Evaluator sets the iconv/oconv structures. */
         set_eval_charset( set_find( &irc->set, "charset" ), set_getstr( &irc->set, "charset" ) );
+        
+        nogaim_init();
         
         return( irc );
@@ -696 +698 @@
                    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 );
         }
         
@@ -725 +727 @@
                 if( now )
                 {
-                        bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE );
+                        bitlbee_io_current_client_write( irc, irc->fd, B_EV_IO_WRITE );
                 }
                 temp = temp->next;
@@ -1126 +1128 @@
                         return( 1 );
                 }
+                else if( g_strncasecmp( s + 1, "DCC", 3 ) == 0 )
+                {
+                        if( u && u->ic && u->ic->acc->prpl->transfer_request )
+                        {
+                                file_transfer_t *ft = dcc_request( u->ic, s + 5 );
+                                if ( ft )
+                                        u->ic->acc->prpl->transfer_request( u->ic, ft, u->handle );
+                        }
+                        return( 1 );
+                }               
                 else
                 {
-                        irc_usermsg( irc, "Non-ACTION CTCP's aren't supported" );
+                        irc_usermsg( irc, "Supported CTCPs are ACTION, VERSION, PING, TYPING, DCC" );
                         return( 0 );
                 }

irc.h

@@ -83 +83 @@
         struct query *queries;
         struct account *accounts;
+        GSList *file_transfers;
         struct chat *chatrooms;
         

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/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 */
+}

protocols/Makefile

@@ -8 +8 @@
 
 -include ../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)protocols/
+endif
 
 # [SH] Program variables
@@ -49 +52 @@
 $(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/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;
                 }
@@ -608 +621 @@
         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 );
@@ -264 +266 @@
         struct jabber_data *jd = ic->proto_data;
         
+        while( jd->filetransfers )
+                imcb_file_canceled( ( ( 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 );
@@ -544 +558 @@
         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 */
@@ -187 +237 @@
 int jabber_add_to_roster( struct im_connection *ic, char *handle, char *name );
 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

protocols/msn/Makefile

@@ -8 +8 @@
 
 -include ../../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)protocols/msn/
+endif
 
 # [SH] Program variables
-objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
+objects = invitation.o msn.o msn_util.o ns.o passport.o sb.o tables.o
 
 CFLAGS += -Wall
@@ -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 )
         {
+                while( md->filetransfers ) {
+                        imcb_file_canceled( md->filetransfers->data, "Closing connection" );
+                }
+                
                 if( md->fd >= 0 )
                         closesocket( md->fd );
@@ -328 +332 @@
         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

@@ -74 +74 @@
         int sb_failures;
         time_t first_sb_failure;
+        GSList *filetransfers;
         
         const struct msn_away_state *away_state;
@@ -189 +190 @@
 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/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" );
         }

protocols/msn/sb.c

@@ -29 +29 @@
 #include "passport.h"
 #include "md5.h"
+#include "invitation.h"
 
 static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond );
@@ -173 +174 @@
                         buf = g_new0( char, i );
                         i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->ic->acc->user );
+                }
+                else if( strncmp( text, MSN_INVITE_HEADERS, sizeof( MSN_INVITE_HEADERS ) - 1 ) == 0 ) 
+                {
+                        buf = g_strdup( text );
+                        i = strlen( buf );
                 }
                 else if( strcmp( text, SB_KEEPALIVE_MESSAGE ) == 0 )
@@ -315 +321 @@
         
         if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                sb->inp = b_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
+                sb->inp = b_input_add( sb->fd, B_EV_IO_READ, msn_sb_callback, sb );
         else
                 debug( "Error %d while connecting to switchboard server", 2 );
@@ -694 +700 @@
                 else if( g_strncasecmp( ct, "text/x-msmsgsinvite", 19 ) == 0 )
                 {
-                        char *itype = msn_findheader( body, "Application-GUID:", blen );
-                        char buf[1024];
+                        char *command = msn_findheader( body, "Invitation-Command:", blen );
+                        char *cookie = msn_findheader( body, "Invitation-Cookie:", blen );
+                        unsigned int icookie;
                         
                         g_free( ct );
                         
-                        *buf = 0;
-                        
-                        if( !itype )
-                                return( 1 );
-                        
-                        /* File transfer. */
-                        if( strcmp( itype, "{5D3E02AB-6190-11d3-BBBB-00C04F795683}" ) == 0 )
-                        {
-                                char *name = msn_findheader( body, "Application-File:", blen );
-                                char *size = msn_findheader( body, "Application-FileSize:", blen );
-                                
-                                if( name && size )
-                                {
-                                        g_snprintf( buf, sizeof( buf ), "<< \x02""BitlBee\x02"" - Filetransfer: `%s', %s bytes >>\n"
-                                                    "Filetransfers are not supported by BitlBee for now...", name, size );
-                                }
-                                else
-                                {
-                                        strcpy( buf, "<< \x02""BitlBee\x02"" - Corrupted MSN filetransfer invitation message >>" );
-                                }
-                                
-                                if( name ) g_free( name );
-                                if( size ) g_free( size );
-                        }
-                        else
-                        {
-                                char *iname = msn_findheader( body, "Application-Name:", blen );
-                                
-                                g_snprintf( buf, sizeof( buf ), "<< \x02""BitlBee\x02"" - Unknown MSN invitation - %s (%s) >>",
-                                                                itype, iname ? iname : "no name" );
-                                
-                                if( iname ) g_free( iname );
-                        }
-                        
-                        g_free( itype );
-                        
-                        if( !*buf )
-                                return( 1 );
-                        
-                        if( sb->who )
-                        {
-                                imcb_buddy_msg( ic, cmd[1], buf, 0, 0 );
-                        }
-                        else if( sb->chat )
-                        {
-                                imcb_chat_msg( sb->chat, cmd[1], buf, 0, 0 );
-                        }
-                        else
-                        {
-                                /* PANIC! */
-                        }
+                        /* Every invite should have both a Command and Cookie header */
+                        if( !command || !cookie ) {
+                                g_free( command );
+                                g_free( cookie );
+                                imcb_log( ic, "Warning: No command or cookie from %s", sb->who );
+                                return 1;
+                        }
+                        
+                        icookie = strtoul( cookie, NULL, 10 );
+                        g_free( cookie );
+                        
+                        if( g_strncasecmp( command, "INVITE", 6 ) == 0 ) {
+                                msn_invitation_invite( sb, cmd[1], icookie, body, blen );
+                        } else if( g_strncasecmp( command, "ACCEPT", 6 ) == 0 ) {
+                                msn_invitation_accept( sb, cmd[1], icookie, body, blen );
+                        } else if( g_strncasecmp( command, "CANCEL", 6 ) == 0 ) {
+                                msn_invitation_cancel( sb, cmd[1], icookie, body, blen );
+                        } else {
+                                imcb_log( ic, "Warning: Received invalid invitation with "
+                                                "command %s from %s", command, sb->who );
+                        }
+                        
+                        g_free( command );
+                }
+                else if( g_strncasecmp( ct, "application/x-msnmsgrp2p", 24 ) == 0 ) 
+                {
+                        imcb_error( sb->ic, "Cannot receive file from %s: BitlBee does not "
+                                        "support msnmsgrp2p yet.", sb->who );
+                        g_free( ct );
                 }
                 else if( g_strncasecmp( ct, "text/x-msmsgscontrol", 20 ) == 0 )

protocols/nogaim.c

@@ -117 +117 @@
 {
         GList *gl;
-        for (gl = protocols; gl; gl = gl->next) 
+        
+        for( gl = protocols; gl; gl = gl->next )
         {
                 struct prpl *proto = gl->data;
-                if(!g_strcasecmp(proto->name, name)) 
+                
+                if( g_strcasecmp( proto->name, name ) == 0 )
                         return proto;
         }
+        
         return NULL;
 }
@@ -134 +137 @@
         extern void jabber_initmodule();
         extern void twitter_initmodule();
+        extern void purple_initmodule();
 
 #ifdef WITH_MSN
@@ -153 +157 @@
 #ifdef WITH_TWITTER
         twitter_initmodule();
+#endif
+        
+#ifdef WITH_PURPLE
+        purple_initmodule();
 #endif
 

protocols/nogaim.h

@@ -45 +45 @@
 #include "proxy.h"
 #include "query.h"
+#include "md5.h"
+#include "ft.h"
 
 #define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */
@@ -132 +134 @@
          * - The user sees this name ie. when imcb_log() is used. */
         const char *name;
+        void *data;
 
         /* Added this one to be able to add per-account settings, don't think
@@ -228 +231 @@
         void (* auth_allow)     (struct im_connection *, const char *who);
         void (* auth_deny)      (struct im_connection *, const char *who);
+
+        /* Incoming transfer request */
+        void (* transfer_request) (struct im_connection *, file_transfer_t *ft, char *handle );
 };
 

protocols/oscar/Makefile

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

protocols/oscar/oscar.c

@@ -290 +290 @@
         odata = (struct oscar_data *)ic->proto_data;
 
-        if (condition & GAIM_INPUT_READ) {
+        if (condition & B_EV_IO_READ) {
                 if (aim_get_command(odata->sess, conn) >= 0) {
                         aim_rxdispatch(odata->sess);
@@ -362 +362 @@
 
         aim_conn_completeconnect(sess, conn);
-        ic->inpa = b_input_add(conn->fd, GAIM_INPUT_READ,
+        ic->inpa = b_input_add(conn->fd, B_EV_IO_READ,
                         oscar_callback, conn);
         
@@ -493 +493 @@
 
         aim_conn_completeconnect(sess, bosconn);
-        ic->inpa = b_input_add(bosconn->fd, GAIM_INPUT_READ,
+        ic->inpa = b_input_add(bosconn->fd, B_EV_IO_READ,
                         oscar_callback, bosconn);
         imcb_log(ic, _("Connection established, cookie sent"));
@@ -703 +703 @@
 
         aim_conn_completeconnect(sess, tstconn);
-        odata->cnpa = b_input_add(tstconn->fd, GAIM_INPUT_READ,
+        odata->cnpa = b_input_add(tstconn->fd, B_EV_IO_READ,
                                         oscar_callback, tstconn);
         
@@ -731 +731 @@
 
         aim_conn_completeconnect(sess, tstconn);
-        odata->paspa = b_input_add(tstconn->fd, GAIM_INPUT_READ,
+        odata->paspa = b_input_add(tstconn->fd, B_EV_IO_READ,
                                 oscar_callback, tstconn);
         
@@ -767 +767 @@
         aim_conn_completeconnect(sess, ccon->conn);
         ccon->inpa = b_input_add(tstconn->fd,
-                        GAIM_INPUT_READ,
+                        B_EV_IO_READ,
                         oscar_callback, tstconn);
         odata->oscar_chats = g_slist_append(odata->oscar_chats, ccon);

protocols/twitter/Makefile

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

protocols/yahoo/Makefile

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

protocols/yahoo/yahoo.c

@@ -686 +686 @@
                 
                 inp->d = d;
-                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, B_EV_IO_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d );
         }
         else if( cond == YAHOO_INPUT_WRITE )
@@ -697 +697 @@
                 
                 inp->d = d;
-                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, B_EV_IO_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d );
         }
         else

root_commands.c

@@ -26 +26 @@
 #define BITLBEE_CORE
 #include "commands.h"
-#include "crypting.h"
 #include "bitlbee.h"
 #include "help.h"
@@ -1154 +1153 @@
         {
                 irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "chat", cmd[1] );
+        }
+}
+
+static void cmd_transfer( irc_t *irc, char **cmd )
+{
+        GSList *files = irc->file_transfers;
+        enum { LIST, REJECT, CANCEL };
+        int subcmd = LIST;
+        int fid;
+
+        if( !files )
+        {
+                irc_usermsg( irc, "No pending transfers" );
+                return;
+        }
+
+        if( cmd[1] && ( strcmp( cmd[1], "reject" ) == 0 ) )
+        {
+                subcmd = REJECT;
+        }
+        else if( cmd[1] && ( strcmp( cmd[1], "cancel" ) == 0 ) && 
+                 cmd[2] && ( sscanf( cmd[2], "%d", &fid ) == 1 ) )
+        {
+                subcmd = CANCEL;
+        }
+
+        for( ; files; files = g_slist_next( files ) )
+        {
+                file_transfer_t *file = files->data;
+                
+                switch( subcmd ) {
+                case LIST:
+                        if ( file->status == FT_STATUS_LISTENING )
+                                irc_usermsg( irc, 
+                                        "Pending file(id %d): %s (Listening...)", file->local_id, file->file_name);
+                        else 
+                        {
+                                int kb_per_s = 0;
+                                time_t diff = time( NULL ) - file->started ? : 1;
+                                if ( ( file->started > 0 ) && ( file->bytes_transferred > 0 ) )
+                                        kb_per_s = file->bytes_transferred / 1024 / diff;
+                                        
+                                irc_usermsg( irc, 
+                                        "Pending file(id %d): %s (%10zd/%zd kb, %d kb/s)", file->local_id, file->file_name, 
+                                        file->bytes_transferred/1024, file->file_size/1024, kb_per_s);
+                        }
+                        break;
+                case REJECT:
+                        if( file->status == FT_STATUS_LISTENING )
+                        {
+                                irc_usermsg( irc, "Rejecting file transfer for %s", file->file_name );
+                                imcb_file_canceled( file, "Denied by user" );
+                        }
+                        break;
+                case CANCEL:
+                        if( file->local_id == fid )
+                        {
+                                irc_usermsg( irc, "Canceling file transfer for %s", file->file_name );
+                                imcb_file_canceled( file, "Canceled by user" );
+                        }
+                        break;
+                }
         }
 }
@@ -1178 +1239 @@
         { "join_chat",      2, cmd_join_chat,      0 },
         { "chat",           1, cmd_chat,           0 },
+        { "transfer",       0, cmd_transfer,       0 },
         { NULL }
 };

set.c

@@ -29 +29 @@
 char *SET_INVALID = "nee";
 
-set_t *set_add( set_t **head, char *key, char *def, set_eval eval, void *data )
+set_t *set_add( set_t **head, const char *key, const char *def, set_eval eval, void *data )
 {
         set_t *s = set_find( head, key );
@@ -63 +63 @@
 }
 
-set_t *set_find( set_t **head, char *key )
+set_t *set_find( set_t **head, const char *key )
 {
         set_t *s = *head;
@@ -77 +77 @@
 }
 
-char *set_getstr( set_t **head, char *key )
+char *set_getstr( set_t **head, const char *key )
 {
         set_t *s = set_find( head, key );
@@ -87 +87 @@
 }
 
-int set_getint( set_t **head, char *key )
+int set_getint( set_t **head, const char *key )
 {
         char *s = set_getstr( head, key );
@@ -101 +101 @@
 }
 
-int set_getbool( set_t **head, char *key )
+int set_getbool( set_t **head, const char *key )
 {
         char *s = set_getstr( head, key );
@@ -111 +111 @@
 }
 
-int set_setstr( set_t **head, char *key, char *value )
+int set_setstr( set_t **head, const char *key, char *value )
 {
         set_t *s = set_find( head, key );
@@ -150 +150 @@
 }
 
-int set_setint( set_t **head, char *key, int value )
+int set_setint( set_t **head, const char *key, int value )
 {
         char s[24];     /* Not quite 128-bit clean eh? ;-) */
@@ -158 +158 @@
 }
 
-void set_del( set_t **head, char *key )
+void set_del( set_t **head, const char *key )
 {
         set_t *s = *head, *t = NULL;
@@ -182 +182 @@
 }
 
-int set_reset( set_t **head, char *key )
+int set_reset( set_t **head, const char *key )
 {
         set_t *s;
@@ -211 +211 @@
 {
         return is_bool( value ) ? value : SET_INVALID;
+}
+
+char *set_eval_list( set_t *set, char *value )
+{
+        GSList *options = set->eval_data, *opt;
+        
+        for( opt = options; opt; opt = opt->next )
+                if( strcmp( value, opt->data ) == 0 )
+                        return value;
+        
+        /* TODO: It'd be nice to show the user a list of allowed values,
+                 but we don't have enough context here to do that. May
+                 want to fix that. */
+        
+        return NULL;
 }
 

set.h

@@ -69 +69 @@
            set_setstr() should be able to free() the returned string! */
         set_eval eval;
+        void *eval_data;
         struct set *next;
 } set_t;
 
 /* Should be pretty clear. */
-set_t *set_add( set_t **head, char *key, char *def, set_eval eval, void *data );
+set_t *set_add( set_t **head, const char *key, const char *def, set_eval eval, void *data );
 
 /* Returns the raw set_t. Might be useful sometimes. */
-set_t *set_find( set_t **head, char *key );
+set_t *set_find( set_t **head, const char *key );
 
 /* Returns a pointer to the string value of this setting. Don't modify the
    returned string, and don't free() it! */
-G_MODULE_EXPORT char *set_getstr( set_t **head, char *key );
+G_MODULE_EXPORT char *set_getstr( set_t **head, const char *key );
 
 /* Get an integer. In previous versions set_getint() was also used to read
    boolean values, but this SHOULD be done with set_getbool() now! */
-G_MODULE_EXPORT int set_getint( set_t **head, char *key );
-G_MODULE_EXPORT int set_getbool( set_t **head, char *key );
+G_MODULE_EXPORT int set_getint( set_t **head, const char *key );
+G_MODULE_EXPORT int set_getbool( set_t **head, const char *key );
 
 /* set_setstr() strdup()s the given value, so after using this function
    you can free() it, if you want. */
-int set_setstr( set_t **head, char *key, char *value );
-int set_setint( set_t **head, char *key, int value );
-void set_del( set_t **head, char *key );
-int set_reset( set_t **head, char *key );
+int set_setstr( set_t **head, const char *key, char *value );
+int set_setint( set_t **head, const char *key, int value );
+void set_del( set_t **head, const char *key );
+int set_reset( set_t **head, const char *key );
 
 /* Two very useful generic evaluators. */
 char *set_eval_int( set_t *set, char *value );
 char *set_eval_bool( set_t *set, char *value );
+
+/* Another more complicated one. */
+char *set_eval_list( set_t *set, char *value );
 
 /* Some not very generic evaluators that really shouldn't be here... */

storage.c

@@ -28 +28 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
-#include "crypting.h"
 
 extern storage_t storage_text;
@@ -66 +65 @@
         storage_t *storage;
         
-        register_storage_backend(&storage_text);
         register_storage_backend(&storage_xml);
         

tests/Makefile

@@ -1 +1 @@
 -include ../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)tests/
+endif
 
 LFLAGS +=-lcheck
@@ -19 +22 @@
         @$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
 
-%.o: %.c
+%.o: $(SRCDIR)%.c
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@

unix.c

@@ -56 +56 @@
         
         log_init();
+        
         global.conf_file = g_strdup( CONF_FILE_DEF );
         global.conf = conf_load( argc, argv );
@@ -62 +63 @@
         
         b_main_init();
-        nogaim_init();
         
         srand( time( NULL ) ^ getpid() );
+        
         global.helpfile = g_strdup( HELP_FILE );
+        if( help_init( &global.help, global.helpfile ) == NULL )
+                log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
+
+        global.storage = storage_init( global.conf->primary_storage, global.conf->migrate_storage );
+        if( global.storage == NULL )
+        {
+                log_message( LOGLVL_ERROR, "Unable to load storage backend '%s'", global.conf->primary_storage );
+                return( 1 );
+        }
         
         if( global.conf->runmode == RUNMODE_INETD )
@@ -116 +126 @@
                         setuid( pw->pw_uid );
                 }
-        }
-
-        global.storage = storage_init( global.conf->primary_storage, global.conf->migrate_storage );
-        if( global.storage == NULL )
-        {
-                log_message( LOGLVL_ERROR, "Unable to load storage backend '%s'", global.conf->primary_storage );
-                return( 1 );
         }
         
@@ -142 +145 @@
         if( !getuid() || !geteuid() )
                 log_message( LOGLVL_WARNING, "BitlBee is running with root privileges. Why?" );
-        if( help_init( &global.help, global.helpfile ) == NULL )
-                log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
         
         b_main_run();

win32.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "commands.h"
-#include "crypting.h"
 #include "protocols/nogaim.h"
 #include "help.h"