Changeset 62f53b50

Timestamp:

2010-10-02T05:34:53Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2af3e23

Parents:

05bf2a0 (diff), 04cd284 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging msnp13 branch which, confusingly, upgrades the msn module to use
MSNP15. (The reason for this is that A) IMHO MSNP13 is what causes most of
the pain in this upgade and B) I initially intended to only implement MSNP13
but then discovered MS doesn't support it anymore.)

This fixes issues with display names being forgotten, adding contacts (and
them automatically getting blocked sometimes!!), and adds support for
away/status messages and some support for sending offline messages.

Files:

• configure (modified) (1 diff)
• doc/CHANGES (modified) (1 diff)
• lib/Makefile (modified) (1 diff)
• lib/des.c (added)
• lib/des.h (added)
• lib/misc.c (modified) (2 diffs)
• lib/sha1.c (modified) (2 diffs)
• lib/sha1.h (modified) (1 diff)
• lib/ssl_client.h (modified) (1 diff)
• lib/ssl_gnutls.c (modified) (2 diffs)
• lib/ssl_openssl.c (modified) (4 diffs)
• lib/xmltree.c (modified) (9 diffs)
• lib/xmltree.h (modified) (2 diffs)
• protocols/bee.h (modified) (1 diff)
• protocols/bee_user.c (modified) (2 diffs)
• protocols/msn/Makefile (modified) (1 diff)
• protocols/msn/msn.c (modified) (19 diffs)
• protocols/msn/msn.h (modified) (8 diffs)
• protocols/msn/msn_util.c (modified) (13 diffs)
• protocols/msn/ns.c (modified) (22 diffs)
• protocols/msn/passport.c (deleted)
• protocols/msn/passport.h (deleted)
• protocols/msn/sb.c (modified) (21 diffs)
• protocols/msn/soap.c (added)
• protocols/msn/soap.h (added)
• protocols/msn/tables.c (modified) (2 diffs)
• protocols/nogaim.c (modified) (3 diffs)
• protocols/nogaim.h (modified) (1 diff)
• storage_xml.c (modified) (1 diff)

configure

@@ -423 +423 @@
 fi;
 
+if [ "$msn" = "1" -a "$ssl" != "openssl" ]; then
+        # Needed for MSN only. OpenSSL exports nice cipher functions already,
+        # others don't, so use our own 3des code.
+        echo 'DES=des.o' >> Makefile.settings
+fi
+
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 

doc/CHANGES

@@ -50 +50 @@
     for a list of supported protocols (works only in libpurple-enabled
     binaries).
+- Rewritten MSN module, implementing MSNP15 instead of the old MSNP8:
+  * MSNP8 support from MSN was getting pretty unreliable. There were issues
+    with remembering display names and adding contacts/auth requests.
+  * Support for sending offline messages.
+  * Support for setting and reading status messages.
 - Support for file transfers, in and out. /DCC SEND a file to a contact and
   it becomes a file transfer, and incoming file transfers become /DCC SENDs

lib/Makefile

@@ -13 +13 @@
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(DES) $(EVENT_HANDLER) ftutil.o http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
 
 LFLAGS += -r

lib/misc.c

@@ -298 +298 @@
 void http_encode( char *s )
 {
-        char *t;
+        char t[strlen(s)+1];
         int i, j;
         
-        t = g_strdup( s );
-        
+        strcpy( t, s );
         for( i = j = 0; t[i]; i ++, j ++ )
         {
@@ -320 +319 @@
         }
         s[j] = 0;
-        
-        g_free( t );
 }
 

lib/sha1.c

@@ -36 +36 @@
  */
 
+#include <string.h>
 #include "sha1.h"
 
@@ -374 +375 @@
         sha1_process_block(context);
 }
+
+#define HMAC_BLOCK_SIZE 64
+
+/* BitlBee addition: */
+void sha1_hmac(const char *key_, size_t key_len, const char *payload, size_t payload_len, uint8_t Message_Digest[sha1_hash_size])
+{
+        sha1_state_t sha1;
+        uint8_t hash[sha1_hash_size];
+        uint8_t key[HMAC_BLOCK_SIZE+1];
+        int i;
+        
+        if( key_len == 0 )
+                key_len = strlen( key_ );
+        if( payload_len == 0 )
+                payload_len = strlen( payload );
+        
+        /* Create K. If our current key is >64 chars we have to hash it,
+           otherwise just pad. */
+        memset( key, 0, HMAC_BLOCK_SIZE + 1 );
+        if( key_len > HMAC_BLOCK_SIZE )
+        {
+                sha1_init( &sha1 );
+                sha1_append( &sha1, (uint8_t*) key_, key_len );
+                sha1_finish( &sha1, key );
+        }
+        else
+        {
+                memcpy( key, key_, key_len );
+        }
+        
+        /* Inner part: H(K XOR 0x36, text) */
+        sha1_init( &sha1 );
+        for( i = 0; i < HMAC_BLOCK_SIZE; i ++ )
+                key[i] ^= 0x36;
+        sha1_append( &sha1, key, HMAC_BLOCK_SIZE );
+        sha1_append( &sha1, (const uint8_t*) payload, payload_len );
+        sha1_finish( &sha1, hash );
+        
+        /* Final result: H(K XOR 0x5C, inner stuff) */
+        sha1_init( &sha1 );
+        for( i = 0; i < HMAC_BLOCK_SIZE; i ++ )
+                key[i] ^= 0x36 ^ 0x5c;
+        sha1_append( &sha1, key, HMAC_BLOCK_SIZE );
+        sha1_append( &sha1, hash, sha1_hash_size );
+        sha1_finish( &sha1, Message_Digest );
+}

lib/sha1.h

@@ -67 +67 @@
 G_MODULE_EXPORT int sha1_append(sha1_state_t *, const uint8_t *, unsigned int);
 G_MODULE_EXPORT int sha1_finish(sha1_state_t *, uint8_t Message_Digest[sha1_hash_size]);
+G_MODULE_EXPORT void sha1_hmac(const char *key_, size_t key_len, const char *payload, size_t payload_len, uint8_t Message_Digest[sha1_hash_size]);
 
 #endif

lib/ssl_client.h

@@ -78 +78 @@
    the same action as the handler that just received the SSL_AGAIN.) */
 G_MODULE_EXPORT b_input_condition ssl_getdirection( void *conn );
+
+G_MODULE_EXPORT size_t ssl_des3_encrypt(const unsigned char *key, size_t key_len, const unsigned char *input, size_t input_len, const unsigned char *iv, unsigned char **res);

lib/ssl_gnutls.c

@@ -189 +189 @@
                 ssl_errno = SSL_AGAIN;
         
+        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
+        
         return st;
 }
@@ -207 +209 @@
         if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
                 ssl_errno = SSL_AGAIN;
+        
+        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
         
         return st;

lib/ssl_openssl.c

@@ -116 +116 @@
         {
                 initialized = TRUE;
-                SSLeay_add_ssl_algorithms();
+                SSL_library_init();
+                //SSLeay_add_ssl_algorithms();
+                //OpenSSL_add_all_algorithms();
         }
         
@@ -205 +207 @@
         }
         
+        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
+        
         return st;
 }
@@ -219 +223 @@
         
         st = SSL_write( ((struct scd*)conn)->ssl, buf, len );
+        
+        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
         
         ssl_errno = SSL_OK;
@@ -272 +278 @@
         return( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE ? B_EV_IO_WRITE : B_EV_IO_READ );
 }
+
+size_t ssl_des3_encrypt(const unsigned char *key, size_t key_len, const unsigned char *input, size_t input_len, const unsigned char *iv, unsigned char **res)
+{
+        int output_length = 0;    
+        EVP_CIPHER_CTX ctx;
+        
+        *res = g_new0(unsigned char, 72);
+        
+        /* Don't set key or IV because we will modify the parameters */
+        EVP_CIPHER_CTX_init(&ctx);
+        EVP_CipherInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, NULL, NULL, 1);
+        EVP_CIPHER_CTX_set_key_length(&ctx, key_len);
+        EVP_CIPHER_CTX_set_padding(&ctx, 0);
+        /* We finished modifying parameters so now we can set key and IV */
+        EVP_CipherInit_ex(&ctx, NULL, NULL, key, iv, 1);
+        EVP_CipherUpdate(&ctx, *res, &output_length, input, input_len);
+        EVP_CipherFinal_ex(&ctx, *res, &output_length);
+        EVP_CIPHER_CTX_cleanup(&ctx);   
+        //EVP_cleanup();
+        
+        return output_length;
+}

lib/xmltree.c

@@ -141 +141 @@
 /* Feed the parser, don't execute any handler. Returns -1 on errors, 0 on
    end-of-stream and 1 otherwise. */
-int xt_feed( struct xt_parser *xt, char *text, int text_len )
+int xt_feed( struct xt_parser *xt, const char *text, int text_len )
 {
         if( !g_markup_parse_context_parse( xt->parser, text, text_len, &xt->gerr ) )
@@ -174 +174 @@
         if( node->flags & XT_COMPLETE && !( node->flags & XT_SEEN ) )
         {
-                for( i = 0; xt->handlers[i].func; i ++ )
+                if( xt->handlers ) for( i = 0; xt->handlers[i].func; i ++ )
                 {
                         /* This one is fun! \o/ */
                         
-                                                /* If handler.name == NULL it means it should always match. */
+                            /* If handler.name == NULL it means it should always match. */
                         if( ( xt->handlers[i].name == NULL || 
-                                                /* If it's not, compare. There should always be a name. */
+                              /* If it's not, compare. There should always be a name. */
                               g_strcasecmp( xt->handlers[i].name, node->name ) == 0 ) &&
-                                                /* If handler.parent == NULL, it's a match. */
+                            /* If handler.parent == NULL, it's a match. */
                             ( xt->handlers[i].parent == NULL ||
-                                                /* If there's a parent node, see if the name matches. */
+                              /* If there's a parent node, see if the name matches. */
                               ( node->parent ? g_strcasecmp( xt->handlers[i].parent, node->parent->name ) == 0 : 
-                                                /* If there's no parent, the handler should mention <root> as a parent. */
-                                               g_strcasecmp( xt->handlers[i].parent, "<root>" ) == 0 ) ) )
+                              /* If there's no parent, the handler should mention <root> as a parent. */
+                                               strcmp( xt->handlers[i].parent, "<root>" ) == 0 ) ) )
                         {
                                 st = xt->handlers[i].func( node, xt->data );
@@ -260 +260 @@
 }
 
