Changeset b1dc403

Timestamp:

2015-05-04T21:58:50Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5726a0d

Parents:

531eabd (diff), 5ca1416 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Catch up with master.

Files:

• .travis.yml (modified) (2 diffs)
• Makefile (modified) (4 diffs)
• bitlbee.h (modified) (1 diff)
• configure (modified) (8 diffs)
• doc/CHANGES (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (2 diffs)
• doc/user-guide/misc.xml (modified) (1 diff)
• help.c (modified) (1 diff)
• ipc.c (modified) (2 diffs)
• irc.c (modified) (1 diff)
• irc.h (modified) (1 diff)
• irc_channel.c (modified) (1 diff)
• irc_im.c (modified) (4 diffs)
• irc_send.c (modified) (1 diff)
• lib/misc.c (modified) (1 diff)
• lib/oauth.c (modified) (2 diffs)
• lib/proxy.c (modified) (19 diffs)
• lib/ssl_gnutls.c (modified) (4 diffs)
• nick.c (modified) (2 diffs)
• nick.h (modified) (1 diff)
• otr.c (modified) (6 diffs)
• protocols/bee.h (modified) (1 diff)
• protocols/bee_user.c (modified) (3 diffs)
• protocols/jabber/Makefile (modified) (1 diff)
• protocols/jabber/conference.c (modified) (2 diffs)
• protocols/jabber/hipchat.c (added)
• protocols/jabber/iq.c (modified) (5 diffs)
• protocols/jabber/jabber.c (modified) (5 diffs)
• protocols/jabber/jabber.h (modified) (4 diffs)
• protocols/jabber/jabber_util.c (modified) (1 diff)
• protocols/jabber/s5bytestream.c (modified) (23 diffs)
• protocols/jabber/sasl.c (modified) (6 diffs)
• protocols/msn/Makefile (modified) (1 diff)
• protocols/msn/gw.c (added)
• protocols/msn/invitation.c (deleted)
• protocols/msn/invitation.h (deleted)
• protocols/msn/msn.c (modified) (14 diffs)
• protocols/msn/msn.h (modified) (12 diffs)
• protocols/msn/msn_util.c (modified) (12 diffs)
• protocols/msn/ns.c (modified) (23 diffs)
• protocols/msn/sb.c (deleted)
• protocols/msn/soap.c (modified) (2 diffs)
• protocols/msn/soap.h (modified) (1 diff)
• protocols/msn/tables.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (7 diffs)
• protocols/purple/bpurple.h (added)
• protocols/purple/ft-direct.c (modified) (3 diffs)
• protocols/purple/ft.c (modified) (2 diffs)
• protocols/purple/purple.c (modified) (22 diffs)
• protocols/skype/Makefile (modified) (2 diffs)
• protocols/twitter/twitter.c (modified) (4 diffs)
• protocols/twitter/twitter.h (modified) (2 diffs)
• protocols/twitter/twitter_lib.c (modified) (12 diffs)
• protocols/yahoo/yahoo.c (modified) (1 diff)
• storage_xml.c (modified) (9 diffs)

.travis.yml

@@ -1 +1 @@
 language: c
-script: ./configure && make check && dpkg-buildpackage -uc -us
+
+script:
+ - ./configure
+ - make check
+ - dpkg-buildpackage -uc -us
+
 before_install:
  - sudo apt-get update -qq
@@ -7 +12 @@
  - sudo dpkg -i *.deb
 
+env:
+  global:
+   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+   #   via the "travis encrypt" command using the project repo's public key
+   - secure: "MO6hy2cRxR02A0nSenfQFyPFpepxorJ+XgNkq2JS7LtI6tcwYRR0alvunIPJXam1/OUKxoFsBJLS1nCJTvEUXFCOvoTSAoMiePTBUEg2zfzcTb5k+cqtcOUznCXHNmXAwrqriP4vkG+57ijO9Ojz2r9LijcvjtFDRFJQY9Rcs38="
+
+addons:
+  coverity_scan:
+    project:
+      name: "bitlbee/bitlbee"
+      description: "An IRC to other chat networks gateway"
+    notification_email: dx@dxzone.com.ar
+    build_command_prepend: ./configure --otr=1 --debug=1
+    build_command: make
+    branch_pattern: coverity_scan
+
+notifications:
+  email: false

Makefile

@@ -25 +25 @@
 
 doc:
+ifdef DOC
         $(MAKE) -C doc
+endif
 
 uninstall: uninstall-bin uninstall-doc 
@@ -73 +75 @@
 
 install-doc:
+ifdef DOC
         $(MAKE) -C doc install
+endif
 ifdef SKYPE_PI
         $(MAKE) -C protocols/skype install-doc
@@ -79 +83 @@
 
 uninstall-doc:
+ifdef DOC
         $(MAKE) -C doc uninstall
+endif
 ifdef SKYPE_PI
         $(MAKE) -C protocols/skype uninstall-doc
@@ -153 +159 @@
         x=$$(basename $$(pwd)); \
         cd ..; \
-        tar czf $$x.tar.gz --exclude-from=.gitignore $$x
+        tar czf $$x.tar.gz --exclude=debian --exclude=.git* --exclude=.depend $$x
 
 $(subdirs):

bitlbee.h

@@ -36 +36 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "3.2.2"
+#define BITLBEE_VERSION "3.4"
 #define VERSION BITLBEE_VERSION
 #define BITLBEE_VER(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 2, 2)
+#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 4, 0)
 
 #define MAX_STRING 511

configure

@@ -38 +38 @@
 purple=0
 
+doc=1
 debug=0
 strip=1
@@ -56 +57 @@
 GLIB_MIN_VERSION=2.16
 
-echo BitlBee configure
-
 # Cygwin and Darwin don't support PIC/PIE
 case "$arch" in
-    CYGWIN* )
-        pie=0;;
-    Darwin )
-        pie=0;;
+        CYGWIN* )
+                pie=0;;
+        Darwin )
+                pie=0;;
 esac
+
+get_version() {
+        REAL_BITLBEE_VERSION=$(grep '^#define BITLBEE_VERSION ' $srcdir/bitlbee.h | sed 's/.*\"\(.*\)\".*/\1/')
+        BITLBEE_VERSION=$REAL_BITLBEE_VERSION
+
+        if [ -d $srcdir/.git ] && type git > /dev/null 2> /dev/null; then
+                timestamp=$(cd $srcdir; git show -s --format=%ci HEAD | sed 's/ .*$//; s/-//g')
+                branch=$(cd $srcdir; git rev-parse --abbrev-ref HEAD)
+
+                search="(.+)-([0-9]+)-(g[0-9a-f]+)"
+                replace="\1+$timestamp+$branch+\2-\3-git"
+
+                BITLBEE_VERSION=$(cd $srcdir; git describe --long --tags | sed -r "s/$search/$replace/")
+
+                unset timestamp branch search replace
+        fi
+}
+
+if [ "$1" = "--dump-version" ]; then
+        srcdir=$(cd $(dirname $0);pwd)
+        get_version
+        echo $BITLBEE_VERSION
+        exit
+fi
+
+echo BitlBee configure
 
 while [ -n "$1" ]; do
@@ -96 +121 @@
 --rpc=0/1       Disable/enable RPC interface            $rpc
 
+--doc=0/1       Disable/enable help.txt generation      $doc
 --debug=0/1     Disable/enable debugging                $debug
 --strip=0/1     Disable/enable binary stripping         $strip
@@ -450 +476 @@
         ret=1
         echo "$RESOLV_NS_TESTCODE" | $CC -o $TMPFILE -x c - $LIBRESOLV >/dev/null 2>/dev/null
-        if [ "$?" = "0" ]; then
-                ret=0
-        fi
+        if [ "$?" = "0" ]; then
+                ret=0
+        fi
 
         rm -f $TMPFILE
@@ -465 +491 @@
                 if [ -f $i/libresolv.a ]; then
                         echo "$RESOLV_NS_TESTCODE" | $CC -o $TMPFILE -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null
-                        if [ "$?" = "0" ]; then
-                                ret=0
-                        fi
+                        if [ "$?" = "0" ]; then
+                                ret=0
+                        fi
                 fi
         done
@@ -477 +503 @@
 detect_nameser_has_ns_types()
 {
-    TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
-    ret=1
-    # since we aren't actually linking with ns_* routines
-    # we can just compile the test code
-    echo "$RESOLV_NS_TYPES_TESTCODE" | $CC -o $TMPFILE -x c -  >/dev/null 2>/dev/null
-    if [ "$?" = "0" ]; then
-        ret=0
-    fi
-
-    rm -f $TMPFILE
-    return $ret
+        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
+        ret=1
+        # since we aren't actually linking with ns_* routines
+        # we can just compile the test code
+        echo "$RESOLV_NS_TYPES_TESTCODE" | $CC -o $TMPFILE -x c -  >/dev/null 2>/dev/null
+        if [ "$?" = "0" ]; then
+                ret=0
+        fi
+
+        rm -f $TMPFILE
+        return $ret
 }
 
@@ -548 +574 @@
 if detect_resolv_dynamic || detect_resolv_static; then
         echo '#define HAVE_RESOLV_A' >> config.h
-    if detect_resolv_ns_dynamic || detect_resolv_ns_static; then
-            echo '#define HAVE_RESOLV_A_WITH_NS' >> config.h
-    fi
-else
-    echo 'Insufficient resolv routines. Jabber server must be set explicitly'
+        if detect_resolv_ns_dynamic || detect_resolv_ns_static; then
+                echo '#define HAVE_RESOLV_A_WITH_NS' >> config.h
+        fi
+else
+        echo 'Insufficient resolv routines. Jabber server must be set explicitly'
 fi
 
@@ -649 +675 @@
 fi
 
-if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
-        echo
-        echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.'
-        echo 'Install xmlto if you want online help to work.'
-fi
-
-REAL_BITLBEE_VERSION=`grep '^#define BITLBEE_VERSION ' $srcdir/bitlbee.h | sed 's/.*\"\(.*\)\".*/\1/'`
-echo
-if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then
-        nick=`bzr nick`
-        if [ -n "$nick" -a "$nick" != "bitlbee" ]; then
-                nick="-$nick"
+if [ "$doc" = "1" ]; then
+        if [ ! -e doc/user-guide/help.txt ] && \
+             ! type xmlto > /dev/null 2> /dev/null || \
+             ! type xsltproc > /dev/null 2> /dev/null
+        then
+                echo
+                echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.'
+                echo 'Install xmlto and xsltproc if you want online help to work.'
         else
-                nick=""
-        fi
-        rev=`bzr revno`
-        echo 'Using bzr revision #'$rev' as version number'
-        BITLBEE_VERSION=$REAL_BITLBEE_VERSION-bzr$nick-$rev
-fi
-
-if [ -z "$BITLBEE_VERSION" -a -d .git ] && type git > /dev/null 2> /dev/null; then
-        rev=`git describe --long --tags`-`git rev-parse --abbrev-ref HEAD`
-        echo 'Using '$rev' as git version number'
-        BITLBEE_VERSION=$rev-git
-fi
-
-if [ -n "$BITLBEE_VERSION" ]; then
+                echo "DOC=1" >> Makefile.settings
+        fi
+
+        if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
+                # skype also needs asciidoc
+                if ! type a2x > /dev/null 2> /dev/null; then
+                        echo
+                        echo 'WARNING: The skyped man page requires asciidoc. It will not be generated.'
+                else
+                        echo "ASCIIDOC=1" >> Makefile.settings
+                fi
+        fi
+fi
+
+get_version
+
+if [ "$BITLBEE_VERSION" != "$REAL_BITLBEE_VERSION" ]; then
         echo 'Spoofing version number: '$BITLBEE_VERSION
         echo '#undef BITLBEE_VERSION' >> config.h
         echo '#define BITLBEE_VERSION "'$BITLBEE_VERSION'"' >> config.h
         echo
-else
-        # for pkg-config
-        BITLBEE_VERSION=$REAL_BITLBEE_VERSION
 fi
 

doc/CHANGES

@@ -1 +1 @@
 This ChangeLog mostly lists changes relevant to users. A full log can be
-found in the bzr commit logs, for example you can try:
-
-http://bugs.bitlbee.org/bitlbee/timeline?daysback=90&changeset=on
+found in the git commit logs, for example you can try:
+
+https://github.com/bitlbee/bitlbee/commits/master
+
+Version 3.4:
+- First release pretty much fully prepared by dx instead of Wilmer. Just look
+  at the tightly structured changelog!
+- Main repository migrated from bzr to git
+- Some API/ABI changes. Recompiling third party plugins is required!
+- Important bugfixes:
+  * Fix memory leak when calling word_wrap() on groupchat messages (dx)
+  * Fix segfault after a file transfer is complete (dx)
+  * Fix bug where NSS would refuse to work in forkdaemon mode (dx)
+  * Fix several bugs with UTF8 nicks (dx)
+  * Fix some nasty deadlocks that appared mostly with libpurple (dx)
+- General changes:
+  * Add a 'pattern' parameter to the blist command, to filter it (tribut)
+  * Implemented /kick support, only supported by purple for now (jgeboski)
+  * Add a "special" state to show_users (mapped to the % prefix) (jgeboski)
+  * Improved support for cygwin, openbsd and darwin (jcopenha)
+  * Create temporary users instead of showing "Message from unknown
+    participant" (jgeboski)
+- purple:
+  * Local contact lists for gadugadu and whatsapp (dx)
+  * Add topic and name_hint to groupchats (seirl)
+  * Support for 'input' requests (such as telegram auth codes) (seirl)
+    Note that telegram-purple itself is rather unstable ATM, it may crash.
+- jabber:
+  * Handle compressed DNS responses in SRV lookup (jcopenha)
+  * Fix case sensitivity issues with JIDs (GRMrGecko, dx)
+  * Implement XEP-0203 style message timestamps (dx)
+  * Fix "Server claims your JID is X instead of Y" warnings (dx)
+  * Account-wide display_name setting, mostly for hipchat (dx)
+- twitter:
+  * Filter channels. Search by keyword/hashtag or a list of users (jgeboski)
+  * Fix bug in "reply" command which removed the first quote character (dx)
+  * Add "rawreply" command, like reply but bitlbee won't add @mention (WillP)
+  * Add support for The United States of America (favorite/fav aliases) (dx)
+  * Default show_old_mentions to 0 (dx)
+  * Start stream from last tweet on connect/reconnect (roger)
+- msn:
+  * Disabled module by default. The protocol we used (MSNP18) stopped working
+    last week. This is being worked on, but it's far from ready for release.
+- And lots of small bugfixes, too many to list here.
+
+Finished 25 Mar 2015
 
 Version 3.2.2:

doc/user-guide/commands.xml

@@ -121 +121 @@
                         <description>
                                 <para>
-                                        This commands deletes an account from your account list. You should signoff the account before deleting it.
+                                        This command deletes an account from your account list. You should signoff the account before deleting it.
                                 </para>
 
@@ -853 +853 @@
                                 <varlistentry><term>favourite &lt;screenname|#id&gt;</term><listitem><para>Favo<emphasis>u</emphasis>rite the given user's most recent tweet, or the given tweet ID.</para></listitem></varlistentry>
                                 <varlistentry><term>post &lt;message&gt;</term><listitem><para>Post a tweet</para></listitem></varlistentry>
+                                <varlistentry><term>url &lt;screenname|#id&gt;</term><listitem><para>Show URL for a tweet to open it in a browser (and see context)</para></listitem></varlistentry>
                         </variablelist>
 

doc/user-guide/misc.xml

@@ -409 +409 @@
 </sect1>
 
+<sect1 id="whatsnew030400">
+<title>New stuff in BitlBee 3.4</title>
+
+<para>
+Lots of bugfixes! <emphasis>Important:</emphasis> Recompiling third party plugins such as bitlbee-steam or bitlbee-facebook is <emphasis>required</emphasis>!
+</para>
+
+<simplelist>
+        <member><emphasis>twitter:</emphasis> Filter channels - Search by keyword/hashtag or a list of users. See the <emphasis>HowtoTwitter</emphasis> wiki page for more details!</member>
+        <member><emphasis>twitter:</emphasis> Add "rawreply" command, like reply but bitlbee won't add @mention. Also add "favorite" / "fav" command aliases.</member>
+        <member><emphasis>twitter:</emphasis> Start stream from last tweet on connect/reconnect to avoid showing duplicate tweets</member>
+        <member><emphasis>jabber:</emphasis> Fixed crashes with file transfers (they still fail at bypassing NATs, but at least they fail without crashing)</member>
+        <member><emphasis>purple:</emphasis> Improved support for gadugadu, whatsapp and telegram.</member>
+        <member><emphasis>msn:</emphasis> disabled in this release since the protocol we used (MSNP18) stopped working.</member>
+        <member>Add a 'pattern' parameter to the blist command, to filter it.</member>
+        <member>The <emphasis>utf8_nicks</emphasis> setting should be more reliable now.</member>
+</simplelist>
+
+<para>
+See the full changelog for details!
+</para>
+
+</sect1>
+
 </chapter>

help.c

@@ -30 +30 @@
 #undef write
 
-#define BUFSIZE 1100
+#define BUFSIZE 2048
 
 help_t *help_init(help_t **help, const char *helpfile)

ipc.c

@@ -776 +776 @@
         }
 
+        child_list = g_slist_remove(child_list, c);
+
         g_free(c->host);
         g_free(c->nick);
@@ -781 +783 @@
         g_free(c->password);
         g_free(c);
-
-        child_list = g_slist_remove(child_list, c);
 
         /* Also, if any child has a reference to this one, remove it. */

irc.c

@@ -764 +764 @@
                         irc_rootmsg(irc,
                                     "Welcome to the BitlBee gateway!\n\n"
+                                    "Running %s %s\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.");
+                                    "\x02identify\x02 command to identify yourself.",
+                                    PACKAGE, BITLBEE_VERSION);
 
                         /* This is for bug #209 (use PASS to identify to NickServ). */

irc.h

@@ -299 +299 @@
 void irc_channel_name_strip(char *name);
 int irc_channel_name_cmp(const char *a_, const char *b_);