+struct xt_node *xt_from_string( const char *in )
+{
+        struct xt_parser *parser;
+        struct xt_node *ret;
+        
+        parser = xt_new( NULL, NULL );
+        xt_feed( parser, in, strlen( in ) );
+        ret = parser->root;
+        parser->root = NULL;
+        xt_free( parser );
+        
+        return ret;
+}
+
 static void xt_to_string_real( struct xt_node *node, GString *str )
 {
@@ -317 +331 @@
         /* Indentation */
         for( c = node; c->parent; c = c->parent )
-                printf( "\t" );
+                printf( "    " );
         
         /* Start the tag */
@@ -324 +338 @@
         /* Print the attributes */
         for( i = 0; node->attr[i].key; i ++ )
-                printf( " %s=\"%s\"", node->attr[i].key, g_markup_escape_text( node->attr[i].value, -1 ) );
+        {
+                char *v = g_markup_escape_text( node->attr[i].value, -1 );
+                printf( " %s=\"%s\"", node->attr[i].key, v );
+                g_free( v );
+        }
         
         /* /> in case there's really *nothing* inside this tag, otherwise
@@ -344 +362 @@
                 for( i = 0; node->text[i] && isspace( node->text[i] ); i ++ );
                 if( node->text[i] )
-                        printf( "%s", g_markup_escape_text( node->text, -1 ) );
+                {
+                        char *v = g_markup_escape_text( node->text, -1 );
+                        printf( "%s", v );
+                        g_free( v );
+                }
         }
         
@@ -355 +377 @@
         if( node->children )
                 for( c = node; c->parent; c = c->parent )
-                        printf( "\t" );
+                        printf( "    " );
         
         /* Non-empty tag is now finished. */
@@ -460 +482 @@
                 
                 node = node->next;
+        }
+        
+        return node;
+}
+
+/* More advanced than the one above, understands something like
+   ../foo/bar to find a subnode bar of a node foo which is a child
+   of node's parent. Pass the node directly, not its list of children. */
+struct xt_node *xt_find_path( struct xt_node *node, const char *name )
+{
+        while( name && *name && node )
+        {
+                char *colon, *slash;
+                int n;
+                
+                if( ( slash = strchr( name, '/' ) ) )
+                        n = slash - name;
+                else
+                        n = strlen( name );
+                
+                if( strncmp( name, "..", n ) == 0 )
+                {
+                        node = node->parent;
+                }
+                else
+                {
+                        node = node->children;
+                        
+                        while( node )
+                        {
+                                if( g_strncasecmp( node->name, name, n ) == 0 ||
+                                    ( ( colon = strchr( node->name, ':' ) ) &&
+                                      g_strncasecmp( colon + 1, name, n ) == 0 ) )
+                                        break;
+                                
+                                node = node->next;
+                        }
+                }
+                
+                name = slash ? slash + 1 : NULL;
         }
         
@@ -550 +612 @@
 }
 
+/* Same, but at the beginning. */
+void xt_insert_child( struct xt_node *parent, struct xt_node *child )
+{
+        struct xt_node *node, *last;
+        
+        for( node = child; node; node = node->next )
+        {
+                if( node->parent != NULL )
+                {
+                        /* ERROR CONDITION: They seem to have a parent already??? */
+                }
+                
+                node->parent = parent;
+                last = node;
+        }
+        
+        last->next = parent->children;
+        parent->children = child;
+}
+
 void xt_add_attr( struct xt_node *node, const char *key, const char *value )
 {

lib/xmltree.h

@@ -79 +79 @@
 struct xt_parser *xt_new( const struct xt_handler_entry *handlers, gpointer data );
 void xt_reset( struct xt_parser *xt );
-int xt_feed( struct xt_parser *xt, char *text, int text_len );
+int xt_feed( struct xt_parser *xt, const char *text, int text_len );
 int xt_handle( struct xt_parser *xt, struct xt_node *node, int depth );
 void xt_cleanup( struct xt_parser *xt, struct xt_node *node, int depth );
+struct xt_node *xt_from_string( const char *in );
 char *xt_to_string( struct xt_node *node );
 void xt_print( struct xt_node *node );
@@ -88 +89 @@
 void xt_free( struct xt_parser *xt );
 struct xt_node *xt_find_node( struct xt_node *node, const char *name );
+struct xt_node *xt_find_path( struct xt_node *node, const char *name );
 char *xt_find_attr( struct xt_node *node, const char *key );
 
 struct xt_node *xt_new_node( char *name, const char *text, struct xt_node *children );
 void xt_add_child( struct xt_node *parent, struct xt_node *child );
+void xt_insert_child( struct xt_node *parent, struct xt_node *child );
 void xt_add_attr( struct xt_node *node, const char *key, const char *value );
 int xt_remove_attr( struct xt_node *node, const char *key );

protocols/bee.h

@@ -151 +151 @@
  * - 'state' and 'message' can be NULL */
 G_MODULE_EXPORT void imcb_buddy_status( struct im_connection *ic, const char *handle, int flags, const char *state, const char *message );
+G_MODULE_EXPORT void imcb_buddy_status_msg( struct im_connection *ic, const char *handle, const char *message );
 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. */

protocols/bee_user.c

@@ -187 +187 @@
         /* TODO(wilmer): OPT_AWAY, or just state == NULL ? */
         bu->flags = flags;
-        bu->status = g_strdup( ( flags & OPT_AWAY ) && state == NULL ? "Away" : state );
         bu->status_msg = g_strdup( message );
+        if( state && *state )
+                bu->status = g_strdup( state );
+        else if( flags & OPT_AWAY )
+                bu->status = g_strdup( "Away" );
+        else
+                bu->status = NULL;
         
         if( bu->status == NULL && ( flags & OPT_MOBILE ) &&
@@ -205 +210 @@
 }
 
+/* Same, but only change the away/status message, not any away/online state info. */
+void imcb_buddy_status_msg( struct im_connection *ic, const char *handle, const char *message )
+{
+        bee_t *bee = ic->bee;
+        bee_user_t *bu, *old;
+        
+        if( !( bu = bee_user_by_handle( bee, ic, handle ) ) )
+        {
+                return;
+        }
+        
+        old = g_memdup( bu, sizeof( bee_user_t ) );
+        
+        bu->status_msg = message && *message ? g_strdup( message ) : NULL;
+        
+        if( bee->ui->user_status )
+                bee->ui->user_status( bee, bu, old );
+        
+        g_free( old->status_msg );
+        g_free( old );
+}
+
 void imcb_buddy_times( struct im_connection *ic, const char *handle, time_t login, time_t idle )
 {

protocols/msn/Makefile

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

protocols/msn/msn.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -25 +25 @@
 
 #include "nogaim.h"
+#include "soap.h"
 #include "msn.h"
 
@@ -35 +36 @@
 static void msn_init( account_t *acc )
 {
-        set_add( &acc->set, "display_name", NULL, set_eval_display_name, acc );
-        set_add( &acc->set, "local_display_name", "false", set_eval_bool, acc );
+        set_t *s;
+        
+        s = set_add( &acc->set, "display_name", NULL, set_eval_display_name, acc );
+        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        
         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;
 }
 
@@ -47 +53 @@
         
         ic->proto_data = md;
-        md->fd = -1;
         
         if( strchr( acc->user, '@' ) == NULL )
@@ -56 +61 @@
         }
         
-        imcb_log( ic, "Connecting" );
-        
-        md->fd = proxy_connect( "messenger.hotmail.com", 1863, msn_ns_connected, ic );
-        if( md->fd < 0 )
-        {
-                imcb_error( ic, "Could not connect to server" );
-                imc_logout( ic, TRUE );
-                return;
-        }
-        
         md->ic = ic;
         md->away_state = msn_away_state_list;
-        
-        msn_connections = g_slist_append( msn_connections, ic );
+        md->domaintree = g_tree_new( msn_domaintree_cmp );
+        md->ns->fd = -1;
+        
+        msn_connections = g_slist_prepend( msn_connections, ic );
+        
+        imcb_log( ic, "Connecting" );
+        msn_ns_connect( ic, md->ns, MSN_NS_HOST, MSN_NS_PORT );
 }
 
@@ -76 +76 @@
         struct msn_data *md = ic->proto_data;
         GSList *l;
+        int i;
         
         if( md )
@@ -85 +86 @@
                 */
                 
-                if( md->fd >= 0 )
-                        closesocket( md->fd );
-                
-                if( md->handler )
-                {
-                        if( md->handler->rxq ) g_free( md->handler->rxq );
-                        if( md->handler->cmd_text ) g_free( md->handler->cmd_text );
-                        g_free( md->handler );
-                }
+                msn_ns_close( md->ns );
                 
                 while( md->switchboards )
@@ -99 +92 @@
                 
                 msn_msgq_purge( ic, &md->msgq );
-                
-                while( md->groupcount > 0 )
-                        g_free( md->grouplist[--md->groupcount] );
-                g_free( md->grouplist );
+                msn_soapq_flush( ic, FALSE );
+                
+                for( i = 0; i < sizeof( md->tokens ) / sizeof( md->tokens[0] ); i ++ )
+                        g_free( md->tokens[i] );
+                g_free( md->lock_key );
+                g_free( md->pp_policy );
+                
+                while( md->groups )
+                {
+                        struct msn_group *mg = md->groups->data;
+                        g_free( mg->id );
+                        g_free( mg->name );
+                        g_free( mg );
+                        md->groups = g_slist_remove( md->groups, mg );
+                }
+                
+                g_tree_destroy( md->domaintree );
+                md->domaintree = NULL;
                 
                 while( md->grpq )
@@ -134 +141 @@
         if( strcmp( who, "raw" ) == 0 )
         {
-                msn_write( ic, message, strlen( message ) );
-                msn_write( ic, "\r\n", 2 );
+                msn_ns_write( ic, -1, "%s\r\n", message );
         }
         else
@@ -173 +179 @@
 static void msn_set_away( struct im_connection *ic, char *state, char *message )
 {
-        char buf[1024];
+        char *uux;
         struct msn_data *md = ic->proto_data;
         
@@ -181 +187 @@
                 md->away_state = msn_away_state_list + 1;
         
-        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, md->away_state->code );
-        msn_write( ic, buf, strlen( buf ) );
-}
-
-static void msn_set_my_name( struct im_connection *ic, char *info )
-{
-        msn_set_display_name( ic, info );
+        if( !msn_ns_write( ic, -1, "CHG %d %s\r\n", ++md->trId, md->away_state->code ) )
+                return;
+        
+        uux = g_markup_printf_escaped( "<Data><PSM>%s</PSM><CurrentMedia></CurrentMedia>"
+                                       "</Data>", message ? message : "" );
+        msn_ns_write( ic, -1, "UUX %d %zd\r\n%s", ++md->trId, strlen( uux ), uux );
+        g_free( uux );
 }
 
@@ -200 +206 @@
         struct bee_user *bu = bee_user_by_handle( ic->bee, ic, who );
         
-        msn_buddy_list_add( ic, "FL", who, who, group );
+        msn_buddy_list_add( ic, MSN_BUDDY_FL, who, who, group );
         if( bu && bu->group )
-                msn_buddy_list_remove( ic, "FL", who, bu->group->name );
+                msn_buddy_list_remove( ic, MSN_BUDDY_FL, who, bu->group->name );
 }
 
 static void msn_remove_buddy( struct im_connection *ic, char *who, char *group )
 {
-        msn_buddy_list_remove( ic, "FL", who, NULL );
+        msn_buddy_list_remove( ic, MSN_BUDDY_FL, who, NULL );
 }
 
@@ -267 +273 @@
 static void msn_keepalive( struct im_connection *ic )
 {
-        msn_write( ic, "PNG\r\n", strlen( "PNG\r\n" ) );
+        msn_ns_write( ic, -1, "PNG\r\n" );
 }
 
 static void msn_add_permit( struct im_connection *ic, char *who )
 {
-        msn_buddy_list_add( ic, "AL", who, who, NULL );
+        msn_buddy_list_add( ic, MSN_BUDDY_AL, who, who, NULL );
 }
 
 static void msn_rem_permit( struct im_connection *ic, char *who )
 {
-        msn_buddy_list_remove( ic, "AL", who, NULL );
+        msn_buddy_list_remove( ic, MSN_BUDDY_AL, who, NULL );
 }
 
@@ -284 +290 @@
         struct msn_switchboard *sb;
         
-        msn_buddy_list_add( ic, "BL", who, who, NULL );
+        msn_buddy_list_add( ic, MSN_BUDDY_BL, who, who, NULL );
         
         /* If there's still a conversation with this person, close it. */
@@ -295 +301 @@
 static void msn_rem_deny( struct im_connection *ic, char *who )
 {
-        msn_buddy_list_remove( ic, "BL", who, NULL );
+        msn_buddy_list_remove( ic, MSN_BUDDY_BL, who, NULL );
 }
 
@@ -314 +320 @@
         account_t *acc = set->data;
         struct im_connection *ic = acc->ic;
-        
-        /* Allow any name if we're offline. */
-        if( ic == NULL )
-                return value;
+        struct msn_data *md = ic->proto_data;
         
         if( strlen( value ) > 129 )
@@ -325 +328 @@
         }
         
-        /* Returning NULL would be better, because the server still has to
-           confirm the name change. However, it looks a bit confusing to the
-           user. */
-        return msn_set_display_name( ic, value ) ? value : NULL;
+        if( md->flags & MSN_GOT_PROFILE_DN )
+                imcb_log( ic, "Warning: Persistent name changes for this account have to be done "
+                              "in the profile. BitlBee doesn't currently support this." );
+        
+        msn_soap_addressbook_set_display_name( ic, value );
+        return msn_ns_set_display_name( ic, value ) ? value : NULL;
+}
+
+static void msn_buddy_data_add( bee_user_t *bu )
+{
+        struct msn_data *md = bu->ic->proto_data;
+        bu->data = g_new0( struct msn_buddy_data, 1 );
+        g_tree_insert( md->domaintree, bu->handle, bu );
+}
+
+static void msn_buddy_data_free( bee_user_t *bu )
+{
+        struct msn_data *md = bu->ic->proto_data;
+        g_tree_remove( md->domaintree, bu->handle );
+        g_free( bu->data );
 }
 
@@ -343 +362 @@
         ret->set_away = msn_set_away;
         ret->get_info = msn_get_info;
-        ret->set_my_name = msn_set_my_name;
         ret->add_buddy = msn_add_buddy;
         ret->remove_buddy = msn_remove_buddy;
@@ -357 +375 @@
         ret->send_typing = msn_send_typing;
         ret->handle_cmp = g_strcasecmp;
+        ret->buddy_data_add = msn_buddy_data_add;
+        ret->buddy_data_free = msn_buddy_data_free;
+        
         //ret->transfer_request = msn_ftp_transfer_request;
 

protocols/msn/msn.h

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -39 +39 @@
 #endif
 
-#define QRY_NAME "msmsgs@msnmsgr.com"
-#define QRY_CODE "Q1P7W2E4J9R8U3S5"
+/* This should be MSN Messenger 7.0.0813
+#define MSNP11_PROD_KEY "CFHUR$52U_{VIX5T"
+#define MSNP11_PROD_ID  "PROD0101{0RM?UBW"
+*/
+
+#define MSN_NS_HOST "messenger.hotmail.com"
+#define MSN_NS_PORT 1863
+
+/* Some other version.
+#define MSNP11_PROD_KEY "O4BG@C7BWLYQX?5G"
+#define MSNP11_PROD_ID  "PROD01065C%ZFN6F"
+*/
+
+#define MSNP11_PROD_KEY "ILTXC!4IXB5FB*PX"
+#define MSNP11_PROD_ID  "PROD0119GSJUC$18"
+#define MSNP_VER        "MSNP15"
+#define MSNP_BUILD      "8.5.1288"
 
 #define MSN_SB_NEW         -24062002
@@ -61 +76 @@
 #define PROFILE_URL "http://members.msn.com/"
 
+typedef enum
+{
+        MSN_GOT_PROFILE = 1,
+        MSN_GOT_PROFILE_DN = 2,
+        MSN_DONE_ADL = 4,
+        MSN_REAUTHING = 8,
+} msn_flags_t;
+
+struct msn_handler_data
+{
+        int fd, inpa;
+        int rxlen;
+        char *rxq;
+        
+        int msglen;
+        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;
         
-        int fd;
-        struct msn_handler_data *handler;
+        struct msn_handler_data ns[1];
+        msn_flags_t flags;
         
         int trId;
-        
-        GSList *msgq, *grpq;
+        char *tokens[4];
+        char *lock_key, *pp_policy;
+        
+        GSList *msgq, *grpq, *soapq;
         GSList *switchboards;
         int sb_failures;
         time_t first_sb_failure;
-        GSList *filetransfers;
         
         const struct msn_away_state *away_state;
-        int buddycount;
-        int groupcount;
-        char **grouplist;
+        GSList *groups;
+        
+        /* Mostly used for sending the ADL command; since MSNP13 the client
+           is responsible for downloading the contact list and then sending
+           it to the MSNP server. */
+        GTree *domaintree;
+        int adl_todo;
 };
 
@@ -86 +130 @@
         struct im_connection *ic;
         
+        /* The following two are also in the handler. TODO: Clean up. */
         int fd;
         gint inp;
@@ -127 +172 @@
 };
 
-struct msn_handler_data
-{
-        int fd;
-        int rxlen;
-        char *rxq;
-        
-        int msglen;
-        char *cmd_text;
-        
-        gpointer data;
-        
-        int (*exec_command) ( gpointer data, char **cmd, int count );
-        int (*exec_message) ( gpointer data, char *msg, int msglen, char **cmd, int count );
+typedef enum
+{
+        MSN_BUDDY_FL = 1,   /* Warning: FL,AL,BL *must* be 1,2,4. */
+        MSN_BUDDY_AL = 2,
+        MSN_BUDDY_BL = 4,
+        MSN_BUDDY_RL = 8,
+        MSN_BUDDY_PL = 16,
+        MSN_BUDDY_ADL_SYNCED = 256,
+} msn_buddy_flags_t;
+
+struct msn_buddy_data
+{
+        char *cid;
+        msn_buddy_flags_t flags;
+};
+
+struct msn_group
+{
+        char *name;
+        char *id;
 };
 
@@ -161 +213 @@
 
 /* ns.c */
-gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond );
+int msn_ns_write( struct im_connection *ic, int fd, const char *fmt, ... );
+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 );
+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 );
 
 /* msn_util.c */
-int msn_write( struct im_connection *ic, char *s, int len );
 int msn_logged_in( struct im_connection *ic );
-int msn_buddy_list_add( struct im_connection *ic, const char *list, const char *who, const char *realname_, const char *group );
-int msn_buddy_list_remove( struct im_connection *ic, char *list, const char *who, const char *group );
-void msn_buddy_ask( struct im_connection *ic, char *handle, char *realname );
+int msn_buddy_list_add( struct im_connection *ic, msn_buddy_flags_t list, const char *who, const char *realname_, const char *group );
+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_findheader( char *text, char *header, int len );
 char **msn_linesplit( char *line );
 int msn_handler( struct msn_handler_data *h );
-char *msn_http_encode( const char *input );
 void msn_msgq_purge( struct im_connection *ic, GSList **list );
-gboolean msn_set_display_name( struct im_connection *ic, const char *rawname );
+char *msn_p11_challenge( char *challenge );
+gint msn_domaintree_cmp( gconstpointer a_, gconstpointer b_ );
+struct msn_group *msn_group_by_name( struct im_connection *ic, const char *name );
+struct msn_group *msn_group_by_id( struct im_connection *ic, const char *id );
+int msn_ns_set_display_name( struct im_connection *ic, const char *value );
 
 /* tables.c */
@@ -183 +242 @@
 
 /* sb.c */
-int msn_sb_write( struct msn_switchboard *sb, char *s, int len );
+int msn_sb_write( struct msn_switchboard *sb, const char *fmt, ... );
 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, char *handle );