+char *irc_channel_name_gen(irc_t *irc, const char *name);
+gboolean irc_channel_name_hint(irc_channel_t *ic, const char *name);
 void irc_channel_update_ops(irc_channel_t *ic, char *value);
 char *set_eval_irc_channel_ops(struct set *set, char *value);

irc_channel.c

@@ -556 +556 @@
 }
 
+gboolean irc_channel_is_unused(irc_t *irc, char *name)
+{
+        char *type, *chat_type;
+        irc_channel_t *oic;
+
+        if (!irc_channel_name_ok(name)) {
+                return FALSE;
+        }
+
+        if (!(oic = irc_channel_by_name(irc, name))) {
+                return TRUE;
+        }
+
+        type = set_getstr(&oic->set, "type");
+        chat_type = set_getstr(&oic->set, "chat_type");
+
+        if (type && chat_type && oic->data == FALSE &&
+            strcmp(type, "chat") == 0 &&
+            strcmp(chat_type, "groupchat") == 0) {
+                /* There's a channel with this name already, but it looks
+                   like it's not in use yet. Most likely the IRC client
+                   rejoined the channel after a reconnect. Remove it so
+                   we can reuse its name. */
+                irc_channel_free(oic);
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+char *irc_channel_name_gen(irc_t *irc, const char *hint)
+{
+        char name[MAX_NICK_LENGTH + 1] = { 0 };
+        char *translit_name;
+        gsize bytes_written;
+
+        translit_name = g_convert_with_fallback(hint, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, &bytes_written, NULL);
+        if (bytes_written > MAX_NICK_LENGTH) {
+                translit_name[MAX_NICK_LENGTH] = '\0';
+        }
+
+        name[0] = '#';
+        strncpy(name + 1, translit_name, MAX_NICK_LENGTH - 1);
+        name[MAX_NICK_LENGTH] = '\0';
+
+        g_free(translit_name);
+
+        irc_channel_name_strip(name);
+
+        if (set_getbool(&irc->b->set, "lcnicks")) {
+                nick_lc(irc, name + 1);
+        }
+
+        while (!irc_channel_is_unused(irc, name)) {
+                underscore_dedupe(name);
+        }
+
+        return g_strdup(name);
+}
+
+gboolean irc_channel_name_hint(irc_channel_t *ic, const char *name)
+{
+        irc_t *irc = ic->irc;
+        char *full_name;
+
+        /* Don't rename a channel if the user's in it already. */
+        if (ic->flags & IRC_CHANNEL_JOINED) {
+                return FALSE;
+        }
+
+        if (!(full_name = irc_channel_name_gen(irc, name))) {
+                return FALSE;
+        }
+
+        g_free(ic->name);
+        ic->name = full_name;
+
+        return TRUE;
+}
+
 static gint irc_channel_user_cmp(gconstpointer a_, gconstpointer b_)
 {

irc_im.c

@@ -235 +235 @@
                         } else {
                                 /* Modules can swallow messages. */
-                                return TRUE;
+                                goto cleanup;
                         }
                 }
@@ -250 +250 @@
         wrapped = word_wrap(msg, 425);
         irc_send_msg(iu, "PRIVMSG", dst, wrapped, prefix);
-
         g_free(wrapped);
+
+cleanup:
         g_free(prefix);
         g_free(msg);
@@ -291 +292 @@
 
         irc_send_msg((irc_user_t *) bu->ui_data, "NOTICE", irc->user->nick, msg->str, NULL);
+
+        g_string_free(msg, TRUE);
 
         return TRUE;
@@ -693 +696 @@
 static gboolean bee_irc_chat_name_hint(bee_t *bee, struct groupchat *c, const char *name)
 {
-        irc_t *irc = bee->ui_data;
-        irc_channel_t *ic = c->ui_data, *oic;
-        char stripped[MAX_NICK_LENGTH + 1], *full_name;
-
-        if (ic == NULL) {
-                return FALSE;
-        }
-
-        /* Don't rename a channel if the user's in it already. */
-        if (ic->flags & IRC_CHANNEL_JOINED) {
-                return FALSE;
-        }
-
-        strncpy(stripped, name, MAX_NICK_LENGTH);
-        stripped[MAX_NICK_LENGTH] = '\0';
-        irc_channel_name_strip(stripped);
-        if (set_getbool(&bee->set, "lcnicks")) {
-                nick_lc(irc, stripped);
-        }
-
-        if (stripped[0] == '\0') {
-                return FALSE;
-        }
-
-        full_name = g_strdup_printf("#%s", stripped);
-        if ((oic = irc_channel_by_name(irc, full_name))) {
-                char *type, *chat_type;
-
-                type = set_getstr(&oic->set, "type");
-                chat_type = set_getstr(&oic->set, "chat_type");
-
-                if (type && chat_type && oic->data == FALSE &&
-                    strcmp(type, "chat") == 0 &&
-                    strcmp(chat_type, "groupchat") == 0) {
-                        /* There's a channel with this name already, but it looks
-                           like it's not in use yet. Most likely the IRC client
-                           rejoined the channel after a reconnect. Remove it so
-                           we can reuse its name. */
-                        irc_channel_free(oic);
-                } else {
-                        g_free(full_name);
-                        return FALSE;
-                }
-        }
-
-        g_free(ic->name);
-        ic->name = full_name;
-
-        return TRUE;
+        return irc_channel_name_hint(c->ui_data, name);
 }
 

irc_send.c

@@ -55 +55 @@
 {
         char motd[2048];
-        size_t len;
+        ssize_t len;
         int fd;
 

lib/misc.c

@@ -719 +719 @@
                         }
 
-                        /* Make sure we're still inside the string */
-                        if (i >= len) {
-                                return(NULL);
-                        }
-
                         /* Copy the found data */
                         return(g_strndup(ret, text + i - ret));

lib/oauth.c

@@ -98 +98 @@
         GSList *l, *n;
 
-        if (params == NULL) {
+        if (!params) {
                 return;
         }
@@ -104 +104 @@
         for (l = *params; l; l = n) {
                 n = l->next;
-
-                if (strncmp((char *) l->data, key, key_len) == 0 &&
-                    ((char *) l->data)[key_len] == '=') {
-                        g_free(l->data);
-                        *params = g_slist_remove(*params, l->data);
+                char *data = l->data;
+
+                if (strncmp(data, key, key_len) == 0 && data[key_len] == '=') {
+                        *params = g_slist_remove(*params, data);
+                        g_free(data);
                 }
         }

lib/proxy.c

@@ -63 +63 @@
 static int proxy_connect_none(const char *host, unsigned short port_, struct PHB *phb);
 
-static gboolean gaim_io_connected(gpointer data, gint source, b_input_condition cond)
+static gboolean phb_close(struct PHB *phb)
+{
+        close(phb->fd);
+        phb->func(phb->data, -1, B_EV_IO_READ);
+        g_free(phb->host);
+        g_free(phb);
+        return FALSE;
+}
+
+static gboolean proxy_connected(gpointer data, gint source, b_input_condition cond)
 {
         struct PHB *phb = data;
@@ -80 +89 @@
                                 dup2(new_fd, source);
                                 closesocket(new_fd);
-                                phb->inpa = b_input_add(source, B_EV_IO_WRITE, gaim_io_connected, phb);
+                                phb->inpa = b_input_add(source, B_EV_IO_WRITE, proxy_connected, phb);
                                 return FALSE;
                         }
                 }
-                freeaddrinfo(phb->gai);
                 closesocket(source);
-                b_event_remove(phb->inpa);
-                phb->inpa = 0;
-                if (phb->proxy_func) {
-                        phb->proxy_func(phb->proxy_data, -1, B_EV_IO_READ);
-                } else {
-                        phb->func(phb->data, -1, B_EV_IO_READ);
-                        g_free(phb);
-                }
-                return FALSE;
-        }
+                source = -1;
+                /* socket is dead, but continue to clean up */
+        } else {
+                sock_make_blocking(source);
+        }
+
         freeaddrinfo(phb->gai);
-        sock_make_blocking(source);
         b_event_remove(phb->inpa);
         phb->inpa = 0;
@@ -160 +163 @@
                         continue;
                 } else {
-                        phb->inpa = b_input_add(fd, B_EV_IO_WRITE, gaim_io_connected, phb);
+                        phb->inpa = b_input_add(fd, B_EV_IO_WRITE, proxy_connected, phb);
                         phb->fd = fd;
 
@@ -206 +209 @@
         }
 
-        close(source);
-        phb->func(phb->data, -1, B_EV_IO_READ);
-        g_free(phb->host);
-        g_free(phb);
-
-        return FALSE;
+        return phb_close(phb);
 }
 
@@ -226 +224 @@
         len = sizeof(error);
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
         sock_make_blocking(source);
@@ -237 +231 @@
                    phb->host, phb->port);
         if (send(source, cmd, strlen(cmd), 0) < 0) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
 
@@ -252 +242 @@
                 g_free(t2);
                 if (send(source, cmd, strlen(cmd), 0) < 0) {
-                        close(source);
-                        phb->func(phb->data, -1, B_EV_IO_READ);
-                        g_free(phb->host);
-                        g_free(phb);
-                        return FALSE;
+                        return phb_close(phb);
                 }
         }
@@ -262 +248 @@
         g_snprintf(cmd, sizeof(cmd), "\r\n");
         if (send(source, cmd, strlen(cmd), 0) < 0) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
 
@@ -302 +284 @@
         }
 
-        close(source);
-        phb->func(phb->data, -1, B_EV_IO_READ);
-        g_free(phb->host);
-        g_free(phb);
-
-        return FALSE;
+        return phb_close(phb);
 }
 
@@ -323 +300 @@
         len = sizeof(error);
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
         sock_make_blocking(source);
@@ -333 +306 @@
         /* XXX does socks4 not support host name lookups by the proxy? */
         if (!(hp = gethostbyname(phb->host))) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
 
@@ -350 +319 @@
         packet[8] = 0;
         if (write(source, packet, 9) != 9) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
 
@@ -383 +348 @@
 
         if (read(source, buf, 10) < 10) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
         if ((buf[0] != 0x05) || (buf[1] != 0x00)) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
 
@@ -420 +377 @@
 
         if (write(source, buf, (5 + strlen(phb->host) + 2)) < (5 + strlen(phb->host) + 2)) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
+                phb_close(phb);
                 return;
         }
@@ -438 +392 @@
 
         if (read(source, buf, 2) < 2) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
 
         if ((buf[0] != 0x01) || (buf[1] != 0x00)) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
 
@@ -466 +412 @@
 
         if (read(source, buf, 2) < 2) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
 
         if ((buf[0] != 0x05) || (buf[1] == 0xff)) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
 
@@ -489 +427 @@
                 memcpy(buf + 2 + i + 1, proxypass, j);
                 if (write(source, buf, 3 + i + j) < 3 + i + j) {
-                        close(source);
-                        phb->func(phb->data, -1, B_EV_IO_READ);
-                        g_free(phb->host);
-                        g_free(phb);
-                        return FALSE;
+                        return phb_close(phb);
                 }
 