@@ -196 +255 @@
 void msn_sb_stop_keepalives( struct msn_switchboard *sb );
 
-/* invitation.c */
-void msn_ftp_transfer_request( struct im_connection *ic, file_transfer_t *ft, char *who );
-
 #endif //_MSN_H

protocols/msn/msn_util.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -26 +26 @@
 #include "nogaim.h"
 #include "msn.h"
+#include "md5.h"
+#include "soap.h"
 #include <ctype.h>
 
-int msn_write( struct im_connection *ic, char *s, int len )
+int msn_logged_in( struct im_connection *ic )
+{
+        imcb_connected( ic );
+        
+        return( 0 );
+}
+
+static char *adlrml_entry( const char *handle_, msn_buddy_flags_t list )
+{
+        char *domain, handle[strlen(handle_)+1];
+        
+        strcpy( handle, handle_ );
+        if( ( domain = strchr( handle, '@' ) ) )
+                *(domain++) = '\0';
+        else
+                return NULL;
+        
+        return g_markup_printf_escaped( "<ml><d n=\"%s\"><c n=\"%s\" l=\"%d\" t=\"1\"/></d></ml>",
+                domain, handle, list );
+}
+
+int msn_buddy_list_add( struct im_connection *ic, msn_buddy_flags_t list, const char *who, const char *realname, const char *group )
 {
         struct msn_data *md = ic->proto_data;
-        int st;
-        
-        st = write( md->fd, s, len );
-        if( st != len )
-        {
-                imcb_error( ic, "Short write() to main server" );
-                imc_logout( ic, TRUE );
-                return 0;
-        }
-        
-        return 1;
-}
-
-int msn_logged_in( struct im_connection *ic )
-{
-        imcb_connected( ic );
-        
-        return( 0 );
-}
-
-int msn_buddy_list_add( struct im_connection *ic, const char *list, const char *who, const char *realname_, const char *group )
-{
-        struct msn_data *md = ic->proto_data;
-        char buf[1024], *realname, groupid[8];
+        char groupid[8];
+        bee_user_t *bu;
+        struct msn_buddy_data *bd;
+        char *adl;
         
         *groupid = '\0';
+#if 0
         if( group )
         {
@@ -87 +91 @@
                         if( l == NULL )
                         {
-                                char *groupname = msn_http_encode( group );
+                                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 );
-                                g_free( groupname );
                                 return msn_write( ic, buf, strlen( buf ) );
                         }
@@ -101 +106 @@
                 }
         }
-        
-        realname = msn_http_encode( realname_ );
-        g_snprintf( buf, sizeof( buf ), "ADD %d %s %s %s%s\r\n", ++md->trId, list, who, realname, groupid );
-        g_free( realname );
-        
-        return msn_write( ic, buf, strlen( buf ) );
-}
-
-int msn_buddy_list_remove( struct im_connection *ic, char *list, const char *who, const char *group )
+#endif
+        
+        if( !( ( bu = bee_user_by_handle( ic->bee, ic, who ) ) ||
+               ( bu = bee_user_new( ic->bee, ic, who, 0 ) ) ) ||
+            !( bd = bu->data ) || bd->flags & list )
+                return 1;
+        
+        bd->flags |= list;
+        
+        if( list == MSN_BUDDY_FL )
+                msn_soap_ab_contact_add( ic, bu );
+        else
+                msn_soap_memlist_edit( ic, who, TRUE, list );
+        
+        if( ( adl = adlrml_entry( who, list ) ) )
+        {
+                int st = msn_ns_write( ic, -1, "ADL %d %zd\r\n%s",
+                                       ++md->trId, strlen( adl ), adl );
+                g_free( adl );
+                
+                return st;
+        }
+        
+        return 1;
+}
+
+int msn_buddy_list_remove( struct im_connection *ic, msn_buddy_flags_t list, const char *who, const char *group )
 {
         struct msn_data *md = ic->proto_data;
-        char buf[1024], groupid[8];
+        char groupid[8];
+        bee_user_t *bu;
+        struct msn_buddy_data *bd;
+        char *adl;
         
         *groupid = '\0';
+#if 0
         if( group )
         {
@@ -125 +152 @@
                         }
         }
-        
-        g_snprintf( buf, sizeof( buf ), "REM %d %s %s%s\r\n", ++md->trId, list, who, groupid );
-        if( msn_write( ic, buf, strlen( buf ) ) )
-                return( 1 );
-        
-        return( 0 );
+#endif
+        
+        if( !( bu = bee_user_by_handle( ic->bee, ic, who ) ) ||
+            !( bd = bu->data ) || !( bd->flags & list ) )
+                return 1;
+        
+        bd->flags &= ~list;
+        
+        if( list == MSN_BUDDY_FL )
+                msn_soap_ab_contact_del( ic, bu );
+        else
+                msn_soap_memlist_edit( ic, who, FALSE, list );
+        
+        if( ( adl = adlrml_entry( who, list ) ) )
+        {
+                int st = msn_ns_write( ic, -1, "RML %d %zd\r\n%s",
+                                       ++md->trId, strlen( adl ), adl );
+                g_free( adl );
+                
+                return st;
+        }
+        
+        return 1;
 }
 
@@ -144 +188 @@
         struct msn_buddy_ask_data *bla = data;
         
-        msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname, NULL );
+        msn_buddy_list_add( bla->ic, MSN_BUDDY_AL, bla->handle, bla->realname, NULL );
         
         imcb_ask_add( bla->ic, bla->handle, NULL );
@@ -157 +201 @@
         struct msn_buddy_ask_data *bla = data;
         
-        msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname, NULL );
+        msn_buddy_list_add( bla->ic, MSN_BUDDY_BL, bla->handle, bla->realname, NULL );
         
         g_free( bla->handle );
@@ -164 +208 @@
 }
 
-void msn_buddy_ask( struct im_connection *ic, char *handle, char *realname )
-{
-        struct msn_buddy_ask_data *bla = g_new0( struct msn_buddy_ask_data, 1 );
+void msn_buddy_ask( bee_user_t *bu )
+{
+        struct msn_buddy_ask_data *bla;
+        struct msn_buddy_data *bd = bu->data;
         char buf[1024];
         
-        bla->ic = ic;
-        bla->handle = g_strdup( handle );
-        bla->realname = g_strdup( realname );
+        if( ( bd->flags & 30 ) != 8 && ( bd->flags & 30 ) != 16 )
+                return;
+        
+        bla = g_new0( struct msn_buddy_ask_data, 1 );
+        bla->ic = bu->ic;
+        bla->handle = g_strdup( bu->handle );
+        bla->realname = g_strdup( bu->fullname );
         
         g_snprintf( buf, sizeof( buf ),
                     "The user %s (%s) wants to add you to his/her buddy list.",
-                    handle, realname );
-        imcb_ask( ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );
+                    bu->handle, bu->fullname );
+        imcb_ask( bu->ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );
 }
 
@@ -279 +328 @@
         if( st <= 0 )
                 return( -1 );
+        
+        if( getenv( "BITLBEE_DEBUG" ) )
+        {
+                write( 2, "->C:", 4 );
+                write( 2, h->rxq + h->rxlen - st, st );
+        }
         
         while( st )
@@ -296 +351 @@
                                         cmd = msn_linesplit( cmd_text );
                                         for( count = 0; cmd[count]; count ++ );
-                                        st = h->exec_command( h->data, cmd, count );
+                                        st = h->exec_command( h, cmd, count );
                                         g_free( cmd_text );
                                         
@@ -331 +386 @@
                         for( count = 0; cmd[count]; count ++ );
                         
-                        st = h->exec_message( h->data, msg, h->msglen, cmd, count );
+                        st = h->exec_message( h, msg, h->msglen, cmd, count );
                         g_free( msg );
                         g_free( h->cmd_text );
@@ -367 +422 @@
 }
 
-/* The difference between this function and the normal http_encode() function
-   is that this one escapes every 7-bit ASCII character because this is said
-   to avoid some lame server-side checks when setting a real-name. Also,
-   non-ASCII characters are not escaped because MSN servers don't seem to
-   appreciate that! */
-char *msn_http_encode( const char *input )
-{
-        char *ret, *s;
-        int i;
-        
-        ret = s = g_new0( char, strlen( input ) * 3 + 1 );
-        for( i = 0; input[i]; i ++ )
-                if( input[i] & 128 )
-                {
-                        *s = input[i];
-                        s ++;
-                }
-                else
-                {
-                        g_snprintf( s, 4, "%%%02X", input[i] );
-                        s += 3;
-                }
-        
-        return ret;
-}
-
 void msn_msgq_purge( struct im_connection *ic, GSList **list )
 {
@@ -433 +462 @@
 }
 
-gboolean msn_set_display_name( struct im_connection *ic, const char *rawname )
-{
-        char *fn = msn_http_encode( rawname );
+/* Copied and heavily modified from http://tmsnc.sourceforge.net/chl.c */
+char *msn_p11_challenge( char *challenge )
+{
+        char *output, buf[256];
+        md5_state_t md5c;
+        unsigned char md5Hash[16], *newHash;
+        unsigned int *md5Parts, *chlStringParts, newHashParts[5];
+        long long nHigh = 0, nLow = 0;
+        int i, n;
+
+        /* Create the MD5 hash */
+        md5_init(&md5c);
+        md5_append(&md5c, (unsigned char*) challenge, strlen(challenge));
+        md5_append(&md5c, (unsigned char*) MSNP11_PROD_KEY, strlen(MSNP11_PROD_KEY));
+        md5_finish(&md5c, md5Hash);
+
+        /* Split it into four integers */
+        md5Parts = (unsigned int *)md5Hash;
+        for (i = 0; i < 4; i ++)
+        {  
+                md5Parts[i] = GUINT32_TO_LE(md5Parts[i]);
+                
+                /* & each integer with 0x7FFFFFFF */
+                /* and save one unmodified array for later */
+                newHashParts[i] = md5Parts[i];
+                md5Parts[i] &= 0x7FFFFFFF;
+        }
+        
+        /* make a new string and pad with '0' */
+        n = g_snprintf(buf, sizeof(buf)-5, "%s%s00000000", challenge, MSNP11_PROD_ID);
+        /* truncate at an 8-byte boundary */
+        buf[n&=~7] = '\0';
+        
+        /* split into integers */
+        chlStringParts = (unsigned int *)buf;
+        
+        /* this is magic */
+        for (i = 0; i < (n / 4) - 1; i += 2)
+        {
+                long long temp;
+
+                chlStringParts[i]   = GUINT32_TO_LE(chlStringParts[i]);
+                chlStringParts[i+1] = GUINT32_TO_LE(chlStringParts[i+1]);
+
+                temp  = (md5Parts[0] * (((0x0E79A9C1 * (long long)chlStringParts[i]) % 0x7FFFFFFF)+nHigh) + md5Parts[1])%0x7FFFFFFF;
+                nHigh = (md5Parts[2] * (((long long)chlStringParts[i+1]+temp) % 0x7FFFFFFF) + md5Parts[3]) % 0x7FFFFFFF;
+                nLow  = nLow + nHigh + temp;
+        }
+        nHigh = (nHigh+md5Parts[1]) % 0x7FFFFFFF;
+        nLow = (nLow+md5Parts[3]) % 0x7FFFFFFF;
+        
+        newHashParts[0] ^= nHigh;
+        newHashParts[1] ^= nLow;
+        newHashParts[2] ^= nHigh;
+        newHashParts[3] ^= nLow;
+        
+        /* swap more bytes if big endian */
+        for (i = 0; i < 4; i ++)
+                newHashParts[i] = GUINT32_TO_LE(newHashParts[i]); 
+        
+        /* make a string of the parts */
+        newHash = (unsigned char *)newHashParts;
+        
+        /* convert to hexadecimal */
+        output = g_new(char, 33);
+        for (i = 0; i < 16; i ++)
+                sprintf(output + i * 2, "%02x", newHash[i]);
+        
+        return output;
+}
+
+gint msn_domaintree_cmp( gconstpointer a_, gconstpointer b_ )
+{
+        const char *a = a_, *b = b_;
+        gint ret;
+        
+        if( !( a = strchr( a, '@' ) ) || !( b = strchr( b, '@' ) ) ||
+            ( ret = strcmp( a, b ) ) == 0 )
+                ret = strcmp( a_, b_ );
+        
+        return ret;
+}
+
+struct msn_group *msn_group_by_name( struct im_connection *ic, const char *name )
+{
         struct msn_data *md = ic->proto_data;
-        char buf[1024];
-        
-        g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, ic->acc->user, fn );
-        g_free( fn );
-        
-        return msn_write( ic, buf, strlen( buf ) ) != 0;
-}
+        GSList *l;
+        
+        for( l = md->groups; l; l = l->next )
+        {
+                struct msn_group *mg = l->data;
+                
+                if( g_strcasecmp( mg->name, name ) == 0 )
+                        return mg;
+        }
+        
+        return NULL;
+}
+
+struct msn_group *msn_group_by_id( struct im_connection *ic, const char *id )
+{
+        struct msn_data *md = ic->proto_data;
+        GSList *l;
+        
+        for( l = md->groups; l; l = l->next )
+        {
+                struct msn_group *mg = l->data;
+                
+                if( g_strcasecmp( mg->id, id ) == 0 )
+                        return mg;
+        }
+        
+        return NULL;
+}
+
+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 );
+}

protocols/msn/ns.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -27 +27 @@
 #include "nogaim.h"
 #include "msn.h"
-#include "passport.h"
 #include "md5.h"
-
+#include "soap.h"
+#include "xmltree.h"
+
+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( gpointer data, char **cmd, int num_parts );
-static int msn_ns_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts );
-
-static void msn_auth_got_passport_token( struct msn_auth_data *mad );
-static gboolean msn_ns_got_display_name( struct im_connection *ic, char *name );
-
-gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
-{
-        struct im_connection *ic = data;
-        struct msn_data *md;
-        char s[1024];
-        
-        if( !g_slist_find( msn_connections, ic ) )
-                return FALSE;
-        
-        if( source == -1 )
+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 );
+
+int msn_ns_write( struct im_connection *ic, int fd, const char *fmt, ... )
+{
+        struct msn_data *md = ic->proto_data;
+        va_list params;
+        char *out;
+        size_t len;
+        int st;
+        
+        va_start( params, fmt );
+        out = g_strdup_vprintf( fmt, params );
+        va_end( params );
+        
+        if( fd < 0 )
+                fd = md->ns->fd;
+        
+        if( getenv( "BITLBEE_DEBUG" ) )
+                fprintf( stderr, "->NS%d:%s", fd, out );
+        
+        len = strlen( out );
+        st = write( fd, out, len );
+        g_free( out );
+        if( st != len )
+        {
+                imcb_error( ic, "Short write() to main server" );
+                imc_logout( ic, TRUE );
+                return 0;
+        }
+        
+        return 1;
+}
+
+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 )
         {
                 imcb_error( ic, "Could not connect to server" );
@@ -53 +86 @@
         }
         
+        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( !md->handler )
-        {
-                md->handler = g_new0( struct msn_handler_data, 1 );
-                md->handler->data = ic;
-                md->handler->exec_command = msn_ns_command;
-                md->handler->exec_message = msn_ns_message;
-        }
-        else
-        {
-                if( md->handler->rxq )
-                        g_free( md->handler->rxq );
-                
-                md->handler->rxlen = 0;
-        }
-        
-        md->handler->fd = md->fd;
-        md->handler->rxq = g_new0( char, 1 );
-        
-        g_snprintf( s, sizeof( s ), "VER %d MSNP8 CVR0\r\n", ++md->trId );
-        if( msn_write( ic, s, strlen( s ) ) )
-        {
-                ic->inpa = b_input_add( md->fd, B_EV_IO_READ, msn_ns_callback, ic );
+        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 );
+        
+        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 );
                 imcb_log( ic, "Connected to server, waiting for reply" );
         }
@@ -83 +120 @@
 }
 