@@ -517 +451 @@
         len = sizeof(error);
         if (getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
         sock_make_blocking(source);
@@ -539 +469 @@
 
         if (write(source, buf, i) < i) {
-                close(source);
-                phb->func(phb->data, -1, B_EV_IO_READ);
-                g_free(phb->host);
-                g_free(phb);
-                return FALSE;
+                return phb_close(phb);
         }
 

lib/ssl_gnutls.c

@@ -124 +124 @@
 
         if (conn->fd < 0) {
+                g_free(conn->hostname);
                 g_free(conn);
                 return NULL;
@@ -314 +315 @@
         if (source == -1) {
                 conn->func(conn->data, 0, NULL, cond);
+                g_free(conn->hostname);
                 g_free(conn);
                 return FALSE;
@@ -355 +357 @@
                         conn->func(conn->data, 0, NULL, cond);
 
-                        gnutls_deinit(conn->session);
-                        closesocket(conn->fd);
-
-                        g_free(conn);
+                        ssl_disconnect(conn);
                 }
         } else {
@@ -364 +363 @@
                         conn->func(conn->data, stver, NULL, cond);
 
-                        gnutls_deinit(conn->session);
-                        closesocket(conn->fd);
-
-                        g_free(conn);
+                        ssl_disconnect(conn);
                 } else {
                         /* For now we can't handle non-blocking perfectly everywhere... */

nick.c

@@ -214 +214 @@
 }
 
+/* Used for nicks and channel names too! */
+void underscore_dedupe(char nick[MAX_NICK_LENGTH + 1])
+{
+        if (strlen(nick) < (MAX_NICK_LENGTH - 1)) {
+                nick[strlen(nick) + 1] = 0;
+                nick[strlen(nick)] = '_';
+        } else {
+                /* We've got no more space for underscores,
+                   so truncate it and replace the last three
+                   chars with a random "_XX" suffix */
+                int len = truncate_utf8(nick, MAX_NICK_LENGTH - 3);
+                nick[len] = '_';
+                g_snprintf(nick + len + 1, 3, "%2x", rand());
+        }
+}
+
 void nick_dedupe(bee_user_t *bu, char nick[MAX_NICK_LENGTH + 1])
 {
@@ -224 +240 @@
         while (!nick_ok(irc, nick) ||
                ((iu = irc_user_by_name(irc, nick)) && iu->bu != bu)) {
-                if (strlen(nick) < (MAX_NICK_LENGTH - 1)) {
-                        nick[strlen(nick) + 1] = 0;
-                        nick[strlen(nick)] = '_';
-                } else {
-                        /* We've got no more space for underscores,
-                           so truncate it and replace the last three
-                           chars with a random "_XX" suffix */
-                        int len = truncate_utf8(nick, MAX_NICK_LENGTH - 3);
-                        nick[len] = '_';
-                        g_snprintf(nick + len + 1, 3, "%2x", rand());
-                }
+
+                underscore_dedupe(nick);
 
                 if (inf_protection-- == 0) {

nick.h

@@ -28 +28 @@
 char *nick_get(bee_user_t *bu);
 char *nick_gen(bee_user_t *bu);
+void underscore_dedupe(char nick[MAX_NICK_LENGTH + 1]);
 void nick_dedupe(bee_user_t * bu, char nick[MAX_NICK_LENGTH + 1]);
 int nick_saved(bee_user_t *bu);

otr.c

@@ -287 +287 @@
 void otr_irc_free(irc_t *irc)
 {
+        set_t *s;
         otr_t *otr = irc->otr;
 
@@ -292 +293 @@
         b_event_remove(otr->timer);
         otrl_userstate_free(otr->us);
+
+        s = set_find(&irc->b->set, "otr_policy");
+        g_slist_free(s->eval_data);
+
         if (otr->keygen) {
                 kill(otr->keygen, SIGTERM);
@@ -434 +439 @@
                                             ic->acc->user, ic->acc->prpl->name, iu->bu->handle, msg, &newmsg,
                                             &tlvs, NULL, NULL, NULL);
+
+        if (tlvs) {
+                otrl_tlv_free(tlvs);
+        }
 
         if (ignore_msg) {
@@ -472 +481 @@
                 /* libotr wants us to replace our message */
                 /* NB: caller will free old msg */
-                msg = g_strdup(otrmsg);
+                msg = st ? NULL : g_strdup(otrmsg);
                 otrl_message_free(otrmsg);
         }
@@ -1325 +1334 @@
 
         log_message(LOGLVL_INFO, "otr: %s", msg);
+
+        g_free(msg);
 }
 
@@ -2075 +2086 @@
         }
 }
-
-/* vim: set noet ts=4 sw=4: */

protocols/bee.h

@@ -154 +154 @@
 G_MODULE_EXPORT void imcb_buddy_times(struct im_connection *ic, const char *handle, time_t login, time_t idle);
 /* Call when a handle says something. 'flags' and 'sent_at may be just 0. */
-G_MODULE_EXPORT void imcb_buddy_msg(struct im_connection *ic, const char *handle, char *msg, guint32 flags,
+G_MODULE_EXPORT void imcb_buddy_msg(struct im_connection *ic, const char *handle, const char *msg, guint32 flags,
                                     time_t sent_at);
 

protocols/bee_user.c

@@ -68 +68 @@
         }
 
+        bee->users = g_slist_remove(bee->users, bu);
+
         g_free(bu->handle);
         g_free(bu->fullname);
@@ -74 +76 @@
         g_free(bu->status_msg);
         g_free(bu);
-
-        bee->users = g_slist_remove(bee->users, bu);
 
         return 1;
@@ -247 +247 @@
 }
 
-void imcb_buddy_msg(struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at)
+void imcb_buddy_msg(struct im_connection *ic, const char *handle, const char *msg, uint32_t flags, time_t sent_at)
 {
         bee_t *bee = ic->bee;

protocols/jabber/Makefile

@@ -13 +13 @@
 
 # [SH] Program variables
-objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o
+objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o hipchat.o
 
 LFLAGS += -r

protocols/jabber/conference.c

@@ -359 +359 @@
 
         if (subject && chat) {
-                s = bud ? strchr(bud->ext_jid, '/') : NULL;
+                s = (bud && bud->ext_jid) ? strchr(bud->ext_jid, '/') : NULL;
                 if (s) {
                         *s = 0;
@@ -419 +419 @@
         }
         if (body && body->text_len > 0) {
-                s = strchr(bud->ext_jid, '/');
+                s = (bud->ext_jid) ? strchr(bud->ext_jid, '/') : NULL;
                 if (s) {
                         *s = 0;

protocols/jabber/iq.c

@@ -27 +27 @@
 static xt_status jabber_parse_roster(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 static xt_status jabber_iq_display_vcard(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
-static int jabber_iq_disco_server(struct im_connection *ic);
 
 xt_status jabber_pkt_iq(struct xt_node *node, gpointer data)
@@ -374 +373 @@
 static xt_status jabber_parse_roster(struct im_connection *ic, struct xt_node *node, struct xt_node *orig)
 {
+        struct jabber_data *jd = ic->proto_data;
         struct xt_node *query, *c;
         int initial = (orig != NULL);
@@ -388 +388 @@
                 char *name = xt_find_attr(c, "name");
                 char *sub = xt_find_attr(c, "subscription");
+                char *mention_name = xt_find_attr(c, "mention_name");
 
                 if (jid && sub) {
@@ -396 +397 @@
                                 if (name) {
                                         imcb_rename_buddy(ic, jid, name);
+                                }
+
+                                /* This could also be used to set the full name as nick for fb/gtalk,
+                                 * but i'm keeping the old (ugly?) default behavior just to be safe */
+                                if (mention_name && (jd->flags & JFLAG_HIPCHAT)) {
+                                        imcb_buddy_nick_hint(ic, jid, mention_name);
                                 }
                         } else if (strcmp(sub, "remove") == 0) {
@@ -855 +862 @@
                                                  struct xt_node *node, struct xt_node *orig);
 
-static int jabber_iq_disco_server(struct im_connection *ic)
+int jabber_iq_disco_server(struct im_connection *ic)
 {
         struct xt_node *node, *iq;

protocols/jabber/jabber.c

@@ -61 +61 @@
         s = set_add(&acc->set, "activity_timeout", "600", set_eval_int, acc);
 
-        s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
-
         s = set_add(&acc->set, "display_name", NULL, NULL, acc);
 
@@ -83 +81 @@
         s = set_add(&acc->set, "server", NULL, set_eval_account, acc);
         s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
+
+        if (strcmp(acc->prpl->name, "hipchat") == 0) {
+                set_setstr(&acc->set, "server", "chat.hipchat.com");
+        } else {
+                s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+        }
 
         s = set_add(&acc->set, "ssl", "false", set_eval_bool, acc);
@@ -121 +125 @@
 
         jd->fd = jd->r_inpa = jd->w_inpa = -1;
+
+        if (strcmp(acc->prpl->name, "hipchat") == 0) {
+                jd->flags |= JFLAG_HIPCHAT;
+        }
 
         if (jd->server == NULL) {
@@ -656 +664 @@
 {
         struct prpl *ret = g_new0(struct prpl, 1);
+        struct prpl *hipchat = NULL;
 
         ret->name = "jabber";
@@ -686 +695 @@
 
         register_protocol(ret);
-}
+
+        /* Another one for hipchat, which has completely different logins */
+        hipchat = g_memdup(ret, sizeof(struct prpl));
+        hipchat->name = "hipchat";
+        register_protocol(hipchat);
+}

protocols/jabber/jabber.h

@@ -48 +48 @@
 
         JFLAG_GTALK =  0x100000,        /* Is Google Talk, as confirmed by iq discovery */
+        JFLAG_HIPCHAT = 0x200000,       /* Is hipchat, because prpl->name says so */
 
         JFLAG_SASL_FB = 0x10000,        /* Trying Facebook authentication. */
@@ -235 +236 @@
 #define XMLNS_IBB          "http://jabber.org/protocol/ibb"                      /* XEP-0047 */
 
+/* Hipchat protocol extensions*/
+#define XMLNS_HIPCHAT         "http://hipchat.com"
+#define XMLNS_HIPCHAT_PROFILE "http://hipchat.com/protocol/profile"
+
 /* jabber.c */
 void jabber_connect(struct im_connection *ic);
@@ -249 +254 @@
 xt_status jabber_iq_query_server(struct im_connection *ic, char *jid, char *xmlns);
 void jabber_iq_version_send(struct im_connection *ic, struct jabber_buddy *bud, void *data);
+int jabber_iq_disco_server(struct im_connection *ic);
 
 /* si.c */
@@ -341 +347 @@
 void jabber_chat_invite(struct groupchat *c, char *who, char *message);
 
+/* hipchat.c */
+int jabber_get_hipchat_profile(struct im_connection *ic);
+xt_status jabber_parse_hipchat_profile(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
+xt_status hipchat_handle_success(struct im_connection *ic, struct xt_node *node);
+
 #endif

protocols/jabber/jabber_util.c

@@ -566 +566 @@
 
         if ((s = strchr(jid, '=')) == NULL) {
+                g_free(jid);
                 return NULL;
         }

protocols/jabber/s5bytestream.c

@@ -23 +23 @@
 
 #include "jabber.h"
-#include "sha1.h"
 #include "lib/ftutil.h"
 #include <poll.h>
@@ -42 +41 @@
 
         /* SHA1( SID + Initiator JID + Target JID) */
-        char *pseudoadr;
+        char *pseudoaddr;
 
         gint connect_timeout;
@@ -130 +129 @@
         }
 
-        g_free(bt->pseudoadr);
+        g_free(bt->pseudoaddr);
 
         while (bt->streamhosts) {
@@ -254 +253 @@
 }
 
+void jabber_bs_remove_events(struct bs_transfer *bt)
+{
+        struct jabber_transfer *tf = bt->tf;
+
+        if (tf->watch_out) {
+                b_event_remove(tf->watch_out);
+                tf->watch_out = 0;
+        }
+
+        if (tf->watch_in) {
+                b_event_remove(tf->watch_in);
+                tf->watch_in = 0;
+        }
+
+        if (tf->fd != -1) {
+                closesocket(tf->fd);
+                tf->fd = -1;
+        }
+
+        if (bt->connect_timeout) {
+                b_event_remove(bt->connect_timeout);
+                bt->connect_timeout = 0;
+        }
+}
+
 /* Bad luck */
 void jabber_bs_canceled(file_transfer_t *ft, char *reason)
@@ -260 +284 @@
 
         imcb_log(tf->ic, "File transfer aborted: %s", reason);
+}
+
+static struct jabber_transfer *get_ft_by_sid(GSList *tflist, char *sid) {
+        GSList *l;
+        for (l = tflist; l; l = g_slist_next(l)) {
+                struct jabber_transfer *tft = l->data;
+                if ((strcmp(tft->sid, sid) == 0)) { 
+                        return tft;
+                }
+        }
+        return NULL;
+}
+
+/* SHA1( SID + Initiator JID + Target JID ) is given to the streamhost which it will match against the initiator's value
+ * Returns a newly allocated string */
+static char *generate_pseudoaddr(char *sid, char *ini_jid, char *tgt_jid) {
+        char *contents = g_strconcat(sid, ini_jid, tgt_jid, NULL);
+        char *hash_hex = g_compute_checksum_for_string(G_CHECKSUM_SHA1, contents, -1);
+        g_free(contents);
+        return hash_hex;
+}
+
+static jabber_streamhost_t *jabber_streamhost_new(char *jid, char *host, int port)
+{
+        jabber_streamhost_t *sh = g_new0(jabber_streamhost_t, 1);
+        sh->jid = g_strdup(jid);
+        sh->host = g_strdup(host);
+        if (port) {
+                g_snprintf(sh->port, sizeof(sh->port), "%u", port);
+        }
+        return sh;
 }
 
@@ -270 +325 @@
         struct jabber_data *jd = ic->proto_data;
         struct jabber_transfer *tf = NULL;
-        GSList *tflist;
         struct bs_transfer *bt;
         GSList *shlist = NULL;
         struct xt_node *shnode;
-
-        sha1_state_t sha;
-        char hash_hex[41];
-        unsigned char hash[20];
-        int i;
 
         if (!(iq_id   = xt_find_attr(node, "id")) ||
@@ -303 +352 @@
                     (port_s = xt_find_attr(shnode, "port")) &&
                     (sscanf(port_s, "%d", &port) == 1)) {
-                        jabber_streamhost_t *sh = g_new0(jabber_streamhost_t, 1);
-                        sh->jid = g_strdup(jid);
-                        sh->host = g_strdup(host);
-                        sprintf(sh->port, "%u", port);
-                        shlist = g_slist_append(shlist, sh);
+                        shlist = g_slist_append(shlist, jabber_streamhost_new(jid, host, port));
                 }
                 shnode = shnode->next;
@@ -317 +362 @@
         }
 
-        /* Let's see if we can find out what this bytestream should be for... */
-
-        for (tflist = jd->filetransfers; tflist; tflist = g_slist_next(tflist)) {
-                struct jabber_transfer *tft = tflist->data;
-                if ((strcmp(tft->sid, sid) == 0) &&
-                    (strcmp(tft->ini_jid, ini_jid) == 0) &&
-                    (strcmp(tft->tgt_jid, tgt_jid) == 0)) {
-                        tf = tft;
-                        break;
-                }
-        }
-
-        if (!tf) {
+        if (!(tf = get_ft_by_sid(jd->filetransfers, sid))) {
                 imcb_log(ic, "WARNING: Received bytestream request from %s that doesn't match an SI request", ini_jid);
                 return XT_HANDLED;
@@ -339 +372 @@
 
         tf->ft->canceled = jabber_bs_canceled;
-
-        /* SHA1( SID + Initiator JID + Target JID ) is given to the streamhost which it will match against the initiator's value */
-        sha1_init(&sha);
-        sha1_append(&sha, (unsigned char *) sid, strlen(sid));
-        sha1_append(&sha, (unsigned char *) ini_jid, strlen(ini_jid));
-        sha1_append(&sha, (unsigned char *) tgt_jid, strlen(tgt_jid));
-        sha1_finish(&sha, hash);
-
-        for (i = 0; i < 20; i++) {
-                sprintf(hash_hex + i * 2, "%02x", hash[i]);
-        }
 
         bt = g_new0(struct bs_transfer, 1);
@@ -356 +378 @@
         bt->sh = shlist->data;
         bt->phase = BS_PHASE_CONNECT;
-        bt->pseudoadr = g_strdup(hash_hex);
+        bt->pseudoaddr = generate_pseudoaddr(sid, ini_jid, tgt_jid);
         tf->streamhandle = bt;
         tf->ft->free = jabber_bs_free_transfer;
@@ -451 +473 @@
                         .rsv = 0,
                         .atyp = 0x03,
-                        .addrlen = strlen(bt->pseudoadr),
+                        .addrlen = strlen(bt->pseudoaddr),
                         .port = 0
                 };
@@ -468 +490 @@
 
                 /* copy hash into connect message */
-                memcpy(socks5_connect.address, bt->pseudoadr, socks5_connect.addrlen);
+                memcpy(socks5_connect.address, bt->pseudoaddr, socks5_connect.addrlen);
 
                 ASSERTSOCKOP(send(fd, &socks5_connect, sizeof(struct socks5_message), 0), "Sending SOCKS5 Connect");
@@ -558 +580 @@
         if (shlist && shlist->next) {
                 bt->sh = shlist->next->data;
+                jabber_bs_remove_events(bt);
                 return jabber_bs_recv_handshake(bt, -1, 0);
         }
@@ -731 +754 @@
         struct jabber_data *jd = ic->proto_data;
         struct bs_transfer *bt;
-        GSList *tflist;
         struct xt_node *c;
         char *sid, *jid;
@@ -750 +772 @@
         /* Let's see if we can find out what this bytestream should be for... */
 
-        for (tflist = jd->filetransfers; tflist; tflist = g_slist_next(tflist)) {
-                struct jabber_transfer *tft = tflist->data;
-                if ((strcmp(tft->sid, sid) == 0)) {
-                        tf = tft;
-                        break;
-                }
-        }
-
-        if (!tf) {
+        if (!(tf = get_ft_by_sid(jd->filetransfers, sid))) {
                 imcb_log(ic, "WARNING: Received SOCKS5 bytestream reply to unknown request");
                 return XT_HANDLED;
@@ -776 +790 @@
                 /* using a proxy, abort listen */
 
-                if (tf->watch_in) {
-                        b_event_remove(tf->watch_in);
-                        tf->watch_in = 0;
-                }
-
-                if (tf->fd != -1) {
-                        closesocket(tf->fd);
-                        tf->fd = -1;
-                }
-
-                if (bt->connect_timeout) {
-                        b_event_remove(bt->connect_timeout);
-                        bt->connect_timeout = 0;
-                }
+                jabber_bs_remove_events(bt);
 
                 GSList *shlist;
@@ -838 +839 @@
 {
         char *sid;
-        GSList *tflist;
         struct jabber_transfer *tf = NULL;
         struct xt_node *query;
@@ -846 +846 @@
         sid = xt_find_attr(query, "sid");
 
-        for (tflist = jd->filetransfers; tflist; tflist = g_slist_next(tflist)) {
-                struct jabber_transfer *tft = tflist->data;
-                if ((strcmp(tft->sid, sid) == 0)) {
-                        tf = tft;
-                        break;
-                }
-        }
-
-        if (!tf) {
+        if (!(tf = get_ft_by_sid(jd->filetransfers, sid))) {
                 imcb_log(ic, "WARNING: Received SOCKS5 bytestream activation for unknown stream");
                 return XT_HANDLED;
@@ -883 +875 @@
         *port++ = '\0';
 
-        sh = g_new0(jabber_streamhost_t, 1);
-        sh->jid = g_strdup(jid);
-        sh->host = g_strdup(host);
-        g_snprintf(sh->port, sizeof(sh->port), "%s", port);
+        sh = jabber_streamhost_new(jid, host, 0);
+        strncpy(sh->port, port, sizeof(sh->port));
 
         return sh;
@@ -910 +900 @@
                 if (strcmp(proxy, "<local>") == 0) {
                         if ((tf->fd = ft_listen(&tf->saddr, host, port, jd->fd, FALSE, &errmsg)) != -1) {
-                                sh = g_new0(jabber_streamhost_t, 1);
-                                sh->jid = g_strdup(tf->ini_jid);
-                                sh->host = g_strdup(host);
-                                g_snprintf(sh->port, sizeof(sh->port), "%s", port);
+                                sh = jabber_streamhost_new(tf->ini_jid, host, 0);
+                                strncpy(sh->port, port, sizeof(sh->port));
                                 bt->streamhosts = g_slist_append(bt->streamhosts, sh);
 
@@ -948 +936 @@
 {
         struct bs_transfer *bt;
-        sha1_state_t sha;
-        char hash_hex[41];
-        unsigned char hash[20];
-        int i, ret;
-
-        /* SHA1( SID + Initiator JID + Target JID ) is given to the streamhost which it will match against the initiator's value */
-        sha1_init(&sha);
-        sha1_append(&sha, (unsigned char *) tf->sid, strlen(tf->sid));
-        sha1_append(&sha, (unsigned char *) tf->ini_jid, strlen(tf->ini_jid));
-        sha1_append(&sha, (unsigned char *) tf->tgt_jid, strlen(tf->tgt_jid));
-        sha1_finish(&sha, hash);
-
-        for (i = 0; i < 20; i++) {
-                sprintf(hash_hex + i * 2, "%02x", hash[i]);
-        }
 
         bt = g_new0(struct bs_transfer, 1);
         bt->tf = tf;
         bt->phase = BS_PHASE_CONNECT;
-        bt->pseudoadr = g_strdup(hash_hex);
+        bt->pseudoaddr = generate_pseudoaddr(tf->sid, tf->ini_jid, tf->tgt_jid);
         tf->streamhandle = bt;
         tf->ft->free = jabber_bs_free_transfer;
@@ -974 +947 @@
         jabber_si_set_proxies(bt);
 
-        ret = jabber_bs_send_request(tf, bt->streamhosts);
-
-        return ret;
+        return jabber_bs_send_request(tf, bt->streamhosts);
 }
 
@@ -1139 +1110 @@
                                                socks5_connect.atyp);
                 }
-                if (!(memcmp(socks5_connect.address, bt->pseudoadr, 40) == 0)) {
+                if (!(memcmp(socks5_connect.address, bt->pseudoaddr, 40) == 0)) {
                         return jabber_bs_abort(bt, "SOCKS5 Connect message contained wrong digest");
                 }

protocols/jabber/sasl.c

@@ -42 +42 @@
         "https://www.facebook.com/dialog/oauth",
         "https://graph.facebook.com/oauth/access_token",
-        "http://www.bitlbee.org/main.php/Facebook/oauth2.html",
+        "https://www.bitlbee.org/main.php/Facebook/oauth2.html",
         "offline_access,xmpp_login",
         "126828914005625",
@@ -55 +55 @@
         char *s;
         int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0;
-        int want_oauth = FALSE;
+        int want_oauth = FALSE, want_hipchat = FALSE;
         GString *mechs;
 
@@ -75 +75 @@
 
         want_oauth = set_getbool(&ic->acc->set, "oauth");
+        want_hipchat = (jd->flags & JFLAG_HIPCHAT);
 
         mechs = g_string_new("");
@@ -111 +112 @@
 
         reply = xt_new_node("auth", NULL, NULL);
-        xt_add_attr(reply, "xmlns", XMLNS_SASL);
+        if (!want_hipchat) {
+                xt_add_attr(reply, "xmlns", XMLNS_SASL);
+        } else {
+                xt_add_attr(reply, "xmlns", XMLNS_HIPCHAT);
+        }
 
         if (sup_gtalk && want_oauth) {
@@ -143 +148 @@
         } else if (sup_plain) {
                 int len;
-
-                xt_add_attr(reply, "mechanism", "PLAIN");
+                GString *gs;
+                char *username;
+
+                if (!want_hipchat) {
+                        xt_add_attr(reply, "mechanism", "PLAIN");
+                        username = jd->username;
+                } else {
+                        username = jd->me;
+                }
+
+                /* set an arbitrary initial size to avoid reallocations */
+                gs = g_string_sized_new(128);
 
                 /* With SASL PLAIN in XMPP, the text should be b64(\0user\0pass) */
-                len = strlen(jd->username) + strlen(ic->acc->pass) + 2;
-                s = g_malloc(len + 1);
-                s[0] = 0;
-                strcpy(s + 1, jd->username);
-                strcpy(s + 2 + strlen(jd->username), ic->acc->pass);
+                g_string_append_c(gs, '\0');
+                g_string_append(gs, username);
+                g_string_append_c(gs, '\0');
+                g_string_append(gs, ic->acc->pass);
+                if (want_hipchat) {
+                        /* Hipchat's variation adds \0resource at the end */
+                        g_string_append_c(gs, '\0');
+                        g_string_append(gs, set_getstr(&ic->acc->set, "resource"));
+                }
+
+                len = gs->len;
+                s = g_string_free(gs, FALSE);
+
                 reply->text = base64_encode((unsigned char *) s, len);
                 reply->text_len = strlen(reply->text);
@@ -397 +420 @@
                 imcb_log(ic, "Authentication finished");
                 jd->flags |= JFLAG_AUTHENTICATED | JFLAG_STREAM_RESTART;
+
+                if (jd->flags & JFLAG_HIPCHAT) {
+                        return hipchat_handle_success(ic, node);
+                }
         } else if (strcmp(node->name, "failure") == 0) {
                 imcb_error(ic, "Authentication failure");

protocols/msn/Makefile

@@ -13 +13 @@
 
 # [SH] Program variables
-objects = msn.o msn_util.o ns.o sb.o soap.o tables.o
+objects = msn.o msn_util.o ns.o soap.o tables.o gw.o
 
 LFLAGS += -r

protocols/msn/msn.c

@@ -30 +30 @@
 int msn_chat_id;
 GSList *msn_connections;
-GSList *msn_switchboards;
 
 static char *set_eval_display_name(set_t *set, char *value);
@@ -41 +40 @@
         s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
-        s = set_add(&acc->set, "server", MSN_NS_HOST, set_eval_account, acc);
+        s = set_add(&acc->set, "server", NULL, set_eval_account, acc);
         s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
 
@@ -48 +47 @@
 
         set_add(&acc->set, "mail_notifications", "false", set_eval_bool, acc);
-        set_add(&acc->set, "switchboard_keepalives", "false", set_eval_bool, acc);
 
         acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE |
@@ -58 +56 @@
         struct im_connection *ic = imcb_new(acc);
         struct msn_data *md = g_new0(struct msn_data, 1);
+        char *server = set_getstr(&ic->acc->set, "server");
 
         ic->proto_data = md;
         ic->flags |= OPT_PONGS | OPT_PONGED;
+
+        if (!server) {
+                server = "geo.gateway.messenger.live.com";
+        }
 
         if (strchr(acc->user, '@') == NULL) {
@@ -71 +74 @@
         md->away_state = msn_away_state_list;
         md->domaintree = g_tree_new(msn_domaintree_cmp);
-        md->ns->fd = -1;
+        md->fd = -1;
+        md->is_http = TRUE;
 
         msn_connections = g_slist_prepend(msn_connections, ic);
 
         imcb_log(ic, "Connecting");
-        msn_ns_connect(ic, md->ns,
-                       set_getstr(&ic->acc->set, "server"),
+        msn_ns_connect(ic, server,
                        set_getint(&ic->acc->set, "port"));
 }
@@ -88 +91 @@
 
         if (md) {
-                /** Disabling MSN ft support for now.
-                while( md->filetransfers ) {
-                        imcb_file_canceled( md->filetransfers->data, "Closing connection" );
-                }
-                */
-
-                msn_ns_close(md->ns);
-
-                while (md->switchboards) {
-                        msn_sb_destroy(md->switchboards->data);
-                }
-
-                msn_msgq_purge(ic, &md->msgq);
+                msn_ns_close(md);
+
                 msn_soapq_flush(ic, FALSE);
 
@@ -112 +104 @@
                 while (md->groups) {
                         struct msn_group *mg = md->groups->data;
+                        md->groups = g_slist_remove(md->groups, mg);
                         g_free(mg->id);
                         g_free(mg->name);
                         g_free(mg);
-                        md->groups = g_slist_remove(md->groups, mg);
                 }
 
@@ -127 +119 @@
                 while (md->grpq) {
                         struct msn_groupadd *ga = md->grpq->data;
+                        md->grpq = g_slist_remove(md->grpq, ga);
                         g_free(ga->group);
                         g_free(ga->who);
                         g_free(ga);
-                        md->grpq = g_slist_remove(md->grpq, ga);
                 }
 
@@ -152 +144 @@
 {
         struct bee_user *bu = bee_user_by_handle(ic->bee, ic, who);
-        struct msn_buddy_data *bd = bu ? bu->data : NULL;
-        struct msn_switchboard *sb;
 
 #ifdef DEBUG
         if (strcmp(who, "raw") == 0) {
                 msn_ns_write(ic, -1, "%s\r\n", message);
-        } else
+                return 0;
+        }
 #endif
-        if (bd && bd->flags & MSN_BUDDY_FED) {
-                msn_ns_sendmessage(ic, bu, message);
-        } else if ((sb = msn_sb_by_handle(ic, who))) {
-                return(msn_sb_sendmessage(sb, message));
-        } else {
-                struct msn_message *m;
-
-                /* Create a message. We have to arrange a usable switchboard, and send the message later. */
-                m = g_new0(struct msn_message, 1);
-                m->who = g_strdup(who);
-                m->text = g_strdup(message);
-
-                return msn_sb_write_msg(ic, m);
-        }
-
+
+        msn_ns_sendmessage(ic, bu, message);
         return(0);
 }
@@ -196 +174 @@
 static void msn_set_away(struct im_connection *ic, char *state, char *message)
 {
-        char *uux;
         struct msn_data *md = ic->proto_data;
+        char *nick, *psm, *idle, *statecode, *body, *buf;
 
         if (state == NULL) {
@@ -205 +183 @@
         }
 
-        if (!msn_ns_write(ic, -1, "CHG %d %s %d:%02d\r\n", ++md->trId, md->away_state->code, MSN_CAP1, MSN_CAP2)) {
-                return;
-        }
-
-        uux = g_markup_printf_escaped("<EndpointData><Capabilities>%d:%02d"
-                                      "</Capabilities></EndpointData>",
-                                      MSN_CAP1, MSN_CAP2);
-        msn_ns_write(ic, -1, "UUX %d %zd\r\n%s", ++md->trId, strlen(uux), uux);
-        g_free(uux);
-
-        uux = g_markup_printf_escaped("<PrivateEndpointData><EpName>%s</EpName>"
-                                      "<Idle>%s</Idle><ClientType>%d</ClientType>"
-                                      "<State>%s</State></PrivateEndpointData>",
-                                      md->uuid,
-                                      strcmp(md->away_state->code, "IDL") ? "false" : "true",
-                                      1,  /* ? */
-                                      md->away_state->code);
-        msn_ns_write(ic, -1, "UUX %d %zd\r\n%s", ++md->trId, strlen(uux), uux);
-        g_free(uux);
-
-        uux = g_markup_printf_escaped("<Data><DDP></DDP><PSM>%s</PSM>"
-                                      "<CurrentMedia></CurrentMedia>"
-                                      "<MachineGuid>%s</MachineGuid></Data>",
-                                      message ? message : "", md->uuid);
-        msn_ns_write(ic, -1, "UUX %d %zd\r\n%s", ++md->trId, strlen(uux), uux);
-        g_free(uux);
+        statecode = (char *) md->away_state->code;
+        nick = set_getstr(&ic->acc->set, "display_name");
+        psm = message ? message : "";
+        idle = (strcmp(statecode, "IDL") == 0) ? "false" : "true";
+
+        body = g_markup_printf_escaped(MSN_PUT_USER_BODY,
+                nick, psm, psm, md->uuid, statecode, md->uuid, idle, statecode,
+                MSN_CAP1, MSN_CAP2, MSN_CAP1, MSN_CAP2
+        );
+
+        buf = g_strdup_printf(MSN_PUT_HEADERS, ic->acc->user, ic->acc->user, md->uuid,
+                "/user", "application/user+xml",
+                strlen(body), body);
+        msn_ns_write(ic, -1, "PUT %d %zd\r\n%s", ++md->trId, strlen(buf), buf);
+
+        g_free(buf);
+        g_free(body);
 }
 
@@ -256 +225 @@
 static void msn_chat_msg(struct groupchat *c, char *message, int flags)
 {
-        struct msn_switchboard *sb = msn_sb_by_chat(c);
-
-        if (sb) {
-                msn_sb_sendmessage(sb, message);
-        }
-        /* FIXME: Error handling (although this can't happen unless something's
-           already severely broken) disappeared here! */
+        /* TODO: groupchats*/
 }
 
 static void msn_chat_invite(struct groupchat *c, char *who, char *message)
 {
-        struct msn_switchboard *sb = msn_sb_by_chat(c);
-
-        if (sb) {
-                msn_sb_write(sb, "CAL %d %s\r\n", ++sb->trId, who);
-        }
+        /* TODO: groupchats*/
 }
 
 static void msn_chat_leave(struct groupchat *c)
 {
-        struct msn_switchboard *sb = msn_sb_by_chat(c);
-
-        if (sb) {
-                msn_sb_write(sb, "OUT\r\n");
-        }
+        /* TODO: groupchats*/
 }
 
 static struct groupchat *msn_chat_with(struct im_connection *ic, char *who)
 {
-        struct msn_switchboard *sb;
+        /* TODO: groupchats*/
         struct groupchat *c = imcb_chat_new(ic, who);
-
-        if ((sb = msn_sb_by_handle(ic, who))) {
-                debug("Converting existing switchboard to %s to a groupchat", who);
-                return msn_sb_to_chat(sb);
-        } else {
-                struct msn_message *m;
-
-                /* Create a magic message. This is quite hackish, but who cares? :-P */
-                m = g_new0(struct msn_message, 1);
-                m->who = g_strdup(who);
-                m->text = g_strdup(GROUPCHAT_SWITCHBOARD_MESSAGE);
-
-                msn_sb_write_msg(ic, m);
-
-                return c;
-        }
+        return c;
 }
 
@@ -322 +262 @@
 static void msn_add_deny(struct im_connection *ic, char *who)
 {
-        struct msn_switchboard *sb;
-
         msn_buddy_list_add(ic, MSN_BUDDY_BL, who, who, NULL);
-
-        /* If there's still a conversation with this person, close it. */
-        if ((sb = msn_sb_by_handle(ic, who))) {
-                msn_sb_destroy(sb);
-        }
 }
 
@@ -462 +395 @@
         ret->buddy_action = msn_buddy_action;
 
-        //ret->transfer_request = msn_ftp_transfer_request;
-
         register_protocol(ret);
 }

protocols/msn/msn.h

@@ -32 +32 @@
 #define NUDGE_MESSAGE "\r\r\rSHAKE THAT THING\r\r\r"
 #define GROUPCHAT_SWITCHBOARD_MESSAGE "\r\r\rME WANT TALK TO MANY PEOPLE\r\r\r"
-#define SB_KEEPALIVE_MESSAGE "\r\r\rDONT HANG UP ON ME!\r\r\r"
 
 #ifdef DEBUG_MSN
@@ -60 +59 @@
 #define MSNP11_PROD_KEY "C1BX{V4W}Q3*10SM"
 #define MSNP11_PROD_ID  "PROD0120PW!CCV9@"
-#define MSNP_VER        "MSNP18"
+#define MSNP_VER        "MSNP21"
 #define MSNP_BUILD      "14.0.8117.416"
 
@@ -68 +67 @@
 #define MSN_CAP2        0x0000
 
-#define MSN_MESSAGE_HEADERS "MIME-Version: 1.0\r\n" \
+#define MSN_BASE_HEADERS \
+        "Routing: 1.0\r\n" \
+        "To: 1:%s\r\n" \
+        "From: 1:%s;epid={%s}\r\n" \
+        "\r\n" \
+        "Reliability: 1.0\r\n" \
+        "\r\n"
+
+#define MSN_MESSAGE_HEADERS MSN_BASE_HEADERS \
+        "Messaging: 2.0\r\n" \
+        "Message-Type: Text\r\n" \
+        "Content-Length: %zd\r\n" \
         "Content-Type: text/plain; charset=UTF-8\r\n" \
-        "User-Agent: BitlBee " BITLBEE_VERSION "\r\n" \
-        "X-MMS-IM-Format: FN=MS%20Shell%20Dlg; EF=; CO=0; CS=0; PF=0\r\n" \
-        "\r\n"
+        "X-MMS-IM-Format: FN=Segoe%%20UI; EF=; CO=0; CS=0; PF=0\r\n" \
+        "\r\n" \
+        "%s"
+
+#define MSN_PUT_HEADERS MSN_BASE_HEADERS \
+        "Publication: 1.0\r\n" \
+        "Uri: %s\r\n" \
+        "Content-Type: %s\r\n" \
+        "Content-Length: %zd\r\n" \
+        "\r\n" \
+        "%s"
+
+#define MSN_PUT_USER_BODY \
+        "<user>" \
+        "<s n=\"PE\"><UserTileLocation></UserTileLocation><FriendlyName>%s</FriendlyName><PSM>%s</PSM><DDP></DDP>" \
+        "<Scene></Scene><ASN></ASN><ColorScheme>-3</ColorScheme><BDG></BDG><RUM>%s</RUM><RUL></RUL><RLT>0</RLT>" \
+        "<RID></RID><SUL></SUL><MachineGuid>%s</MachineGuid></s>" \
+        "<s n=\"IM\"><Status>%s</Status><CurrentMedia></CurrentMedia></s>" \
+        "<sep n=\"PD\"><ClientType>1</ClientType><EpName>%s</EpName><Idle>%s</Idle><State>%s</State></sep>" \
+        "<sep n=\"PE\"><VER>BitlBee:" BITLBEE_VERSION "</VER><TYP>1</TYP><Capabilities>%d:%d</Capabilities></sep>" \
+        "<sep n=\"IM\"><Capabilities>%d:%d</Capabilities></sep>" \
+        "</user>"
 
 #define MSN_TYPING_HEADERS "MIME-Version: 1.0\r\n" \
@@ -84 +113 @@
         "ID: 1\r\n" \
         "\r\n"
-
-#define MSN_SB_KEEPALIVE_HEADERS "MIME-Version: 1.0\r\n" \
-        "Content-Type: text/x-ping\r\n" \
-        "\r\n\r\n"
 
 #define PROFILE_URL "http://members.msn.com/"
@@ -99 +124 @@
 } msn_flags_t;
 
-struct msn_handler_data {
+struct msn_gw {
+        char *last_host;
+        int port;
+        gboolean ssl;
+
+        char *session_id;
+
+        GByteArray *in;
+        GByteArray *out;
+
+        int poll_timeout;
+
+        b_event_handler callback;
+
+        struct im_connection *ic;
+        struct msn_data *md;
+
+        gboolean open;
+        gboolean waiting;
+        gboolean polling;
+};
+
+struct msn_data {
         int fd, inpa;
         int rxlen;
@@ -107 +154 @@
         char *cmd_text;
 
-        /* Either ic or sb */
-        gpointer data;
-
-        int (*exec_command) (struct msn_handler_data *handler, char **cmd, int count);
-        int (*exec_message) (struct msn_handler_data *handler, char *msg, int msglen, char **cmd, int count);
-};
-
-struct msn_data {
         struct im_connection *ic;
 
-        struct msn_handler_data ns[1];
         msn_flags_t flags;
 
@@ -126 +164 @@
 
         GSList *msgq, *grpq, *soapq;
-        GSList *switchboards;
-        int sb_failures;
-        time_t first_sb_failure;
 
         const struct msn_away_state *away_state;
@@ -139 +174 @@
         GTree *domaintree;
         int adl_todo;
-};
-
-struct msn_switchboard {
-        struct im_connection *ic;
-
-        /* The following two are also in the handler. TODO: Clean up. */
-        int fd;
-        gint inp;
-        struct msn_handler_data *handler;
-        gint keepalive;
-
-        int trId;
-        int ready;
-
-        int session;
-        char *key;
-
-        GSList *msgq;
-        char *who;
-        struct groupchat *chat;
+
+        gboolean is_http;
+        struct msn_gw *gw;
 };
 
@@ -205 +223 @@
 #define STATUS_FATAL            1
 #define STATUS_SB_FATAL         2
-#define STATUS_SB_IM_SPARE      4       /* Make one-to-one conversation switchboard available again, invite failed. */
-#define STATUS_SB_CHAT_SPARE    8       /* Same, but also for groupchats (not used yet). */
 
 extern int msn_chat_id;
@@ -218 +234 @@
    before doing *anything* else. */
 extern GSList *msn_connections;
-extern GSList *msn_switchboards;
 
 /* ns.c */
 int msn_ns_write(struct im_connection *ic, int fd, const char *fmt, ...) G_GNUC_PRINTF(3, 4);
-gboolean msn_ns_connect(struct im_connection *ic, struct msn_handler_data *handler, const char *host, int port);
-void msn_ns_close(struct msn_handler_data *handler);
+gboolean msn_ns_connect(struct im_connection *ic, const char *host, int port);
+void msn_ns_close(struct msn_data *handler);
 void msn_auth_got_passport_token(struct im_connection *ic, const char *token, const char *error);
 void msn_auth_got_contact_list(struct im_connection *ic);
 int msn_ns_finish_login(struct im_connection *ic);
 int msn_ns_sendmessage(struct im_connection *ic, struct bee_user *bu, const char *text);
-void msn_ns_oim_send_queue(struct im_connection *ic, GSList **msgq);
+int msn_ns_command(struct msn_data *md, char **cmd, int num_parts);
+int msn_ns_message(struct msn_data *md, char *msg, int msglen, char **cmd, int num_parts);
 
 /* msn_util.c */
@@ -235 +251 @@
 int msn_buddy_list_remove(struct im_connection *ic, msn_buddy_flags_t list, const char *who, const char *group);
 void msn_buddy_ask(bee_user_t *bu);
-char **msn_linesplit(char *line);
-int msn_handler(struct msn_handler_data *h);
-void msn_msgq_purge(struct im_connection *ic, GSList **list);
+void msn_queue_feed(struct msn_data *h, char *bytes, int st);
+int msn_handler(struct msn_data *h);
 char *msn_p11_challenge(char *challenge);
 gint msn_domaintree_cmp(gconstpointer a_, gconstpointer b_);
@@ -251 +266 @@
 const struct msn_status_code *msn_status_by_number(int number);
 
-/* sb.c */
-int msn_sb_write(struct msn_switchboard *sb, const char *fmt, ...) G_GNUC_PRINTF(2, 3);;
-struct msn_switchboard *msn_sb_create(struct im_connection *ic, char *host, int port, char *key, int session);
-struct msn_switchboard *msn_sb_by_handle(struct im_connection *ic, const char *handle);
-struct msn_switchboard *msn_sb_by_chat(struct groupchat *c);
-struct msn_switchboard *msn_sb_spare(struct im_connection *ic);
-int msn_sb_sendmessage(struct msn_switchboard *sb, char *text);
-struct groupchat *msn_sb_to_chat(struct msn_switchboard *sb);
-void msn_sb_destroy(struct msn_switchboard *sb);
-gboolean msn_sb_connected(gpointer data, gint source, b_input_condition cond);
-int msn_sb_write_msg(struct im_connection *ic, struct msn_message *m);
-void msn_sb_start_keepalives(struct msn_switchboard *sb, gboolean initial);
-void msn_sb_stop_keepalives(struct msn_switchboard *sb);
+/* gw.c */
+struct msn_gw *msn_gw_new(struct im_connection *ic);
+void msn_gw_free(struct msn_gw *gw);
+void msn_gw_open(struct msn_gw *gw);
+ssize_t msn_gw_read(struct msn_gw *gw, char **buf);
+void msn_gw_write(struct msn_gw *gw, char *buf, size_t len);
 
 #endif //_MSN_H

protocols/msn/msn_util.c

@@ -55 +55 @@
 
         *groupid = '\0';
-#if 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[strlen(group) + 1];
-                                strcpy(groupname, group);
-                                http_encode(groupname);
-                                g_snprintf(buf, sizeof(buf), "ADG %d %s %d\r\n", ++md->trId, groupname, 0);
-                                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;
-                        }
-                }
-        }
-#endif
 
         if (!((bu = bee_user_by_handle(ic->bee, ic, who)) ||
@@ -132 +90 @@
 
         *groupid = '\0';
-#if 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;
-                        }
-                }
-        }
-#endif
 
         if (!(bu = bee_user_by_handle(ic->bee, ic, who)) ||
@@ -174 +121 @@
 };
 
-static void msn_buddy_ask_yes(void *data)
+static void msn_buddy_ask_free(void *data)
 {
         struct msn_buddy_ask_data *bla = data;
-
-        msn_buddy_list_add(bla->ic, MSN_BUDDY_AL, bla->handle, bla->realname, NULL);
-
-        imcb_ask_add(bla->ic, bla->handle, NULL);
 
         g_free(bla->handle);
@@ -187 +130 @@
 }
 
+static void msn_buddy_ask_yes(void *data)
+{
+        struct msn_buddy_ask_data *bla = data;
+
+        msn_buddy_list_add(bla->ic, MSN_BUDDY_AL, bla->handle, bla->realname, NULL);
+
+        imcb_ask_add(bla->ic, bla->handle, NULL);
+
+        msn_buddy_ask_free(bla);
+}
+
 static void msn_buddy_ask_no(void *data)
 {
@@ -193 +147 @@
         msn_buddy_list_add(bla->ic, MSN_BUDDY_BL, bla->handle, bla->realname, NULL);
 
-        g_free(bla->handle);
-        g_free(bla->realname);
-        g_free(bla);
+        msn_buddy_ask_free(bla);
 }
 
@@ -216 +168 @@
                    "The user %s (%s) wants to add you to his/her buddy list.",
                    bu->handle, bu->fullname);
-        imcb_ask(bu->ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no);
-}
-
-/* *NOT* thread-safe, but that's not a problem for now... */
-char **msn_linesplit(char *line)
-{
-        static char **ret = NULL;
-        static int size = 3;
-        int i, n = 0;
-
-        if (ret == NULL) {
-                ret = g_new0(char*, size);
-        }
-
-        for (i = 0; line[i] && line[i] == ' '; i++) {
-                ;
-        }
-        if (line[i]) {
-                ret[n++] = line + i;
-                for (i++; line[i]; i++) {
-                        if (line[i] == ' ') {
-                                line[i] = 0;
-                        } else if (line[i] != ' ' && !line[i - 1]) {
-                                ret[n++] = line + i;
-                        }
-
-                        if (n >= size) {
-                                ret = g_renew(char*, ret, size += 2);
-                        }
-                }
-        }
-        ret[n] = NULL;
-
-        return(ret);
+
+        imcb_ask_with_free(bu->ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no, msn_buddy_ask_free);
+}
+
+void msn_queue_feed(struct msn_data *h, char *bytes, int st)
+{
+        h->rxq = g_renew(char, h->rxq, h->rxlen + st);
+        memcpy(h->rxq + h->rxlen, bytes, st);
+        h->rxlen += st;
+
+        if (getenv("BITLBEE_DEBUG")) {
+                fprintf(stderr, "\n\x1b[92m<<< ");
+                write(2, bytes , st);
+                fprintf(stderr, "\x1b[97m");
+        }
 }
 
@@ -260 +193 @@
                    1: OK */
 
-int msn_handler(struct msn_handler_data *h)
-{
-        int st;
-
-        h->rxq = g_renew(char, h->rxq, h->rxlen + 1024);
-        st = read(h->fd, h->rxq + h->rxlen, 1024);
-        h->rxlen += st;
-
-        if (st <= 0) {
-                return(-1);
-        }
-
-        if (getenv("BITLBEE_DEBUG")) {
-                write(2, "->C:", 4);
-                write(2, h->rxq + h->rxlen - st, st);
-        }
+int msn_handler(struct msn_data *h)
+{
+        int st = 1;
 
         while (st) {
@@ -287 +207 @@
 
                                         cmd_text = g_strndup(h->rxq, i);
-                                        cmd = msn_linesplit(cmd_text);
-                                        for (count = 0; cmd[count]; count++) {
-                                                ;
-                                        }
-                                        st = h->exec_command(h, cmd, count);
+                                        cmd = g_strsplit_set(cmd_text, " ", -1);
+                                        count = g_strv_length(cmd);
+
+                                        st = msn_ns_command(h, cmd, count);
+
+                                        g_strfreev(cmd);
                                         g_free(cmd_text);
 
@@ -314 +235 @@
                         /* If we reached the end of the buffer, there's still an incomplete command there.
                            Return and wait for more data. */
-                        if (i == h->rxlen && h->rxq[i - 1] != '\r' && h->rxq[i - 1] != '\n') {
+                        if (i && i == h->rxlen && h->rxq[i - 1] != '\r' && h->rxq[i - 1] != '\n') {
                                 break;
                         }
@@ -327 +248 @@
 
                         msg = g_strndup(h->rxq, h->msglen);
-                        cmd = msn_linesplit(h->cmd_text);
-                        for (count = 0; cmd[count]; count++) {
-                                ;
-                        }
-
-                        st = h->exec_message(h, msg, h->msglen, cmd, count);
+
+                        cmd = g_strsplit_set(h->cmd_text, " ", -1);
+                        count = g_strv_length(cmd);
+
+                        st = msn_ns_message(h, msg, h->msglen, cmd, count);
+
+                        g_strfreev(cmd);
                         g_free(msg);
                         g_free(h->cmd_text);
@@ -366 +288 @@
 }
 
-void msn_msgq_purge(struct im_connection *ic, GSList **list)
-{
-        struct msn_message *m;
-        GString *ret;
-        GSList *l;
-        int n = 0;
-
-        l = *list;
-        if (l == NULL) {
-                return;
-        }
-
-        m = l->data;
-        ret = g_string_sized_new(1024);
-        g_string_printf(ret, "Warning: Cleaning up MSN (switchboard) connection with unsent "
-                        "messages to %s:", m->who ? m->who : "unknown recipient");
-
-        while (l) {
-                m = l->data;
-
-                if (strncmp(m->text, "\r\r\r", 3) != 0) {
-                        g_string_append_printf(ret, "\n%s", m->text);
-                        n++;
-                }
-
-                g_free(m->who);
-                g_free(m->text);
-                g_free(m);
-
-                l = l->next;
-        }
-        g_slist_free(*list);
-        *list = NULL;
-
-        if (n > 0) {
-                imcb_log(ic, "%s", ret->str);
-        }
-        g_string_free(ret, TRUE);
-}
-
 /* Copied and heavily modified from http://tmsnc.sourceforge.net/chl.c */
 char *msn_p11_challenge(char *challenge)
@@ -529 +411 @@
 int msn_ns_set_display_name(struct im_connection *ic, const char *value)
 {
-        struct msn_data *md = ic->proto_data;
-        char fn[strlen(value) * 3 + 1];
-
-        strcpy(fn, value);
-        http_encode(fn);
-
-        /* Note: We don't actually know if the server accepted the new name,
-           and won't give proper feedback yet if it doesn't. */
-        return msn_ns_write(ic, -1, "PRP %d MFN %s\r\n", ++md->trId, fn);
+        // TODO, implement this through msn_set_away's method
+        return 1;
 }
 

protocols/msn/ns.c

@@ -35 +35 @@
 static gboolean msn_ns_connected(gpointer data, gint source, b_input_condition cond);
 static gboolean msn_ns_callback(gpointer data, gint source, b_input_condition cond);
-static int msn_ns_command(struct msn_handler_data *handler, char **cmd, int num_parts);
-static int msn_ns_message(struct msn_handler_data *handler, char *msg, int msglen, char **cmd, int num_parts);
 
 static void msn_ns_send_adl_start(struct im_connection *ic);
 static void msn_ns_send_adl(struct im_connection *ic);
+static void msn_ns_structured_message(struct msn_data *md, char *msg, int msglen, char **cmd);
+static void msn_ns_sdg(struct msn_data *md, char *who, char **parts, char *action);
+static void msn_ns_nfy(struct msn_data *md, char *who, char **parts, char *action, gboolean is_put);
 
 int msn_ns_write(struct im_connection *ic, int fd, const char *fmt, ...)
@@ -54 +55 @@
 
         if (fd < 0) {
-                fd = md->ns->fd;
+                fd = md->fd;
         }
 
         if (getenv("BITLBEE_DEBUG")) {
-                fprintf(stderr, "->NS%d:%s\n", fd, out);
+                fprintf(stderr, "\x1b[91m>>>[NS%d] %s\n\x1b[97m", fd, out);
         }
 
         len = strlen(out);
-        st = write(fd, out, len);
+
+        if (md->is_http) {
+                st = len;
+                msn_gw_write(md->gw, out, len);
+        } else {
+                st = write(fd, out, len);
+        }
+
         g_free(out);
         if (st != len) {
@@ -73 +81 @@
 }
 
-gboolean msn_ns_connect(struct im_connection *ic, struct msn_handler_data *handler, const char *host, int port)
-{
-        if (handler->fd >= 0) {
-                closesocket(handler->fd);
-        }
-
-        handler->exec_command = msn_ns_command;
-        handler->exec_message = msn_ns_message;
-        handler->data = ic;
-        handler->fd = proxy_connect(host, port, msn_ns_connected, handler);
-        if (handler->fd < 0) {
+gboolean msn_ns_connect(struct im_connection *ic, const char *host, int port)
+{
+        struct msn_data *md = ic->proto_data;
+
+        if (md->fd >= 0) {
+                closesocket(md->fd);
+        }
+
+        if (md->is_http) {
+                md->gw = msn_gw_new(ic);
+                md->gw->callback = msn_ns_callback;
+                msn_ns_connected(md, -1, B_EV_IO_READ);
+        } else {
+                md->fd = proxy_connect(host, port, msn_ns_connected, md);
+                if (md->fd < 0) {
+                        imcb_error(ic, "Could not connect to server");
+                        imc_logout(ic, TRUE);
+                        return FALSE;
+                }
+        }
+
+        return TRUE;
+}
+
+static gboolean msn_ns_connected(gpointer data, gint source, b_input_condition cond)
+{
+        struct msn_data *md = data;
+        struct im_connection *ic = md->ic;
+
+        if (source == -1 && !md->is_http) {
                 imcb_error(ic, "Could not connect to server");
                 imc_logout(ic, TRUE);
@@ -89 +116 @@
         }
 
-        return TRUE;
-}
-
-static gboolean msn_ns_connected(gpointer data, gint source, b_input_condition cond)
-{
-        struct msn_handler_data *handler = data;
-        struct im_connection *ic = handler->data;
-        struct msn_data *md;
-
-        if (!g_slist_find(msn_connections, ic)) {
-                return FALSE;
-        }
-
-        md = ic->proto_data;
-
-        if (source == -1) {
-                imcb_error(ic, "Could not connect to server");
-                imc_logout(ic, TRUE);
-                return FALSE;
-        }
-
-        g_free(handler->rxq);
-        handler->rxlen = 0;
-        handler->rxq = g_new0(char, 1);
+        g_free(md->rxq);
+        md->rxlen = 0;
+        md->rxq = g_new0(char, 1);
 
         if (md->uuid == NULL) {
@@ -130 +136 @@
 
         if (msn_ns_write(ic, source, "VER %d %s CVR0\r\n", ++md->trId, MSNP_VER)) {
-                handler->inpa = b_input_add(handler->fd, B_EV_IO_READ, msn_ns_callback, handler);
+                if (!md->is_http) {
+                        md->inpa = b_input_add(md->fd, B_EV_IO_READ, msn_ns_callback, md);
+                }
                 imcb_log(ic, "Connected to server, waiting for reply");
         }
@@ -137 +145 @@
 }
 
-void msn_ns_close(struct msn_handler_data *handler)
-{
-        if (handler->fd >= 0) {
-                closesocket(handler->fd);
-                b_event_remove(handler->inpa);
-        }
-
-        handler->fd = handler->inpa = -1;
-        g_free(handler->rxq);
-        g_free(handler->cmd_text);
-
-        handler->rxlen = 0;
-        handler->rxq = NULL;
-        handler->cmd_text = NULL;
+void msn_ns_close(struct msn_data *md)
+{
+        if (md->gw) {
+                msn_gw_free(md->gw);
+        }
+        if (md->fd >= 0) {
+                closesocket(md->fd);
+                b_event_remove(md->inpa);
+        }
+
+        md->fd = md->inpa = -1;
+        g_free(md->rxq);
+        g_free(md->cmd_text);
+
+        md->rxlen = 0;
+        md->rxq = NULL;
+        md->cmd_text = NULL;
 }
 
 static gboolean msn_ns_callback(gpointer data, gint source, b_input_condition cond)
 {
-        struct msn_handler_data *handler = data;
-        struct im_connection *ic = handler->data;
-
-        if (msn_handler(handler) == -1) {  /* Don't do this on ret == 0, it's already done then. */
+        struct msn_data *md = data;
+        struct im_connection *ic = md->ic;
+        char *bytes;
+        int st;
+
+        if (md->is_http) {
+                st = msn_gw_read(md->gw, &bytes);
+        } else {
+                bytes = g_malloc(1024);
+                st = read(md->fd, bytes, 1024);
+        }
+
+        if (st <= 0) {
                 imcb_error(ic, "Error while reading from server");
                 imc_logout(ic, TRUE);
-
                 return FALSE;
-        } else {
-                return TRUE;
-        }
-}
-
-static int msn_ns_command(struct msn_handler_data *handler, char **cmd, int num_parts)
-{
-        struct im_connection *ic = handler->data;
-        struct msn_data *md = ic->proto_data;
+        }
+
+        msn_queue_feed(md, bytes, st);
+
+        g_free(bytes);
+
+        /* Ignore ret == 0, it's already disconnected then. */
+        msn_handler(md);
+
+        return TRUE;
+        
+}
+
+int msn_ns_command(struct msn_data *md, char **cmd, int num_parts)
+{
+        struct im_connection *ic = md->ic;
 
         if (num_parts == 0) {
@@ -185 +211 @@
                 }
 
-                return(msn_ns_write(ic, handler->fd, "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s\r\n",
+                return(msn_ns_write(ic, md->fd, "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s VmVyc2lvbjogMQ0KWGZyQ291bnQ6IDINClhmclNlbnRVVENUaW1lOiA2MzU2MTQ3OTU5NzgzOTAwMDANCklzR2VvWGZyOiB0cnVlDQo=\r\n",
                                     ++md->trId, ic->acc->user));
         } else if (strcmp(cmd[0], "CVR") == 0) {
                 /* We don't give a damn about the information we just received */
-                return msn_ns_write(ic, handler->fd, "USR %d SSO I %s\r\n", ++md->trId, ic->acc->user);
+                return msn_ns_write(ic, md->fd, "USR %d SSO I %s\r\n", ++md->trId, ic->acc->user);
         } else if (strcmp(cmd[0], "XFR") == 0) {
                 char *server;
@@ -195 +221 @@
 
                 if (num_parts >= 6 && strcmp(cmd[2], "NS") == 0) {
-                        b_event_remove(handler->inpa);
-                        handler->inpa = -1;
+                        b_event_remove(md->inpa);
+                        md->inpa = -1;
 
                         server = strchr(cmd[3], ':');
@@ -209 +235 @@
 
                         imcb_log(ic, "Transferring to other server");
-                        return msn_ns_connect(ic, handler, server, port);
-                } else if (num_parts >= 6 && strcmp(cmd[2], "SB") == 0) {
-                        struct msn_switchboard *sb;
-
-                        server = strchr(cmd[3], ':');
-                        if (!server) {
-                                imcb_error(ic, "Syntax error");
-                                imc_logout(ic, TRUE);
-                                return(0);
-                        }
-                        *server = 0;
-                        port = atoi(server + 1);
-                        server = cmd[3];
-
-                        if (strcmp(cmd[4], "CKI") != 0) {
-                                imcb_error(ic, "Unknown authentication method for switchboard");
-                                imc_logout(ic, TRUE);
-                                return(0);
-                        }
-
-                        debug("Connecting to a new switchboard with key %s", cmd[5]);
-
-                        if ((sb = msn_sb_create(ic, server, port, cmd[5], MSN_SB_NEW)) == NULL) {
-                                /* Although this isn't strictly fatal for the NS connection, it's
-                                   definitely something serious (we ran out of file descriptors?). */
-                                imcb_error(ic, "Could not create new switchboard");
-                                imc_logout(ic, TRUE);
-                                return(0);
-                        }
-
-                        if (md->msgq) {
-                                struct msn_message *m = md->msgq->data;
-                                GSList *l;
-
-                                sb->who = g_strdup(m->who);
-
-                                /* Move all the messages to the first user in the message
-                                   queue to the switchboard message queue. */
-                                l = md->msgq;
-                                while (l) {
-                                        m = l->data;
-                                        l = l->next;
-                                        if (strcmp(m->who, sb->who) == 0) {
-                                                sb->msgq = g_slist_append(sb->msgq, m);
-                                                md->msgq = g_slist_remove(md->msgq, m);
-                                        }
-                                }
-                        }
+                        return msn_ns_connect(ic, server, port);
                 } else {
                         imcb_error(ic, "Syntax error");
@@ -290 +269 @@
                 }
 
-                handler->msglen = atoi(cmd[3]);
-
-                if (handler->msglen <= 0) {
+                md->msglen = atoi(cmd[3]);
+
+                if (md->msglen <= 0) {
                         imcb_error(ic, "Syntax error");
                         imc_logout(ic, TRUE);
                         return(0);
                 }
-        } else if (strcmp(cmd[0], "BLP") == 0) {
-                msn_ns_send_adl_start(ic);
-                return msn_ns_finish_login(ic);
         } else if (strcmp(cmd[0], "ADL") == 0) {
                 if (num_parts >= 3 && strcmp(cmd[2], "OK") == 0) {
@@ -305 +281 @@
                         return msn_ns_finish_login(ic);
                 } else if (num_parts >= 3) {
-                        handler->msglen = atoi(cmd[2]);
-                }
-        } else if (strcmp(cmd[0], "PRP") == 0) {
-                imcb_connected(ic);
+                        md->msglen = atoi(cmd[2]);
+                }
         } else if (strcmp(cmd[0], "CHL") == 0) {
                 char *resp;
@@ -326 +300 @@
                 g_free(resp);
                 return st;
-        } else if (strcmp(cmd[0], "ILN") == 0 || strcmp(cmd[0], "NLN") == 0) {
-                const struct msn_away_state *st;
-                const char *handle;
-                int cap = 0;
-
-                if (num_parts < 6) {
-                        imcb_error(ic, "Syntax error");
-                        imc_logout(ic, TRUE);
-                        return(0);
-                }
-                /* ILN and NLN are more or less the same, except ILN has a trId
-                   at the start, and NLN has a capability field at the end.
-                   Does ILN still exist BTW? */
-                if (cmd[0][1] == 'I') {
-                        cmd++;
-                } else {
-                        cap = atoi(cmd[4]);
-                }
-
-                handle = msn_normalize_handle(cmd[2]);
-                if (strcmp(handle, ic->acc->user) == 0) {
-                        return 1; /* That's me! */
-
-                }
-                http_decode(cmd[3]);
-                imcb_rename_buddy(ic, handle, cmd[3]);
-
-                st = msn_away_state_by_code(cmd[1]);
-                if (!st) {
-                        /* FIXME: Warn/Bomb about unknown away state? */
-                        st = msn_away_state_list + 1;
-                }
-
-                imcb_buddy_status(ic, handle, OPT_LOGGED_IN |
-                                  (st != msn_away_state_list ? OPT_AWAY : 0) |
-                                  (cap & 1 ? OPT_MOBILE : 0),
-                                  st->name, NULL);
-
-                msn_sb_stop_keepalives(msn_sb_by_handle(ic, handle));
-        } else if (strcmp(cmd[0], "FLN") == 0) {
-                const char *handle;
-
-                if (cmd[1] == NULL) {
-                        return 1;
-                }
-
-                handle = msn_normalize_handle(cmd[1]);
-                imcb_buddy_status(ic, handle, 0, NULL, NULL);
-                msn_sb_start_keepalives(msn_sb_by_handle(ic, handle), TRUE);
-        } else if (strcmp(cmd[0], "RNG") == 0) {
-                struct msn_switchboard *sb;
-                char *server;
-                int session, port;
-
-                if (num_parts < 7) {
-                        imcb_error(ic, "Syntax error");
-                        imc_logout(ic, TRUE);
-                        return(0);
-                }
-
-                session = atoi(cmd[1]);
-
-                server = strchr(cmd[2], ':');
-                if (!server) {
-                        imcb_error(ic, "Syntax error");
-                        imc_logout(ic, TRUE);
-                        return(0);
-                }
-                *server = 0;
-                port = atoi(server + 1);
-                server = cmd[2];
-
-                if (strcmp(cmd[3], "CKI") != 0) {
-                        imcb_error(ic, "Unknown authentication method for switchboard");
-                        imc_logout(ic, TRUE);
-                        return(0);
-                }
-
-                debug("Got a call from %s (session %d). Key = %s", cmd[5], session, cmd[4]);
-
-                if ((sb = msn_sb_create(ic, server, port, cmd[4], session)) == NULL) {
-                        /* Although this isn't strictly fatal for the NS connection, it's
-                           definitely something serious (we ran out of file descriptors?). */
-                        imcb_error(ic, "Could not create new switchboard");
-                        imc_logout(ic, TRUE);
-                        return(0);
-                } else {
-                        sb->who = g_strdup(msn_normalize_handle(cmd[5]));
-                }
+        } else if (strcmp(cmd[0], "QRY") == 0) {
+                /* CONGRATULATIONS */
         } else if (strcmp(cmd[0], "OUT") == 0) {
-                int allow_reconnect = TRUE;
-
-                if (cmd[1] && strcmp(cmd[1], "OTH") == 0) {
-                        imcb_error(ic, "Someone else logged in with your account");
-                        allow_reconnect = FALSE;
-                } else if (cmd[1] && strcmp(cmd[1], "SSD") == 0) {
-                        imcb_error(ic, "Terminating session because of server shutdown");
-                } else {
-                        imcb_error(ic, "Session terminated by remote server (%s)",
-                                   cmd[1] ? cmd[1] : "reason unknown)");
-                }
-
-                imc_logout(ic, allow_reconnect);
+                imcb_error(ic, "Session terminated by remote server (%s)", cmd[1] ? cmd[1] : "reason unknown");
+                imc_logout(ic, TRUE);
                 return(0);
-        } else if (strcmp(cmd[0], "IPG") == 0) {
-                imcb_error(ic, "Received IPG command, we don't handle them yet.");
-
-                handler->msglen = atoi(cmd[1]);
-
-                if (handler->msglen <= 0) {
-                        imcb_error(ic, "Syntax error");
-                        imc_logout(ic, TRUE);
-                        return(0);
-                }
-        }
-#if 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_slist_remove(md->grpq, ga);
-                        }
-                }
-        }
-#endif
-        else if (strcmp(cmd[0], "GCF") == 0) {
+        } else if (strcmp(cmd[0], "GCF") == 0) {
                 /* Coming up is cmd[2] bytes of stuff we're supposed to
                    censore. Meh. */
-                handler->msglen = atoi(cmd[2]);
-        } else if (strcmp(cmd[0], "UBX") == 0) {
-                /* Status message. */
+                md->msglen = atoi(cmd[2]);
+        } else if ((strcmp(cmd[0], "NFY") == 0) || (strcmp(cmd[0], "SDG") == 0)) {
                 if (num_parts >= 3) {
-                        handler->msglen = atoi(cmd[2]);
+                        md->msglen = atoi(cmd[2]);
+                }
+        } else if (strcmp(cmd[0], "PUT") == 0) {
+                if (num_parts >= 4) {
+                        md->msglen = atoi(cmd[3]);
                 }
         } else if (strcmp(cmd[0], "NOT") == 0) {
-                /* Some kind of notification, poorly documented but
-                   apparently used to announce address book changes. */
                 if (num_parts >= 2) {
-                        handler->msglen = atoi(cmd[1]);
-                }
-        } else if (strcmp(cmd[0], "UBM") == 0) {
-                if (num_parts >= 7) {
-                        handler->msglen = atoi(cmd[6]);
+                        md->msglen = atoi(cmd[1]);
                 }
         } else if (strcmp(cmd[0], "QNG") == 0) {
@@ -516 +337 @@
                 /* Oh yes, errors can have payloads too now. Discard them for now. */
                 if (num_parts >= 3) {
-                        handler->msglen = atoi(cmd[2]);
+                        md->msglen = atoi(cmd[2]);
                 }
         } else {
-                /* debug( "Received unknown command from main server: %s", cmd[0] ); */
+                imcb_error(ic, "Received unknown command from main server: %s", cmd[0]);
         }
 
@@ -525 +346 @@
 }
 
-static int msn_ns_message(struct msn_handler_data *handler, char *msg, int msglen, char **cmd, int num_parts)
-{
-        struct im_connection *ic = handler->data;
+int msn_ns_message(struct msn_data *md, char *msg, int msglen, char **cmd, int num_parts)
+{
+        struct im_connection *ic = md->ic;
         char *body;
         int blen = 0;
@@ -598 +419 @@
                                 }
                         } else if (g_strncasecmp(ct, "text/x-msmsgsactivemailnotification", 35) == 0) {
-                        } else if (g_strncasecmp(ct, "text/x-msmsgsinitialmdatanotification", 37) == 0 ||
-                                   g_strncasecmp(ct, "text/x-msmsgsoimnotification", 28) == 0) {
-                                /* We received an offline message. Or at least notification
-                                   that there is one waiting for us. Fetching the message(s)
-                                   and purging them from the server is a lot of SOAPy work
-                                   not worth doing IMHO. Also I thought it was possible to
-                                   have the notification server send them directly, I was
-                                   pretty sure I saw Pidgin do it..
-
-                                   At least give a notification for now, seems like a
-                                   reasonable thing to do. Only problem is, they'll keep
-                                   coming back at login time until you read them using a
-                                   different client. :-( */
-
-                                char *xml = get_rfc822_header(body, "Mail-Data:", blen);
-                                struct xt_node *md, *m;
-
-                                if (!xml) {
-                                        return 1;
-                                }
-                                md = xt_from_string(xml, 0);
-                                if (!md) {
-                                        return 1;
-                                }
-
-                                for (m = md->children; (m = xt_find_node(m, "M")); m = m->next) {
-                                        struct xt_node *e = xt_find_node(m->children, "E");
-                                        struct xt_node *rt = xt_find_node(m->children, "RT");
-                                        struct tm tp;
-                                        time_t msgtime = 0;
-
-                                        if (!e || !e->text) {
-                                                continue;
-                                        }
-
-                                        memset(&tp, 0, sizeof(tp));
-                                        if (rt && rt->text &&
-                                            sscanf(rt->text, "%4d-%2d-%2dT%2d:%2d:%2d.",
-                                                   &tp.tm_year, &tp.tm_mon, &tp.tm_mday,
-                                                   &tp.tm_hour, &tp.tm_min, &tp.tm_sec) == 6) {
-                                                tp.tm_year -= 1900;
-                                                tp.tm_mon--;
-                                                msgtime = mktime_utc(&tp);
-
-                                        }
-                                        imcb_buddy_msg(ic, e->text,
-                                                       "<< \002BitlBee\002 - Received offline message. BitlBee can't show these. >>", 0,
-                                                       msgtime);
-                                }
-
-                                g_free(xml);
-                                xt_free_node(md);
+                                /* Notification that a message has been read... Ignore it */
                         } else {
                                 debug("Can't handle %s packet from notification server", ct);
@@ -656 +426 @@
                         g_free(ct);
                 }
-        } else if (strcmp(cmd[0], "UBX") == 0) {
-                struct xt_node *ubx, *psm;
-                char *psm_text = NULL;
-
-                ubx = xt_from_string(msg, msglen);
-                if (ubx && strcmp(ubx->name, "Data") == 0 &&
-                    (psm = xt_find_node(ubx->children, "PSM"))) {
-                        psm_text = psm->text;
-                }
-
-                imcb_buddy_status_msg(ic, msn_normalize_handle(cmd[1]), psm_text);
-                xt_free_node(ubx);
         } else if (strcmp(cmd[0], "ADL") == 0) {
                 struct xt_node *adl, *d, *c;
@@ -716 +474 @@
                         }
                 }
-        } else if (strcmp(cmd[0], "UBM") == 0) {
-                /* This one will give us msgs from federated networks. Technically
-                   it should also get us offline messages, but I don't know how
-                   I can signal MSN servers to use it. */
-                char *ct, *handle;
-
-                if (strcmp(cmd[1], ic->acc->user) == 0) {
-                        /* With MPOP, you'll get copies of your own msgs from other
-                           sessions. Discard those at least for now. */
-                        return 1;
-                }
-
-                ct = get_rfc822_header(msg, "Content-Type", msglen);
-                if (strncmp(ct, "text/plain", 10) != 0) {
-                        /* Typing notification or something? */
-                        g_free(ct);
-                        return 1;
-                }
-                if (strcmp(cmd[2], "1") != 0) {
-                        handle = g_strdup_printf("%s:%s", cmd[2], cmd[1]);
-                } else {
-                        handle = g_strdup(cmd[1]);
-                }
-
-                imcb_buddy_msg(ic, handle, body, 0, 0);
-                g_free(handle);
+        } else if ((strcmp(cmd[0], "SDG") == 0) || (strcmp(cmd[0], "NFY") == 0)) {
+                msn_ns_structured_message(md, msg, msglen, cmd);
         }
 
         return 1;
+}
+
+static void msn_ns_structured_message(struct msn_data *md, char *msg, int msglen, char **cmd)
+{
+        char **parts = NULL;
+        char *semicolon = NULL;
+        char *action = NULL;
+        char *from = NULL;
+        char *who = NULL;
+
+        parts = g_strsplit(msg, "\r\n\r\n", 4);
+
+        if (!(from = get_rfc822_header(parts[0], "From", 0))) {
+                goto cleanup;
+        }
+
+        /* either the semicolon or the end of the string */
+        semicolon = strchr(from, ';') ? : (from + strlen(from));
+
+        who = g_strndup(from + 2, semicolon - from - 2);
+
+        if ((strcmp(cmd[0], "SDG") == 0) && (action = get_rfc822_header(parts[2], "Message-Type", 0))) {
+                msn_ns_sdg(md, who, parts, action);
+
+        } else if ((strcmp(cmd[0], "NFY") == 0) && (action = get_rfc822_header(parts[2], "Uri", 0))) {
+                gboolean is_put = (strcmp(cmd[1], "PUT") == 0);
+                msn_ns_nfy(md, who, parts, action, is_put);
+        }
+
+cleanup:
+        g_strfreev(parts);
+        g_free(action);
+        g_free(from);
+        g_free(who);
+}
+
+static void msn_ns_sdg(struct msn_data *md, char *who, char **parts, char *action)
+{
+        struct im_connection *ic = md->ic;
+
+        if (strcmp(action, "Control/Typing") == 0) {
+                imcb_buddy_typing(ic, who, OPT_TYPING);
+        } else if (strcmp(action, "Text") == 0) {
+                imcb_buddy_msg(ic, who, parts[3], 0, 0);
+        }
+}
+
+static void msn_ns_nfy(struct msn_data *md, char *who, char **parts, char *action, gboolean is_put)
+{
+        struct im_connection *ic = md->ic;
+        struct xt_node *body = NULL;
+        struct xt_node *s = NULL;
+        const char *state = NULL;
+        char *nick = NULL;
+        char *psm = NULL;
+        int flags = OPT_LOGGED_IN;
+
+        if (strcmp(action, "/user") != 0) {
+                return;
+        }
+
+        if (!(body = xt_from_string(parts[3], 0))) {
+                goto cleanup;
+        }
+
+        s = body->children;
+        while ((s = xt_find_node(s, "s"))) {
+                struct xt_node *s2;
+                char *n = xt_find_attr(s, "n");  /* service name: IM, PE, etc */
+
+                if (strcmp(n, "IM") == 0) {
+                        /* IM has basic presence information */
+                        if (!is_put) {
+                                /* NFY DEL with a <s> usually means log out from the last endpoint */
+                                flags &= ~OPT_LOGGED_IN;
+                                break;
+                        }
+
+                        s2 = xt_find_node(s->children, "Status");
+                        if (s2 && s2->text_len) {
+                                const struct msn_away_state *msn_state = msn_away_state_by_code(s2->text);
+                                state = msn_state->name;
+                                if (msn_state != msn_away_state_list) {
+                                        flags |= OPT_AWAY;
+                                }
+                        }
+                } else if (strcmp(n, "PE") == 0) {
+                        if ((s2 = xt_find_node(s->children, "PSM")) && s2->text_len) {
+                                psm = s2->text;
+                        }
+                        if ((s2 = xt_find_node(s->children, "FriendlyName")) && s2->text_len) {
+                                nick = s2->text;
+                        }
+                }
+                s = s->next;
+        }
+
+        imcb_buddy_status(ic, who, flags, state, psm);
+
+        if (nick) {
+                imcb_rename_buddy(ic, who, nick);
+        }
+
+cleanup:
+        xt_free_node(body);
 }
 
@@ -768 +607 @@
 void msn_auth_got_contact_list(struct im_connection *ic)
 {
-        struct msn_data *md;
-
         /* Dead connection? */
         if (g_slist_find(msn_connections, ic) == NULL) {
@@ -775 +612 @@
         }
 
-        md = ic->proto_data;
-        msn_ns_write(ic, -1, "BLP %d %s\r\n", ++md->trId, "BL");
+        msn_ns_send_adl_start(ic);
+        msn_ns_finish_login(ic);
 }
 
 static gboolean msn_ns_send_adl_1(gpointer key, gpointer value, gpointer data)
 {
-        struct xt_node *adl = data, *d, *c;
+        struct xt_node *adl = data, *d, *c, *s;
         struct bee_user *bu = value;
         struct msn_buddy_data *bd = bu->data;
@@ -810 +647 @@
         c = xt_new_node("c", NULL, NULL);
         xt_add_attr(c, "n", handle);
-        xt_add_attr(c, "l", l);
         xt_add_attr(c, "t", "1");   /* FIXME: Network type, i.e. 32 for Y!MSG */
+        s = xt_new_node("s", NULL, NULL);
+        xt_add_attr(s, "n", "IM");
+        xt_add_attr(s, "l", l);
+        xt_insert_child(c, s);
         xt_insert_child(d, c);
 
@@ -881 +721 @@
 
         if ((md->flags & MSN_DONE_ADL) && (md->flags & MSN_GOT_PROFILE)) {
-                if (md->flags & MSN_EMAIL_UNVERIFIED) {
-                        imcb_connected(ic);
-                } else {
-                        return msn_ns_set_display_name(ic, set_getstr(&ic->acc->set, "display_name"));
-                }
+                imcb_connected(ic);
         }
 
@@ -891 +727 @@
 }
 
+// TODO: typing notifications, nudges lol, etc
 int msn_ns_sendmessage(struct im_connection *ic, bee_user_t *bu, const char *text)
 {
         struct msn_data *md = ic->proto_data;
-        int type = 0;
-        char *buf, *handle;
+        int retval = 0;
+        char *buf;
 
         if (strncmp(text, "\r\r\r", 3) == 0) {
@@ -903 +740 @@
         }
 
-        /* This might be a federated contact. Get its network number,
-           prefixed to bu->handle with a colon. Default is 1. */
-        for (handle = bu->handle; g_ascii_isdigit(*handle); handle++) {
-                type = type * 10 + *handle - '0';
-        }
-        if (*handle == ':') {
-                handle++;
-        } else {
-                type = 1;
-        }
-
-        buf = g_strdup_printf("%s%s", MSN_MESSAGE_HEADERS, text);
-
-        if (msn_ns_write(ic, -1, "UUM %d %s %d %d %zd\r\n%s",
-                         ++md->trId, handle, type,
-                         1,          /* type == IM (not nudge/typing) */
-                         strlen(buf), buf)) {
-                return 1;
-        } else {
-                return 0;
-        }
-}
-
-void msn_ns_oim_send_queue(struct im_connection *ic, GSList **msgq)
-{
-        GSList *l;
-
-        for (l = *msgq; l; l = l->next) {
-                struct msn_message *m = l->data;
-                bee_user_t *bu = bee_user_by_handle(ic->bee, ic, m->who);
-
-                if (bu) {
-                        if (!msn_ns_sendmessage(ic, bu, m->text)) {
-                                return;
-                        }
-                }
-        }
-
-        while (*msgq != NULL) {
-                struct msn_message *m = (*msgq)->data;
-
-                g_free(m->who);
-                g_free(m->text);
-                g_free(m);
-
-                *msgq = g_slist_remove(*msgq, m);
-        }
-}
+        buf = g_strdup_printf(MSN_MESSAGE_HEADERS, bu->handle, ic->acc->user, md->uuid, strlen(text), text);
+        retval = msn_ns_write(ic, -1, "SDG %d %zd\r\n%s", ++md->trId, strlen(buf), buf);
+        g_free(buf);
+        return retval;
+}

protocols/msn/soap.c

@@ -209 +209 @@
                 return;
         }
+        fprintf(stderr, "\n\x1b[90mSOAP:\n");
 
         if (headers) {
@@ -225 +226 @@
                 xt_free_node(xt);
         }
+        fprintf(stderr, "\n\x1b[97m\n");
 }
 

protocols/msn/soap.h

@@ -167 +167 @@
 
 #define SOAP_MEMLIST_PAYLOAD \
-        "<FindMembership xmlns=\"http://www.msn.com/webservices/AddressBook\"><serviceFilter xmlns=\"http://www.msn.com/webservices/AddressBook\"><Types xmlns=\"http://www.msn.com/webservices/AddressBook\"><ServiceType xmlns=\"http://www.msn.com/webservices/AddressBook\">Messenger</ServiceType><ServiceType xmlns=\"http://www.msn.com/webservices/AddressBook\">Invitation</ServiceType><ServiceType xmlns=\"http://www.msn.com/webservices/AddressBook\">SocialNetwork</ServiceType><ServiceType xmlns=\"http://www.msn.com/webservices/AddressBook\">Space</ServiceType><ServiceType xmlns=\"http://www.msn.com/webservices/AddressBook\">Profile</ServiceType></Types></serviceFilter>" \
+        "<FindMembership xmlns=\"http://www.msn.com/webservices/AddressBook\"><serviceFilter><Types><ServiceType>Messenger</ServiceType><ServiceType>IMAvailability</ServiceType></Types></serviceFilter><expandMembership>true</expandMembership>" \
         "</FindMembership>"
 

protocols/msn/tables.c

@@ -73 +73 @@
         { 206, "Domain name missing",                                   0 },
         { 207, "Already logged in",                                     0 },
-        { 208, "Invalid handle",                                        STATUS_SB_IM_SPARE },
+        { 208, "Invalid handle",                                        0 },
         { 209, "Forbidden nickname",                                    0 },
         { 210, "Buddy list too long",                                   0 },
         { 215, "Handle is already in list",                             0 },
-        { 216, "Handle is not in list",                                 STATUS_SB_IM_SPARE },
-        { 217, "Person is off-line or non-existent",                    STATUS_SB_IM_SPARE },
+        { 216, "Handle is not in list",                                 0 },
+        { 217, "Person is off-line or non-existent",                    0 },
         { 218, "Already in that mode",                                  0 },
         { 219, "Handle is already in opposite list",                    0 },
@@ -113 +113 @@
         { 711, "Write is blocking",                                     STATUS_FATAL },
         { 712, "Session is overloaded",                                 STATUS_FATAL },
-        { 713, "Calling too rapidly",                                   STATUS_SB_IM_SPARE },
+        { 713, "Calling too rapidly",                                   0 },
         { 714, "Too many sessions",                                     STATUS_FATAL },
         { 715, "Not expected/Invalid argument/action",                  0 },

protocols/nogaim.c

@@ -503 +503 @@
 };
 
-static void imcb_ask_auth_cb_no(void *data)
+static void imcb_ask_cb_free(void *data)
 {
         struct imcb_ask_cb_data *cbd = data;
-
-        cbd->ic->acc->prpl->auth_deny(cbd->ic, cbd->handle);
 
         g_free(cbd->handle);
@@ -513 +511 @@
 }
 
+static void imcb_ask_auth_cb_no(void *data)
+{
+        struct imcb_ask_cb_data *cbd = data;
+
+        cbd->ic->acc->prpl->auth_deny(cbd->ic, cbd->handle);
+
+        imcb_ask_cb_free(cbd);
+}
+
 static void imcb_ask_auth_cb_yes(void *data)
 {
@@ -519 +526 @@
         cbd->ic->acc->prpl->auth_allow(cbd->ic, cbd->handle);
 
-        g_free(cbd->handle);
-        g_free(cbd);
+        imcb_ask_cb_free(cbd);
 }
 
@@ -540 +546 @@
         data->handle = g_strdup(handle);
         query_add((irc_t *) ic->bee->ui_data, ic, s,
-                  imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, g_free, data);
-}
-
-
-static void imcb_ask_add_cb_no(void *data)
-{
-        g_free(((struct imcb_ask_cb_data*) data)->handle);
-        g_free(data);
+                  imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, imcb_ask_cb_free, data);
+
+        g_free(s);
 }
 
@@ -556 +557 @@
         cbd->ic->acc->prpl->add_buddy(cbd->ic, cbd->handle, NULL);
 
-        imcb_ask_add_cb_no(data);
+        imcb_ask_cb_free(data);
 }
 
 void imcb_ask_add(struct im_connection *ic, const char *handle, const char *realname)
 {
-        struct imcb_ask_cb_data *data = g_new0(struct imcb_ask_cb_data, 1);
+        struct imcb_ask_cb_data *data;
         char *s;
 
@@ -569 +570 @@
         }
 
+        data = g_new0(struct imcb_ask_cb_data, 1);
+
         s = g_strdup_printf("The user %s is not in your buddy list yet. Do you want to add him/her now?", handle);
 
@@ -574 +577 @@
         data->handle = g_strdup(handle);
         query_add((irc_t *) ic->bee->ui_data, ic, s,
-                  imcb_ask_add_cb_yes, imcb_ask_add_cb_no, g_free, data);
+                  imcb_ask_add_cb_yes, imcb_ask_cb_free, imcb_ask_cb_free, data);
+
+        g_free(s);
 }
 

protocols/purple/ft-direct.c

@@ -28 +28 @@
 
 #include "bitlbee.h"
+#include "bpurple.h"
 
 #include <stdarg.h>
@@ -207 +208 @@
 void purple_transfer_request(struct im_connection *ic, file_transfer_t *ft, char *handle)
 {
-        PurpleAccount *pa = ic->proto_data;
+        struct purple_data *pd = ic->proto_data;
         struct prpl_xfer_data *px;
 
@@ -213 +214 @@
            multi-threaded anyway. */
         next_ft = ft;
-        serv_send_file(purple_account_get_connection(pa), handle, ft->file_name);
+        serv_send_file(purple_account_get_connection(pd->account), handle,
+                       ft->file_name);
 
         ft->write = prpl_xfer_write;

protocols/purple/ft.c

@@ -28 +28 @@
 
 #include "bitlbee.h"
+#include "bpurple.h"
 
 #include <stdarg.h>
@@ -285 +286 @@
 {
         struct prpl_xfer_data *px = ft->data;
-        PurpleAccount *pa = px->ic->proto_data;
+        struct purple_data *pd = px->ic->proto_data;
 
         /* xfer_new() will pick up this variable. It's a hack but we're not
            multi-threaded anyway. */
         next_ft = ft;
-        serv_send_file(purple_account_get_connection(pa), px->handle, px->fn);
+        serv_send_file(purple_account_get_connection(pd->account),
+                   px->handle, px->fn);
 }
 

protocols/purple/purple.c

@@ -23 +23 @@
 
 #include "bitlbee.h"
+#include "bpurple.h"
 #include "help.h"
 
@@ -39 +40 @@
 static char *set_eval_display_name(set_t *set, char *value);
 
+void purple_request_input_callback(guint id, struct im_connection *ic,
+                                   const char *message, const char *who);
+
+/* purple_request_input specific stuff */
+typedef void (*ri_callback_t)(gpointer, const gchar *);
+
+struct request_input_data {
+        ri_callback_t data_callback;
+        void *user_data;
+        struct im_connection *ic;
+        char *buddy;
+        guint id;
+};
+
 struct im_connection *purple_ic_by_pa(PurpleAccount *pa)
 {
         GSList *i;
+        struct purple_data *pd;
 
         for (i = purple_connections; i; i = i->next) {
-                if (((struct im_connection *) i->data)->proto_data == pa) {
+                pd = ((struct im_connection *) i->data)->proto_data;
+                if (pd->account == pa) {
                         return i->data;
                 }
@@ -290 +307 @@
 {
         struct im_connection *ic = imcb_new(acc);
-        PurpleAccount *pa;
+        struct purple_data *pd;
 
         if ((local_bee != NULL && local_bee != acc->bee) ||
@@ -306 +323 @@
         purple_connections = g_slist_prepend(purple_connections, ic);
 
-        ic->proto_data = pa = purple_account_new(acc->user, (char *) acc->prpl->data);
-        purple_account_set_password(pa, acc->pass);
-        purple_sync_settings(acc, pa);
-
-        purple_account_set_enabled(pa, "BitlBee", TRUE);
+        ic->proto_data = pd = g_new0(struct purple_data, 1);
+        pd->account = purple_account_new(acc->user, (char *) acc->prpl->data);
+        pd->input_requests = g_hash_table_new_full(g_direct_hash, g_direct_equal,
+                                                   NULL, g_free);
+        pd->next_request_id = 0;
+        purple_account_set_password(pd->account, acc->pass);
+        purple_sync_settings(acc, pd->account);
+
+        purple_account_set_enabled(pd->account, "BitlBee", TRUE);
 }
 
 static void purple_logout(struct im_connection *ic)
 {
-        PurpleAccount *pa = ic->proto_data;
-
-        purple_account_set_enabled(pa, "BitlBee", FALSE);
+        struct purple_data *pd = ic->proto_data;
+
+        if (!pd) {
+                return;
+        }
+
+        purple_account_set_enabled(pd->account, "BitlBee", FALSE);
         purple_connections = g_slist_remove(purple_connections, ic);
-        purple_accounts_remove(pa);
+        purple_accounts_remove(pd->account);
+        g_hash_table_destroy(pd->input_requests);
+        g_free(pd);
 }
 
@@ -325 +352 @@
 {
         PurpleConversation *conv;
+        struct purple_data *pd = ic->proto_data;
+
+        if (!strncmp(who, PURPLE_REQUEST_HANDLE, sizeof(PURPLE_REQUEST_HANDLE) - 1)) {
+                guint request_id = atoi(who + sizeof(PURPLE_REQUEST_HANDLE));
+                purple_request_input_callback(request_id, ic, message, who);
+                return 1;
+        }
 
         if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM,
-                                                          who, ic->proto_data)) == NULL) {
+                                                          who, pd->account)) == NULL) {
                 conv = purple_conversation_new(PURPLE_CONV_TYPE_IM,
-                                               ic->proto_data, who);
+                                               pd->account, who);
         }
 
@@ -339 +373 @@
 static GList *purple_away_states(struct im_connection *ic)
 {
-        PurpleAccount *pa = ic->proto_data;
+        struct purple_data *pd = ic->proto_data;
         GList *st, *ret = NULL;
 
-        for (st = purple_account_get_status_types(pa); st; st = st->next) {
+        for (st = purple_account_get_status_types(pd->account); st; st = st->next) {
                 PurpleStatusPrimitive prim = purple_status_type_get_primitive(st->data);
                 if (prim != PURPLE_STATUS_AVAILABLE && prim != PURPLE_STATUS_OFFLINE) {
@@ -354 +388 @@
 static void purple_set_away(struct im_connection *ic, char *state_txt, char *message)
 {
-        PurpleAccount *pa = ic->proto_data;
-        GList *status_types = purple_account_get_status_types(pa), *st;
+        struct purple_data *pd = ic->proto_data;
+        GList *status_types = purple_account_get_status_types(pd->account), *st;
         PurpleStatusType *pst = NULL;
         GList *args = NULL;
@@ -378 +412 @@
         }
 
-        purple_account_set_status_list(pa, st ? purple_status_type_get_id(pst) : "away",
+        purple_account_set_status_list(pd->account,
+                                       st ? purple_status_type_get_id(pst) : "away",
                                        TRUE, args);
 
@@ -447 +482 @@
         PurpleBuddy *pb;
         PurpleGroup *pg = NULL;
+        struct purple_data *pd = ic->proto_data;
 
         if (group && !(pg = purple_find_group(group))) {
@@ -453 +489 @@
         }
 
-        pb = purple_buddy_new((PurpleAccount *) ic->proto_data, who, NULL);
+        pb = purple_buddy_new(pd->account, who, NULL);
         purple_blist_add_buddy(pb, NULL, pg, NULL);
-        purple_account_add_buddy((PurpleAccount *) ic->proto_data, pb);
-
-        purple_gg_buddylist_export(((PurpleAccount *) ic->proto_data)->gc);
+        purple_account_add_buddy(pd->account, pb);
+
+        purple_gg_buddylist_export(pd->account->gc);
 }
 
@@ -463 +499 @@
 {
         PurpleBuddy *pb;
-
-        pb = purple_find_buddy((PurpleAccount *) ic->proto_data, who);
+        struct purple_data *pd = ic->proto_data;
+
+        pb = purple_find_buddy(pd->account, who);
         if (pb != NULL) {
                 PurpleGroup *group;
 
                 group = purple_buddy_get_group(pb);
-                purple_account_remove_buddy((PurpleAccount *) ic->proto_data, pb, group);
+                purple_account_remove_buddy(pd->account, pb, group);
 
                 purple_blist_remove_buddy(pb);
         }
 
-        purple_gg_buddylist_export(((PurpleAccount *) ic->proto_data)->gc);
+        purple_gg_buddylist_export(pd->account->gc);
 }
 
 static void purple_add_permit(struct im_connection *ic, char *who)
 {
-        PurpleAccount *pa = ic->proto_data;
-
-        purple_privacy_permit_add(pa, who, FALSE);
+        struct purple_data *pd = ic->proto_data;
+
+        purple_privacy_permit_add(pd->account, who, FALSE);
 }
 
 static void purple_add_deny(struct im_connection *ic, char *who)
 {
-        PurpleAccount *pa = ic->proto_data;
-
-        purple_privacy_deny_add(pa, who, FALSE);
+        struct purple_data *pd = ic->proto_data;
+
+        purple_privacy_deny_add(pd->account, who, FALSE);
 }
 
 static void purple_rem_permit(struct im_connection *ic, char *who)
 {
-        PurpleAccount *pa = ic->proto_data;
-
-        purple_privacy_permit_remove(pa, who, FALSE);
+        struct purple_data *pd = ic->proto_data;
+
+        purple_privacy_permit_remove(pd->account, who, FALSE);
 }
 
 static void purple_rem_deny(struct im_connection *ic, char *who)
 {
-        PurpleAccount *pa = ic->proto_data;
-
-        purple_privacy_deny_remove(pa, who, FALSE);
+        struct purple_data *pd = ic->proto_data;
+
+        purple_privacy_deny_remove(pd->account, who, FALSE);
 }
 
 static void purple_get_info(struct im_connection *ic, char *who)
 {
-        serv_get_info(purple_account_get_connection(ic->proto_data), who);
+        struct purple_data *pd = ic->proto_data;
+
+        serv_get_info(purple_account_get_connection(pd->account), who);
 }
 
@@ -517 +556 @@
 {
         PurpleTypingState state = PURPLE_NOT_TYPING;
-        PurpleAccount *pa = ic->proto_data;
+        struct purple_data *pd = ic->proto_data;
 
         if (flags & OPT_TYPING) {
@@ -525 +564 @@
         }
 
-        serv_send_typing(purple_account_get_connection(pa), who, state);
+        serv_send_typing(purple_account_get_connection(pd->account), who, state);
 
         return 1;
@@ -559 +598 @@
         /* There went my nice afternoon. :-( */
 
-        PurpleAccount *pa = ic->proto_data;
-        PurplePlugin *prpl = purple_plugins_find_with_id(pa->protocol_id);
+        struct purple_data *pd = ic->proto_data;
+        PurplePlugin *prpl = purple_plugins_find_with_id(pd->account->protocol_id);
         PurplePluginProtocolInfo *pi = prpl->info->extra_info;
-        PurpleBuddy *pb = purple_find_buddy((PurpleAccount *) ic->proto_data, who);
+        PurpleBuddy *pb = purple_find_buddy(pd->account, who);
         PurpleMenuAction *mi;
         GList *menu;
@@ -597 +636 @@
         PurpleConversation *pc = gc->data;
         PurpleConvChat *pcc = PURPLE_CONV_CHAT(pc);
-
-        serv_chat_invite(purple_account_get_connection(gc->ic->proto_data),
+        struct purple_data *pd = gc->ic->proto_data;
+
+        serv_chat_invite(purple_account_get_connection(pd->account),
                          purple_conv_chat_get_id(pcc),
                          message && *message ? message : "Please join my chat",
@@ -623 +663 @@
                                    set_t **sets)
 {
-        PurpleAccount *pa = ic->proto_data;
-        PurplePlugin *prpl = purple_plugins_find_with_id(pa->protocol_id);
+        struct purple_data *pd = ic->proto_data;
+        PurplePlugin *prpl = purple_plugins_find_with_id(pd->account->protocol_id);
         PurplePluginProtocolInfo *pi = prpl->info->extra_info;
         GHashTable *chat_hash;
@@ -631 +671 @@
 
         if (!pi->chat_info || !pi->chat_info_defaults ||
-            !(info = pi->chat_info(purple_account_get_connection(pa)))) {
+            !(info = pi->chat_info(purple_account_get_connection(pd->account)))) {
                 imcb_error(ic, "Joining chatrooms not supported by this protocol");
                 return NULL;
         }
 
-        if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, room, pa))) {
+        if ((conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
+                                                          room, pd->account))) {
                 purple_conversation_destroy(conv);
         }
 
-        chat_hash = pi->chat_info_defaults(purple_account_get_connection(pa), room);
+        chat_hash = pi->chat_info_defaults(
+                purple_account_get_connection(pd->account), room
+        );
 
         for (l = info; l; l = l->next) {
@@ -654 +697 @@
         }
 
-        serv_join_chat(purple_account_get_connection(pa), chat_hash);
+        serv_join_chat(purple_account_get_connection(pd->account), chat_hash);
 
         return NULL;
@@ -981 +1024 @@
                 pqad->yes(pqad->user_data, pqad->yes_i);
         }
-        g_free(pqad);
 }
 
@@ -991 +1033 @@
                 pqad->no(pqad->user_data, pqad->no_i);
         }
-        g_free(pqad);
+}
+
+/* q->free() callback from query_del()*/
+static void prplcb_request_action_free(void *data)
+{
+        struct prplcb_request_action_data *pqad = data;
+
+        pqad->bee_data = NULL;
+        purple_request_close(PURPLE_REQUEST_ACTION, pqad);
 }
 
@@ -1026 +1076 @@
         q = g_strdup_printf("Request: %s\n\n%s\n\n%s", title, primary, secondary);
         pqad->bee_data = query_add(local_bee->ui_data, purple_ic_by_pa(account), q,
-                                   prplcb_request_action_yes, prplcb_request_action_no, g_free, pqad);
+                                   prplcb_request_action_yes, prplcb_request_action_no,
+                                   prplcb_request_action_free, pqad);
 
         g_free(q);
@@ -1033 +1084 @@
 }
 
-/*
-static void prplcb_request_test()
-{
-        fprintf( stderr, "bla\n" );
-}
-*/
+/* So it turns out some requests have no account context at all, because
+ * libpurple hates us. This means that query_del_by_conn() won't remove those
+ * on logout, and will segfault if the user replies. That's why this exists.
+ */
+static void prplcb_close_request(PurpleRequestType type, void *data)
+{
+        struct prplcb_request_action_data *pqad;
+        struct request_input_data *ri;
+        struct purple_data *pd;
+
+        if (!data) {
+                return;
+        }
+
+        switch (type) {
+        case PURPLE_REQUEST_ACTION:
+                pqad = data;
+                /* if this is null, it's because query_del was run already */
+                if (pqad->bee_data) {
+                        query_del(local_bee->ui_data, pqad->bee_data);
+                }
+                g_free(pqad);
+                break;
+        case PURPLE_REQUEST_INPUT:
+                ri = data;
+                pd = ri->ic->proto_data;
+                imcb_remove_buddy(ri->ic, ri->buddy, NULL);
+                g_free(ri->buddy);
+                g_hash_table_remove(pd->input_requests, GUINT_TO_POINTER(ri->id));
+                break;
+        default:
+                g_free(data);
+                break;
+        }
+
+}
+
+void* prplcb_request_input(const char *title, const char *primary,
+        const char *secondary, const char *default_value, gboolean multiline,
+        gboolean masked, gchar *hint, const char *ok_text, GCallback ok_cb,
+        const char *cancel_text, GCallback cancel_cb, PurpleAccount *account,
+        const char *who, PurpleConversation *conv, void *user_data)
+{
+        struct im_connection *ic = purple_ic_by_pa(account);
+        struct purple_data *pd = ic->proto_data;
+        struct request_input_data *ri = g_new0(struct request_input_data, 1);
+        guint id = pd->next_request_id++;
+
+        ri->id = id;
+        ri->ic = ic;
+        ri->buddy = g_strdup_printf("%s_%u", PURPLE_REQUEST_HANDLE, id);
+        ri->data_callback = (ri_callback_t) ok_cb;
+        ri->user_data = user_data;
+        g_hash_table_insert(pd->input_requests, GUINT_TO_POINTER(id), ri);
+
+        imcb_add_buddy(ic, ri->buddy, NULL);
+        imcb_buddy_msg(ic, ri->buddy, secondary, 0, 0);
+
+        return ri;
+}
+
+void purple_request_input_callback(guint id, struct im_connection *ic,
+                                   const char *message, const char *who)
+{
+        struct purple_data *pd = ic->proto_data;
+        struct request_input_data *ri;
+
+        if (!(ri = g_hash_table_lookup(pd->input_requests, GUINT_TO_POINTER(id)))) {
+                return;
+        }
+
+        ri->data_callback(ri->user_data, message);
+
+        purple_request_close(PURPLE_REQUEST_INPUT, ri);
+}
+
 
 static PurpleRequestUiOps bee_request_uiops =
 {
-        NULL,
+        prplcb_request_input,
         NULL,
         prplcb_request_action,
         NULL,
         NULL,
-        NULL,
+        prplcb_close_request,
         NULL,
 };