+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;
+}
+
 static gboolean msn_ns_callback( gpointer data, gint source, b_input_condition cond )
 {
-        struct im_connection *ic = data;
-        struct msn_data *md = ic->proto_data;
-        
-        if( msn_handler( md->handler ) == -1 ) /* Don't do this on ret == 0, it's already done then. */
+        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. */
         {
                 imcb_error( ic, "Error while reading from server" );
@@ -99 +153 @@
 }
 
-static int msn_ns_command( gpointer data, char **cmd, int num_parts )
-{
-        struct im_connection *ic = data;
+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;
-        char buf[1024];
         
         if( num_parts == 0 )
@@ -113 +166 @@
         if( strcmp( cmd[0], "VER" ) == 0 )
         {
-                if( cmd[2] && strncmp( cmd[2], "MSNP8", 5 ) != 0 )
+                if( cmd[2] && strncmp( cmd[2], MSNP_VER, 5 ) != 0 )
                 {
                         imcb_error( ic, "Unsupported protocol" );
@@ -120 +173 @@
                 }
                 
-                g_snprintf( buf, sizeof( buf ), "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s\r\n",
-                                                ++md->trId, ic->acc->user );
-                return( msn_write( ic, buf, strlen( buf ) ) );
+                return( msn_ns_write( ic, handler->fd, "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s\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 */
-                g_snprintf( buf, sizeof( buf ), "USR %d TWN I %s\r\n", ++md->trId, ic->acc->user );
-                return( msn_write( ic, buf, strlen( buf ) ) );
+                return msn_ns_write( ic, handler->fd, "USR %d SSO I %s\r\n", ++md->trId, ic->acc->user );
         }
         else if( strcmp( cmd[0], "XFR" ) == 0 )
@@ -135 +186 @@
                 int port;
                 
-                if( num_parts == 6 && strcmp( cmd[2], "NS" ) == 0 )
-                {
-                        b_event_remove( ic->inpa );
-                        ic->inpa = 0;
-                        closesocket( md->fd );
+                if( num_parts >= 6 && strcmp( cmd[2], "NS" ) == 0 )
+                {
+                        b_event_remove( handler->inpa );
+                        handler->inpa = -1;
                         
                         server = strchr( cmd[3], ':' );
@@ -153 +203 @@
                         
                         imcb_log( ic, "Transferring to other server" );
-                        
-                        md->fd = proxy_connect( server, port, msn_ns_connected, ic );
-                }
-                else if( num_parts == 6 && strcmp( cmd[2], "SB" ) == 0 )
+                        return msn_ns_connect( ic, handler, server, port );
+                }
+                else if( num_parts >= 6 && strcmp( cmd[2], "SB" ) == 0 )
                 {
                         struct msn_switchboard *sb;
@@ -220 +269 @@
         else if( strcmp( cmd[0], "USR" ) == 0 )
         {
-                if( num_parts == 5 && strcmp( cmd[2], "TWN" ) == 0 && strcmp( cmd[3], "S" ) == 0 )
-                {
-                        /* Time for some Passport black magic... */
-                        if( !passport_get_token( msn_auth_got_passport_token, ic, ic->acc->user, ic->acc->pass, cmd[4] ) )
-                        {
-                                imcb_error( ic, "Error while contacting Passport server" );
-                                imc_logout( ic, TRUE );
-                                return( 0 );
-                        }
-                }
-                else if( num_parts >= 7 && strcmp( cmd[2], "OK" ) == 0 )
-                {
-                        if( num_parts == 7 )
-                                msn_ns_got_display_name( ic, cmd[4] );
-                        else
-                                imcb_log( ic, "Warning: Friendly name in server response was corrupted" );
-                        
+                if( num_parts >= 6 && strcmp( cmd[2], "SSO" ) == 0 &&
+                    strcmp( cmd[3], "S" ) == 0 )
+                {
+                        g_free( md->pp_policy );
+                        md->pp_policy = g_strdup( cmd[4] );
+                        msn_soap_passport_sso_request( ic, cmd[5] );
+                }
+                else if( strcmp( cmd[2], "OK" ) == 0 )
+                {
                         imcb_log( ic, "Authenticated, getting buddy list" );
-                        
-                        g_snprintf( buf, sizeof( buf ), "SYN %d 0\r\n", ++md->trId );
-                        return( msn_write( ic, buf, strlen( buf ) ) );
+                        msn_soap_memlist_request( ic );
                 }
                 else
@@ -251 +290 @@
         else if( strcmp( cmd[0], "MSG" ) == 0 )
         {
-                if( num_parts != 4 )
-                {
-                        imcb_error( ic, "Syntax error" );
-                        imc_logout( ic, TRUE );
-                        return( 0 );
-                }
-                
-                md->handler->msglen = atoi( cmd[3] );
-                
-                if( md->handler->msglen <= 0 )
-                {
-                        imcb_error( ic, "Syntax error" );
-                        imc_logout( ic, TRUE );
-                        return( 0 );
-                }
-        }
-        else if( strcmp( cmd[0], "SYN" ) == 0 )
-        {
-                if( num_parts == 5 )
-                {
-                        int i, groupcount;
-                        
-                        groupcount = atoi( cmd[4] );
-                        if( groupcount > 0 )
-                        {
-                                /* valgrind says this is leaking memory, I'm guessing
-                                   that this happens during server redirects. */
-                                if( md->grouplist )
-                                {
-                                        for( i = 0; i < md->groupcount; i ++ )
-                                                g_free( md->grouplist[i] );
-                                        g_free( md->grouplist );
-                                }
-                                
-                                md->groupcount = groupcount;
-                                md->grouplist = g_new0( char *, md->groupcount );
-                        }
-                        
-                        md->buddycount = atoi( cmd[3] );
-                        if( !*cmd[3] || md->buddycount == 0 )
-                                msn_logged_in( ic );
-                }
-                else
-                {
-                        /* Hrrm... This SYN reply doesn't really look like something we expected.
-                           Let's assume everything is okay. */
-                        
-                        msn_logged_in( ic );
-                }
-        }
-        else if( strcmp( cmd[0], "LST" ) == 0 )
-        {
-                int list;
-                
-                if( num_parts != 4 && num_parts != 5 )
-                {
-                        imcb_error( ic, "Syntax error" );
-                        imc_logout( ic, TRUE );
-                        return( 0 );
-                }
-                
-                http_decode( cmd[2] );
-                list = atoi( cmd[3] );
-                
-                if( list & 1 ) /* FL */
-                {
-                        char *group = NULL;
-                        int num;
-                        
-                        if( cmd[4] != NULL && sscanf( cmd[4], "%d", &num ) == 1 && num < md->groupcount )
-                                group = md->grouplist[num];
-                        
-                        imcb_add_buddy( ic, cmd[1], group );
-                        imcb_rename_buddy( ic, cmd[1], cmd[2] );
-                }
-                if( list & 2 ) /* AL */
-                {
-                        ic->permit = g_slist_append( ic->permit, g_strdup( cmd[1] ) );
-                }
-                if( list & 4 ) /* BL */
-                {
-                        ic->deny = g_slist_append( ic->deny, g_strdup( cmd[1] ) );
-                }
-                if( list & 8 ) /* RL */
-                {
-                        if( ( list & 6 ) == 0 )
-                                msn_buddy_ask( ic, cmd[1], cmd[2] );
-                }
-                
-                if( --md->buddycount == 0 )
-                {
-                        if( ic->flags & OPT_LOGGED_IN )
-                        {
-                                imcb_log( ic, "Successfully transferred to different server" );
-                                g_snprintf( buf, sizeof( buf ), "CHG %d %s %d\r\n", ++md->trId, md->away_state->code, 0 );
-                                return( msn_write( ic, buf, strlen( buf ) ) );
-                        }
-                        else
-                        {
-                                msn_logged_in( ic );
-                        }
-                }
-        }
-        else if( strcmp( cmd[0], "LSG" ) == 0 )
-        {
-                int num;
-                
-                if( num_parts != 4 )
-                {
-                        imcb_error( ic, "Syntax error" );
-                        imc_logout( ic, TRUE );
-                        return( 0 );
-                }
-                
-                http_decode( cmd[2] );
-                num = atoi( cmd[1] );
-                
-                if( num < md->groupcount )
-                        md->grouplist[num] = g_strdup( cmd[2] );
+                if( num_parts < 4 )
+                {
+                        imcb_error( ic, "Syntax error" );
+                        imc_logout( ic, TRUE );
+                        return( 0 );
+                }
+                
+                handler->msglen = atoi( cmd[3] );
+                
+                if( handler->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 )
+                {
+                        msn_ns_send_adl( ic );
+                        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 );
         }
         else if( strcmp( cmd[0], "CHL" ) == 0 )
         {
-                md5_state_t state;
-                md5_byte_t digest[16];
-                int i;
-                
-                if( num_parts != 3 )
-                {
-                        imcb_error( ic, "Syntax error" );
-                        imc_logout( ic, TRUE );
-                        return( 0 );
-                }
-                
-                md5_init( &state );
-                md5_append( &state, (const md5_byte_t *) cmd[2], strlen( cmd[2] ) );
-                md5_append( &state, (const md5_byte_t *) QRY_CODE, strlen( QRY_CODE ) );
-                md5_finish( &state, digest );
-                
-                g_snprintf( buf, sizeof( buf ), "QRY %d %s %d\r\n", ++md->trId, QRY_NAME, 32 );
-                for( i = 0; i < 16; i ++ )
-                        g_snprintf( buf + strlen( buf ), 3, "%02x", digest[i] );
-                
-                return( msn_write( ic, buf, strlen( buf ) ) );
+                char *resp;
+                int st;
+                
+                if( num_parts < 3 )
+                {
+                        imcb_error( ic, "Syntax error" );
+                        imc_logout( ic, TRUE );
+                        return( 0 );
+                }
+                
+                resp = msn_p11_challenge( cmd[2] );
+                
+                st =  msn_ns_write( ic, -1, "QRY %d %s %zd\r\n%s",
+                                    ++md->trId, MSNP11_PROD_ID,
+                                    strlen( resp ), resp );
+                g_free( resp );
+                return st;
         }
         else if( strcmp( cmd[0], "ILN" ) == 0 )
@@ -399 +351 @@
                 const struct msn_away_state *st;
                 
-                if( num_parts != 6 )
-                {
-                        imcb_error( ic, "Syntax error" );
-                        imc_logout( ic, TRUE );
-                        return( 0 );
-                }
-                
-                http_decode( cmd[4] );
-                imcb_rename_buddy( ic, cmd[3], cmd[4] );
+                if( num_parts < 6 )
+                {
+                        imcb_error( ic, "Syntax error" );
+                        imc_logout( ic, TRUE );
+                        return( 0 );
+                }
+                
+                http_decode( cmd[5] );
+                imcb_rename_buddy( ic, cmd[3], cmd[5] );
                 
                 st = msn_away_state_by_code( cmd[2] );
@@ -432 +384 @@
         {
                 const struct msn_away_state *st;
-                
-                if( num_parts != 5 )
-                {
-                        imcb_error( ic, "Syntax error" );
-                        imc_logout( ic, TRUE );
-                        return( 0 );
-                }
-                
-                http_decode( cmd[3] );
-                imcb_rename_buddy( ic, cmd[2], cmd[3] );
+                int cap;
+                
+                if( num_parts < 6 )
+                {
+                        imcb_error( ic, "Syntax error" );
+                        imc_logout( ic, TRUE );
+                        return( 0 );
+                }
+                
+                http_decode( cmd[4] );
+                cap = atoi( cmd[5] );
+                imcb_rename_buddy( ic, cmd[2], cmd[4] );
                 
                 st = msn_away_state_by_code( cmd[1] );
@@ -451 +405 @@
                 
                 imcb_buddy_status( ic, cmd[2], OPT_LOGGED_IN | 
-                                   ( st != msn_away_state_list ? OPT_AWAY : 0 ),
+                                   ( st != msn_away_state_list ? OPT_AWAY : 0 ) |
+                                   ( cap & 1 ? OPT_MOBILE : 0 ),
                                    st->name, NULL );
                 
@@ -462 +417 @@
                 int session, port;
                 
-                if( num_parts != 7 )
+                if( num_parts < 7 )
                 {
                         imcb_error( ic, "Syntax error" );
@@ -504 +459 @@
                 }
         }
-        else if( strcmp( cmd[0], "ADD" ) == 0 )
-        {
-                if( num_parts == 6 && strcmp( cmd[2], "RL" ) == 0 )
-                {
-                        GSList *l;
-                        
-                        http_decode( cmd[5] );
-                        
-                        if( strchr( cmd[4], '@' ) == NULL )
-                        {
-                                imcb_error( ic, "Syntax error" );
-                                imc_logout( ic, TRUE );
-                                return 0;
-                        }
-                        
-                        /* We got added by someone. If we don't have this
-                           person in permit/deny yet, inform the user. */
-                        for( l = ic->permit; l; l = l->next )
-                                if( g_strcasecmp( l->data, cmd[4] ) == 0 )
-                                        return 1;
-                        
-                        for( l = ic->deny; l; l = l->next )
-                                if( g_strcasecmp( l->data, cmd[4] ) == 0 )
-                                        return 1;
-                        
-                        msn_buddy_ask( ic, cmd[4], cmd[5] );
-                }
-                else if( num_parts >= 6 && strcmp( cmd[2], "FL" ) == 0 )
-                {
-                        const char *group = NULL;
-                        int num;
-                        
-                        if( cmd[6] != NULL && sscanf( cmd[6], "%d", &num ) == 1 && num < md->groupcount )
-                                group = md->grouplist[num];
-                        
-                        http_decode( cmd[5] );
-                        imcb_add_buddy( ic, cmd[4], group );
-                        imcb_rename_buddy( ic, cmd[4], cmd[5] );
-                }
-        }
         else if( strcmp( cmd[0], "OUT" ) == 0 )
         {
@@ -565 +480 @@
                 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
-        /* Discard this one completely for now since I don't care about the ack
-           and since MSN servers can apparently screw up the formatting. */
-        else if( strcmp( cmd[0], "REA" ) == 0 )
-        {
-                if( num_parts != 5 )
-                {
-                        imcb_error( ic, "Syntax error" );
-                        imc_logout( ic, TRUE );
-                        return( 0 );
-                }
-                
-                if( g_strcasecmp( cmd[3], ic->acc->user ) == 0 )
-                {
-                        set_t *s;
-                        
-                        http_decode( cmd[4] );
-                        strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
-                        ic->displayname[sizeof(ic->displayname)-1] = 0;
-                        
-                        if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
-                        {
-                                g_free( s->value );
-                                s->value = g_strdup( cmd[4] );
-                        }
-                }
-                else
-                {
-                        /* This is not supposed to happen, but let's handle it anyway... */
-                        http_decode( cmd[4] );
-                        imcb_rename_buddy( ic, cmd[3], cmd[4] );
-                }
-        }
-#endif
-        else if( strcmp( cmd[0], "IPG" ) == 0 )
-        {
-                imcb_error( ic, "Received IPG command, we don't handle them yet." );
-                
-                md->handler->msglen = atoi( cmd[1] );
-                
-                if( md->handler->msglen <= 0 )
-                {
-                        imcb_error( ic, "Syntax error" );
-                        imc_logout( ic, TRUE );
-                        return( 0 );
-                }
-        }
         else if( strcmp( cmd[0], "ADG" ) == 0 )
         {
@@ -656 +538 @@
                 }
         }
+#endif
+        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. */
+                if( num_parts >= 4 )
+                        handler->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( isdigit( cmd[0][0] ) )
         {
@@ -668 +570 @@
                         return( 0 );
                 }
+                
+                /* Oh yes, errors can have payloads too now. Discard them for now. */
+                if( num_parts >= 3 )
+                        handler->msglen = atoi( cmd[2] );
         }
         else
@@ -677 +583 @@
 }
 
-static int msn_ns_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts )
-{
-        struct im_connection *ic = data;
+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;
         char *body;
         int blen = 0;
@@ -765 +671 @@
                 }
         }
+        else if( strcmp( cmd[0], "UBX" ) == 0 )
+        {
+                struct xt_node *psm;
+                char *psm_text = NULL;
+                
+                psm = xt_from_string( msg );
+                if( psm && strcmp( psm->name, "Data" ) == 0 &&
+                    ( psm = xt_find_node( psm->children, "PSM" ) ) )
+                        psm_text = psm->text;
+                
+                imcb_buddy_status_msg( ic, cmd[1], psm_text );
+                xt_free_node( psm );
+        }
+        else if( strcmp( cmd[0], "ADL" ) == 0 )
+        {
+                struct xt_node *adl, *d, *c;
+                
+                if( !( adl = xt_from_string( msg ) ) )
+                        return 1;
+                
+                for( d = adl->children; d; d = d->next )
+                {
+                        char *dn;
+                        if( strcmp( d->name, "d" ) != 0 ||
+                            ( dn = xt_find_attr( d, "n" ) ) == NULL )
+                                continue;
+                        for( c = d->children; c; c = c->next )
+                        {
+                                bee_user_t *bu;
+                                struct msn_buddy_data *bd;
+                                char *cn, *handle, *f, *l;
+                                int flags;
+                                
+                                if( strcmp( c->name, "c" ) != 0 ||
+                                    ( l = xt_find_attr( c, "l" ) ) == NULL ||
+                                    ( cn = xt_find_attr( c, "n" ) ) == NULL )
+                                        continue;
+                                
+                                handle = g_strdup_printf( "%s@%s", cn, dn );
+                                if( !( ( bu = bee_user_by_handle( ic->bee, ic, handle ) ) ||
+                                       ( bu = bee_user_new( ic->bee, ic, handle, 0 ) ) ) )
+                                {
+                                        g_free( handle );
+                                        continue;
+                                }
+                                g_free( handle );
+                                bd = bu->data;
+                                
+                                if( ( f = xt_find_attr( c, "f" ) ) )
+                                {
+                                        http_decode( f );
+                                        imcb_rename_buddy( ic, bu->handle, f );
+                                }
+                                
+                                flags = atoi( l ) & 15;
+                                if( bd->flags != flags )
+                                {
+                                        bd->flags = flags;
+                                        msn_buddy_ask( bu );
+                                }
+                        }
+                }
+        }
         
         return( 1 );
 }
 
-static void msn_auth_got_passport_token( struct msn_auth_data *mad )
-{
-        struct im_connection *ic = mad->data;
+void msn_auth_got_passport_token( struct im_connection *ic, const char *token, const char *error )
+{
         struct msn_data *md;
         
@@ -779 +747 @@
         
         md = ic->proto_data;
-        if( mad->token )
-        {
-                char buf[1024];
-                
-                g_snprintf( buf, sizeof( buf ), "USR %d TWN S %s\r\n", ++md->trId, mad->token );
-                msn_write( ic, buf, strlen( buf ) );
+        
+        if( token )
+        {
+                msn_ns_write( ic, -1, "USR %d SSO S %s %s\r\n", ++md->trId, md->tokens[0], token );
         }
         else
         {
-                imcb_error( ic, "Error during Passport authentication: %s", mad->error );
+                imcb_error( ic, "Error during Passport authentication: %s", error );
                 imc_logout( ic, TRUE );
         }
 }
 
-static gboolean msn_ns_got_display_name( struct im_connection *ic, char *name )
-{
-        set_t *s;
-        
-        if( ( s = set_find( &ic->acc->set, "display_name" ) ) == NULL )
-                return FALSE; /* Shouldn't happen.. */
-        
-        http_decode( name );
-        
-        if( s->value && strcmp( s->value, name ) == 0 )
-        {
-                return TRUE;
-                /* The names match, nothing to worry about. */
-        }
-        else if( s->value != NULL &&
-                 ( strcmp( name, ic->acc->user ) == 0 ||
-                   set_getbool( &ic->acc->set, "local_display_name" ) ) )
-        {
-                /* The server thinks our display name is our e-mail address
-                   which is probably wrong, or the user *wants* us to do this:
-                   Always use the locally set display_name. */
-                return msn_set_display_name( ic, s->value );
-        }
+void msn_auth_got_contact_list( struct im_connection *ic )
+{
+        struct msn_data *md;
+        
+        /* Dead connection? */
+        if( g_slist_find( msn_connections, ic ) == NULL )
+                return;
+        
+        md = ic->proto_data;
+        msn_ns_write( ic, -1, "BLP %d %s\r\n", ++md->trId, "BL" );
+}
+
+static gboolean msn_ns_send_adl_1( gpointer key, gpointer value, gpointer data )
+{
+        struct xt_node *adl = data, *d, *c;
+        struct bee_user *bu = value;
+        struct msn_buddy_data *bd = bu->data;
+        struct msn_data *md = bu->ic->proto_data;
+        char handle[strlen(bu->handle)];
+        char *domain;
+        char l[4];
+        
+        if( ( bd->flags & 7 ) == 0 || ( bd->flags & MSN_BUDDY_ADL_SYNCED ) )
+                return FALSE;
+        
+        strcpy( handle, bu->handle );
+        if( ( domain = strchr( handle, '@' ) ) == NULL ) /* WTF */
+                return FALSE; 
+        *domain = '\0';
+        domain ++;
+        
+        if( ( d = adl->children ) == NULL ||
+            g_strcasecmp( xt_find_attr( d, "n" ), domain ) != 0 )
+        {
+                d = xt_new_node( "d", NULL, NULL );
+                xt_add_attr( d, "n", domain );
+                xt_insert_child( adl, d );
+        }
+        
+        g_snprintf( l, sizeof( l ), "%d", bd->flags & 7 );
+        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" ); /* 1 means normal, 4 means mobile? */
+        xt_insert_child( d, c );
+        
+        /* Do this in batches of 100. */
+        bd->flags |= MSN_BUDDY_ADL_SYNCED;
+        return (--md->adl_todo % 140) == 0;
+}
+
+static void msn_ns_send_adl( struct im_connection *ic )
+{
+        struct xt_node *adl;
+        struct msn_data *md = ic->proto_data;
+        char *adls;
+        
+        adl = xt_new_node( "ml", NULL, NULL );
+        xt_add_attr( adl, "l", "1" );
+        g_tree_foreach( md->domaintree, msn_ns_send_adl_1, adl );
+        if( adl->children == NULL )
+        {
+                /* This tells the caller that we're done now. */
+                md->adl_todo = -1;
+                xt_free_node( adl );
+                return;
+        }
+        
+        adls = xt_to_string( adl );
+        msn_ns_write( ic, -1, "ADL %d %zd\r\n%s", ++md->trId, strlen( adls ), adls );
+        g_free( adls );
+}
+
+static void msn_ns_send_adl_start( struct im_connection *ic )
+{
+        struct msn_data *md;
+        GSList *l;
+        
+        /* Dead connection? */
+        if( g_slist_find( msn_connections, ic ) == NULL )
+                return;
+        
+        md = ic->proto_data;
+        md->adl_todo = 0;
+        for( l = ic->bee->users; l; l = l->next )
+        {
+                bee_user_t *bu = l->data;
+                struct msn_buddy_data *bd = bu->data;
+                
+                if( bu->ic != ic || ( bd->flags & 7 ) == 0 )
+                        continue;
+                
+                bd->flags &= ~MSN_BUDDY_ADL_SYNCED;
+                md->adl_todo++;
+        }
+        
+        msn_ns_send_adl( ic );
+}
+
+int msn_ns_finish_login( struct im_connection *ic )
+{
+        struct msn_data *md = ic->proto_data;
+        
+        if( ic->flags & OPT_LOGGED_IN )
+                return 1;
+        
+        if( md->adl_todo < 0 )
+                md->flags |= MSN_DONE_ADL;
+        
+        if( ( md->flags & MSN_DONE_ADL ) && ( md->flags & MSN_GOT_PROFILE ) )
+                return msn_ns_set_display_name( ic, set_getstr( &ic->acc->set, "display_name" ) );
         else
-        {
-                if( s->value && *s->value )
-                        imcb_log( ic, "BitlBee thinks your display name is `%s' but "
-                                      "the MSN server says it's `%s'. Using the MSN "
-                                      "server's name. Set local_display_name to true "
-                                      "to use the local name.", s->value, name );
-                
-                if( g_utf8_validate( name, -1, NULL ) )
-                {
-                        g_free( s->value );
-                        s->value = g_strdup( name );
-                }
-                else
-                {
-                        imcb_log( ic, "Warning: Friendly name in server response was corrupted" );
-                }
-                
-                return TRUE;
-        }
-}
+                return 1;
+}

protocols/msn/sb.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2005 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -27 +27 @@
 #include "nogaim.h"
 #include "msn.h"
-#include "passport.h"
 #include "md5.h"
+#include "soap.h"
 #include "invitation.h"
 
 static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond );
-static int msn_sb_command( gpointer data, char **cmd, int num_parts );
-static int msn_sb_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts );
-
-int msn_sb_write( struct msn_switchboard *sb, char *s, int len )
-{
+static int msn_sb_command( struct msn_handler_data *handler, char **cmd, int num_parts );
+static int msn_sb_message( struct msn_handler_data *handler, char *msg, int msglen, char **cmd, int num_parts );
+
+int msn_sb_write( struct msn_switchboard *sb, const char *fmt, ... )
+{
+        va_list params;
+        char *out;
+        size_t len;
         int st;
         
-        st = write( sb->fd, s, len );
+        va_start( params, fmt );
+        out = g_strdup_vprintf( fmt, params );
+        va_end( params );
+        
+        if( getenv( "BITLBEE_DEBUG" ) )
+                fprintf( stderr, "->SB%d:%s", sb->fd, out );
+        
+        len = strlen( out );
+        st = write( sb->fd, out, len );
+        g_free( out );
         if( st != len )
         {
                 msn_sb_destroy( sb );
-                return( 0 );
-        }
-        
-        return( 1 );
+                return 0;
+        }
+        
+        return 1;
 }
 
@@ -53 +65 @@
         struct msn_data *md = ic->proto_data;
         struct msn_switchboard *sb;
-        char buf[1024];
 
         /* FIXME: *CHECK* the reliability of using spare sb's! */
@@ -61 +72 @@
                 
                 sb->who = g_strdup( m->who );
-                g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, m->who );
-                if( msn_sb_write( sb, buf, strlen( buf ) ) )
+                if( msn_sb_write( sb, "CAL %d %s\r\n", ++sb->trId, m->who ) )
                 {
                         /* He/She should join the switchboard soon, let's queue the message. */
@@ -73 +83 @@
         
         /* If we reach this line, there was no spare switchboard, so let's make one. */
-        g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
-        if( !msn_write( ic, buf, strlen( buf ) ) )
+        if( !msn_ns_write( ic, -1, "XFR %d SB\r\n", ++md->trId ) )
         {
                 g_free( m->who );
@@ -165 +174 @@
         if( sb->ready )
         {
-                char *packet, *buf;
+                char *buf;
                 int i, j;
                 
@@ -201 +210 @@
                 
                 /* Build the final packet (MSG command + the message). */
-                packet = g_strdup_printf( "MSG %d N %d\r\n%s", ++sb->trId, i, buf );
-                g_free( buf );
-                if( msn_sb_write( sb, packet, strlen( packet ) ) )
-                {
-                        g_free( packet );
-                        return( 1 );
+                if( msn_sb_write( sb, "MSG %d N %d\r\n%s", ++sb->trId, i, buf ) )
+                {
+                        g_free( buf );
+                        return 1;
                 }
                 else
                 {
-                        g_free( packet );
-                        return( 0 );
+                        g_free( buf );
+                        return 0;
                 }
         }
@@ -326 +333 @@
                 g_snprintf( buf, sizeof( buf ), "ANS %d %s %s %d\r\n", ++sb->trId, ic->acc->user, sb->key, sb->session );
         
-        if( msn_sb_write( sb, buf, strlen( buf ) ) )
+        if( msn_sb_write( sb, "%s", buf ) )
                 sb->inp = b_input_add( sb->fd, B_EV_IO_READ, msn_sb_callback, sb );
         else
@@ -346 +353 @@
         {
                 time_t now = time( NULL );
-                char buf[1024];
                 
                 if( now - md->first_sb_failure > 600 )
@@ -378 +384 @@
                 debug( "Moved queued messages back to the main queue, "
                        "creating a new switchboard to retry." );
-                g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
-                if( !msn_write( ic, buf, strlen( buf ) ) )
+                if( !msn_ns_write( ic, -1, "XFR %d SB\r\n", ++md->trId ) )
                         return FALSE;
         }
@@ -387 +392 @@
 }
 
-static int msn_sb_command( gpointer data, char **cmd, int num_parts )
-{
-        struct msn_switchboard *sb = data;
+static int msn_sb_command( struct msn_handler_data *handler, char **cmd, int num_parts )
+{
+        struct msn_switchboard *sb = handler->data;
         struct im_connection *ic = sb->ic;
-        char buf[1024];
         
         if( !num_parts )
@@ -407 +411 @@
         else if( strcmp( cmd[0], "USR" ) == 0 )
         {
-                if( num_parts != 5 )
+                if( num_parts < 5 )
                 {
                         msn_sb_destroy( sb );
@@ -420 +424 @@
                 
                 if( sb->who )
-                {
-                        g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, sb->who );
-                        return( msn_sb_write( sb, buf, strlen( buf ) ) );
-                }
+                        return msn_sb_write( sb, "CAL %d %s\r\n", ++sb->trId, sb->who );
                 else
-                {
                         debug( "Just created a switchboard, but I don't know what to do with it." );
-                }
         }
         else if( strcmp( cmd[0], "IRO" ) == 0 )
@@ -433 +432 @@
                 int num, tot;
                 
-                if( num_parts != 6 )
+                if( num_parts < 6 )
                 {
                         msn_sb_destroy( sb );
@@ -470 +469 @@
         else if( strcmp( cmd[0], "ANS" ) == 0 )
         {
-                if( num_parts != 3 )
+                if( num_parts < 3 )
                 {
                         msn_sb_destroy( sb );
@@ -489 +488 @@
         else if( strcmp( cmd[0], "CAL" ) == 0 )
         {
-                if( num_parts != 4 || !isdigit( cmd[3][0] ) )
+                if( num_parts < 4 || !isdigit( cmd[3][0] ) )
                 {
                         msn_sb_destroy( sb );
@@ -499 +498 @@
         else if( strcmp( cmd[0], "JOI" ) == 0 )
         {
-                if( num_parts != 3 )
+                if( num_parts < 3 )
                 {
                         msn_sb_destroy( sb );
@@ -560 +559 @@
         else if( strcmp( cmd[0], "MSG" ) == 0 )
         {
-                if( num_parts != 4 )
+                if( num_parts < 4 )
                 {
                         msn_sb_destroy( sb );
@@ -625 +624 @@
                 const struct msn_status_code *err = msn_status_by_number( num );
                 
-                imcb_error( ic, "Error reported by switchboard server: %s", err->text );
+                /* If the person is offline, send an offline message instead,
+                   and don't report an error. */
+                if( num == 217 )
+                        msn_soap_oim_send_queue( ic, &sb->msgq );
+                else
+                        imcb_error( ic, "Error reported by switchboard server: %s", err->text );
                 
                 if( err->flags & STATUS_SB_FATAL )
@@ -661 +665 @@
 }
 
-static int msn_sb_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts )
-{
-        struct msn_switchboard *sb = data;
+static int msn_sb_message( struct msn_handler_data *handler, char *msg, int msglen, char **cmd, int num_parts )
+{
+        struct msn_switchboard *sb = handler->data;
         struct im_connection *ic = sb->ic;
         char *body;
@@ -741 +745 @@
                 else if( g_strncasecmp( ct, "application/x-msnmsgrp2p", 24 ) == 0 ) 
                 {
-                        imcb_error( sb->ic, "Cannot receive file from %s: BitlBee does not "
-                                        "support msnmsgrp2p yet.", sb->who );
+                        /* Not currently implemented. Don't warn about it since
+                           this seems to be used for avatars now. */
                         g_free( ct );
                 }

protocols/msn/tables.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -83 +83 @@
         { 230, "Cannot remove that group",                              0 },
         { 231, "Invalid group",                                         0 },
+        { 240, "ADL/RML command with corrupted payload",                STATUS_FATAL },
+        { 241, "ADL/RML command with invalid modification",             0 },
         { 280, "Switchboard failed",                                    STATUS_SB_FATAL },
         { 281, "Transfer to switchboard failed",                        0 },

protocols/nogaim.c

@@ -252 +252 @@
                 serv_got_crap( ic, "Error: %s", text );
         else
-                serv_got_crap( ic, "Couldn't log in: %s", text );
+                serv_got_crap( ic, "Login error: %s", text );
         
         g_free( text );
@@ -325 +325 @@
         
         imcb_log( ic, "Signing off.." );
-        
-        b_event_remove( ic->keepalive );
-        ic->keepalive = 0;
-        ic->acc->prpl->logout( ic );
-        b_event_remove( ic->inpa );
-        
-        g_free( ic->away );
-        ic->away = NULL;
         
         for( l = bee->users; l; )
@@ -344 +336 @@
                 l = next;
         }
+        
+        b_event_remove( ic->keepalive );
+        ic->keepalive = 0;
+        ic->acc->prpl->logout( ic );
+        b_event_remove( ic->inpa );
+        
+        g_free( ic->away );
+        ic->away = NULL;
         
         query_del_by_conn( (irc_t*) ic->bee->ui_data, ic );

protocols/nogaim.h

@@ -195 +195 @@
            this info via imcb_log(). Implementing these are optional. */
         void (* get_info)       (struct im_connection *, char *who);
+        /* set_my_name is *DEPRECATED*, not used by the UI anymore. Use the
+           display_name setting instead. */
         void (* set_my_name)    (struct im_connection *, char *name);
         void (* set_name)       (struct im_connection *, char *who, char *name);

storage_xml.c

@@ -320 +320 @@
         else if( g_strcasecmp( g_markup_parse_context_get_element( ctx ), "setting" ) == 0 && xd->current_setting )
         {
+                if( xd->current_account )
+                {
+                        set_t *s = set_find( xd->current_set_head, xd->current_setting );
+                        if( s && ( s->flags & ACC_SET_ONLINE_ONLY ) )
+                        {
+                                g_free( xd->current_setting );
+                                xd->current_setting = NULL;
+                                return;
+                        }
+                }
                 set_setstr( xd->current_set_head, xd->current_setting, (char*) text );
                 g_free( xd->current_setting );