protocols/skype/Makefile

@@ -6 +6 @@
 DATE := $(shell date +%Y-%m-%d)
 INSTALL = install
-ASCIIDOC = yes
 
-ifeq ($(ASCIIDOC),yes)
+
+ifdef ASCIIDOC
 MANPAGES = skyped.1
 else
@@ -29 +29 @@
 
 install-doc: doc
-ifeq ($(ASCIIDOC),yes)
+ifdef ASCIIDOC
         $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
         $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(MANDIR)/man1

protocols/twitter/twitter.c

@@ -852 +852 @@
 }
 
+/* Parses a decimal or hex tweet ID, returns TRUE on success */
+static gboolean twitter_parse_id(char *string, int base, guint64 *id)
+{
+        guint64 parsed;
+        char *endptr;
+
+        errno = 0;
+        parsed = g_ascii_strtoull(string, &endptr, base);
+        if (errno || endptr == string || *endptr != '\0') {
+                return FALSE;
+        }
+        *id = parsed;
+        return TRUE;
+}
+
+bee_user_t twitter_log_local_user;
+
 /** Convert the given bitlbee tweet ID, bitlbee username, or twitter tweet ID
  *  into a twitter tweet ID.
@@ -879 +896 @@
                         arg++;
                 }
-                if (sscanf(arg, "%" G_GINT64_MODIFIER "x", &id) == 1 &&
-                    id < TWITTER_LOG_LENGTH) {
+                if (twitter_parse_id(arg, 16, &id) && id < TWITTER_LOG_LENGTH) {
                         bu = td->log[id].bu;
                         id = td->log[id].id;
-                        /* Beware of dangling pointers! */
-                        if (!g_slist_find(ic->bee->users, bu)) {
-                                bu = NULL;
-                        }
-                } else if (sscanf(arg, "%" G_GINT64_MODIFIER "d", &id) == 1) {
+                } else if (twitter_parse_id(arg, 10, &id)) {
                         /* Allow normal tweet IDs as well; not a very useful
                            feature but it's always been there. Just ignore
@@ -897 +909 @@
         }
         if (bu_) {
+                if (bu == &twitter_log_local_user) {
+                        /* HACK alert. There's no bee_user object for the local
+                         * user so just fake one for the few cmds that need it. */
+                        twitter_log_local_user.handle = td->user;
+                } else {
+                        /* Beware of dangling pointers! */
+                        if (!g_slist_find(ic->bee->users, bu)) {
+                                bu = NULL;
+                        }
+                }
                 *bu_ = bu;
         }
@@ -989 +1011 @@
                 in_reply_to = id;
                 allow_post = TRUE;
+        } else if (g_strcasecmp(cmd[0], "url") == 0) {
+                id = twitter_message_id_from_command_arg(ic, cmd[1], &bu);
+                if (!id) {
+                        twitter_log(ic, "Tweet `%s' does not exist", cmd[1]);
+                } else {
+                        /* More common link is twitter.com/$UID/status/$ID (and that's
+                         * what this will 302 to) but can't generate that since for RTs,
+                         * bu here points at the retweeter while id contains the id of
+                         * the original message. */
+                        twitter_log(ic, "https://twitter.com/statuses/%lld", id);
+                }
+                goto eof;
+
         } else if (g_strcasecmp(cmd[0], "post") == 0) {
                 message += 5;

protocols/twitter/twitter.h

@@ -101 +101 @@
 struct twitter_log_data {
         guint64 id;
-        struct bee_user *bu; /* DANGER: can be a dead pointer. Check it first. */
+        /* DANGER: bu can be a dead pointer. Check it first.
+         * twitter_message_id_from_command_arg() will do this. */
+        struct bee_user *bu;
 };
 
@@ -110 +112 @@
  */
 extern GSList *twitter_connections;
+
+/**
+ * Evil hack: Fake bee_user which will always point at the local user.
+ * Sometimes used as a return value by twitter_message_id_from_command_arg.
+ * NOT thread safe but don't you dare to even think of ever making BitlBee
+ * threaded. :-)
+ */
+extern bee_user_t twitter_log_local_user;
 
 void twitter_login_finish(struct im_connection *ic);

protocols/twitter/twitter_lib.c

@@ -460 +460 @@
 #endif
 
-static char* expand_entities(char* text, const json_value *entities);
+static void expand_entities(char **text, const json_value *node);
 
 /**
@@ -473 +473 @@
 {
         struct twitter_xml_status *txs;
-        const json_value *rt = NULL, *entities = NULL;
+        const json_value *rt = NULL;
 
         if (node->type != json_object) {
@@ -501 +501 @@
                 } else if (strcmp("in_reply_to_status_id", k) == 0 && v->type == json_integer) {
                         txs->reply_to = v->u.integer;
-                } else if (strcmp("entities", k) == 0 && v->type == json_object) {
-                        entities = v;
                 }
         }
@@ -516 +514 @@
                         txs_free(rtxs);
                 }
-        } else if (entities) {
-                txs->text = expand_entities(txs->text, entities);
+        } else {
+                expand_entities(&txs->text, node);
         }
 
@@ -534 +532 @@
 {
         struct twitter_xml_status *txs;
-        const json_value *entities = NULL;
 
         if (node->type != json_object) {
@@ -561 +558 @@
         }
 
-        if (entities) {
-                txs->text = expand_entities(txs->text, entities);
-        }
+        expand_entities(&txs->text, node);
 
         if (txs->text && txs->user && txs->id) {
@@ -573 +568 @@
 }
 
-static char* expand_entities(char* text, const json_value *entities)
-{
+static void expand_entities(char **text, const json_value *node)
+{
+        json_value *entities, *quoted;
+        char *quote_url = NULL, *quote_text = NULL;
+
+        if (!((entities = json_o_get(node, "entities")) && entities->type == json_object))
+                return;
+        if ((quoted = json_o_get(node, "quoted_status")) && quoted->type == json_object) {
+                /* New "retweets with comments" feature. Note that this info
+                 * seems to be included in the streaming API only! Grab the
+                 * full message and try to insert it when we run into the
+                 * Tweet entity. */
+                struct twitter_xml_status *txs = twitter_xt_get_status(quoted);
+                quote_text = g_strdup_printf("@%s: %s", txs->user->screen_name, txs->text);
+                quote_url = g_strdup_printf("%s/status/%" G_GUINT64_FORMAT, txs->user->screen_name, txs->id);
+                txs_free(txs);
+        } else {
+                quoted = NULL;
+        }
+
         JSON_O_FOREACH(entities, k, v) {
                 int i;
@@ -586 +599 @@
 
                 for (i = 0; i < v->u.array.length; i++) {
+                        const char *format = "%s%s <%s>%s";
+
                         if (v->u.array.values[i]->type != json_object) {
                                 continue;
@@ -592 +607 @@
                         const char *kort = json_o_str(v->u.array.values[i], "url");
                         const char *disp = json_o_str(v->u.array.values[i], "display_url");
+                        const char *full = json_o_str(v->u.array.values[i], "expanded_url");
                         char *pos, *new;
 
-                        if (!kort || !disp || !(pos = strstr(text, kort))) {
+                        if (!kort || !disp || !(pos = strstr(*text, kort))) {
                                 continue;
                         }
+                        if (quote_url && strstr(full, quote_url)) {
+                                format = "%s<%s> [%s]%s";
+                                disp = quote_text;
+                        }
 
                         *pos = '\0';
-                        new = g_strdup_printf("%s%s <%s>%s", text, kort,
+                        new = g_strdup_printf(format, *text, kort,
                                               disp, pos + strlen(kort));
 
-                        g_free(text);
-                        text = new;
-                }
-        }
-
-        return text;
+                        g_free(*text);
+                        *text = new;
+                }
+        }
+        g_free(quote_text);
+        g_free(quote_url);
 }
 
@@ -681 +701 @@
         if (g_strcasecmp(txs->user->screen_name, td->user) == 0) {
                 td->log[td->log_id].id = txs->rt_id;
+                /* More useful than NULL. */
+                td->log[td->log_id].bu = &twitter_log_local_user;
         }
 
@@ -832 +854 @@
 
         last_id_str = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
-        set_setstr(&ic->acc->set, "last_tweet", last_id_str);
+        set_setstr(&ic->acc->set, "_last_tweet", last_id_str);
         g_free(last_id_str);
 }
@@ -862 +884 @@
 
                 imcb_error(ic, "Stream closed (%s)", req->status_string);
+                if (req->status_code == 401) {
+                        imcb_error(ic, "Check your system clock.");
+                }
                 imc_logout(ic, TRUE);
                 return;

protocols/yahoo/yahoo.c

@@ -733 +733 @@
                 inp = l->data;
                 if (inp->h == tag) {
+                        byahoo_inputs = g_slist_remove(byahoo_inputs, inp);
                         g_free(inp->d);
                         g_free(inp);
-                        byahoo_inputs = g_slist_remove(byahoo_inputs, inp);
                         break;
                 }

storage_xml.c

@@ -103 +103 @@
         if (protocol) {
                 prpl = find_protocol(protocol);
+                if (!prpl) {
+                        irc_rootmsg(xd->irc, "Error loading user config: Protocol not found: `%s'", protocol);
+                        return XT_ABORT;
+                }
                 local = protocol_account_islocal(protocol);
         }
@@ -124 +128 @@
                 }
         } else {
+                g_free(pass_cr);
+                g_free(password);
                 return XT_ABORT;
         }
@@ -197 +203 @@
         fn = g_strconcat(global.conf->configdir, xd->given_nick, ".xml", NULL);
         if ((fd = open(fn, O_RDONLY)) < 0) {
-                ret = STORAGE_NO_SUCH_USER;
+                if (errno == ENOENT) {
+                        ret = STORAGE_NO_SUCH_USER;
+                } else {
+                        irc_rootmsg(irc, "Error loading user config: %s", g_strerror(errno));
+                }
                 goto error;
         }
@@ -259 +269 @@
 
 
-static gboolean xml_generate_nick(gpointer key, gpointer value, gpointer data);
 static void xml_generate_settings(struct xt_node *cur, set_t **head);
 
@@ -292 +301 @@
 
         for (acc = irc->b->accounts; acc; acc = acc->next) {
+                GHashTableIter iter;
+                gpointer key, value;
                 unsigned char *pass_cr;
                 char *pass_b64;
@@ -312 +323 @@
                 g_free(pass_b64);
 
-                /* This probably looks pretty strange. g_hash_table_foreach
-                   is quite a PITA already (but it can't get much better in
-                   C without using #define, I'm afraid), and it
-                   doesn't seem to be possible to abort the foreach on write
-                   errors, so instead let's use the _find function and
-                   return TRUE on write errors. Which means, if we found
-                   something, there was an error. :-) */
-                g_hash_table_find(acc->nicks, xml_generate_nick, cur);
+                g_hash_table_iter_init(&iter, acc->nicks);
+                while (g_hash_table_iter_next(&iter, &key, &value)) {
+                        struct xt_node *node = xt_new_node("buddy", NULL, NULL);
+                        xt_add_attr(node, "handle", key);
+                        xt_add_attr(node, "nick", value);
+                        xt_add_child(cur, node);
+                }
 
                 xml_generate_settings(cur, &acc->set);
@@ -343 +353 @@
 
         return root;
-}
-
-static gboolean xml_generate_nick(gpointer key, gpointer value, gpointer data)
-{
-        struct xt_node *node = xt_new_node("buddy", NULL, NULL);
-
-        xt_add_attr(node, "handle", key);
-        xt_add_attr(node, "nick", value);
-        xt_add_child((struct xt_node *) data, node);
-
-        return FALSE;
 }
 
@@ -388 +387 @@
         strcat(path, ".XXXXXX");
         if ((fd = mkstemp(path)) < 0) {
-                irc_rootmsg(irc, "Error while opening configuration file.");
-                return STORAGE_OTHER_ERROR;
+                goto error;
         }
 
@@ -411 +409 @@
 
 error:
-        irc_rootmsg(irc, "Write error. Disk full?");
+        irc_rootmsg(irc, "Write error: %s", g_strerror(errno));
         ret = STORAGE_OTHER_ERROR;