Changeset 6738a67 for protocols

Timestamp:

2008-07-16T23:22:52Z (17 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

9b55485

Parents:

9730d72 (diff), 6a78c0e (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:

merge in latest trunk

Location:

protocols

Files:

• jabber/Makefile (modified) (1 diff)
• jabber/io.c (modified) (2 diffs)
• jabber/jabber.c (modified) (4 diffs)
• jabber/jabber.h (modified) (2 diffs)
• jabber/jabber_util.c (modified) (13 diffs)
• jabber/message.c (modified) (1 diff)
• msn/msn.h (modified) (1 diff)
• msn/msn_util.c (modified) (2 diffs)
• msn/ns.c (modified) (7 diffs)
• msn/passport.c (modified) (2 diffs)
• msn/passport.h (modified) (3 diffs)
• nogaim.c (modified) (2 diffs)
• nogaim.h (modified) (2 diffs)
• oscar/oscar.c (modified) (23 diffs)
• yahoo/libyahoo2.c (modified) (8 diffs)
• yahoo/yahoo.c (modified) (5 diffs)
• yahoo/yahoo_httplib.c (modified) (1 diff)

protocols/jabber/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o xmltree.o
+objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o
 
 CFLAGS += -Wall

protocols/jabber/io.c

@@ -241 +241 @@
         }
         
-        /* EAGAIN/etc or a successful read. */
-        return TRUE;
+        if( ssl_pending( jd->ssl ) )
+                /* OpenSSL empties the TCP buffers completely but may keep some
+                   data in its internap buffers. select() won't see that, but
+                   ssl_pending() does. */
+                return jabber_read_callback( data, fd, cond );
+        else
+                return TRUE;
 }
 
@@ -521 +526 @@
            from the server too. */
         xt_free( jd->xt );      /* In case we're RE-starting. */
-        jd->xt = xt_new( ic );
-        jd->xt->handlers = (struct xt_handler_entry*) jabber_handlers;
+        jd->xt = xt_new( jabber_handlers, ic );
         
         if( jd->r_inpa <= 0 )

protocols/jabber/jabber.c

@@ -33 +33 @@
 #include "jabber.h"
 #include "md5.h"
-#include "base64.h"
 
 GSList *jabber_connections;
 
+/* First enty is the default */
+static const int jabber_port_list[] = {
+        5222,
+        5223,
+        5220,
+        5221,
+        5224,
+        5225,
+        5226,
+        5227,
+        5228,
+        5229,
+        80,
+        443,
+        0
+};
+
 static void jabber_init( account_t *acc )
 {
         set_t *s;
-        
-        s = set_add( &acc->set, "port", JABBER_PORT_DEFAULT, set_eval_int, acc );
+        char str[16];
+        
+        g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] );
+        s = set_add( &acc->set, "port", str, set_eval_int, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
@@ -72 +90 @@
         struct ns_srv_reply *srv = NULL;
         char *connect_to, *s;
+        int i;
         
         /* For now this is needed in the _connected() handlers if using
@@ -177 +196 @@
         imcb_log( ic, "Connecting" );
         
-        if( set_getint( &acc->set, "port" ) < JABBER_PORT_MIN ||
-            set_getint( &acc->set, "port" ) > JABBER_PORT_MAX )
-        {
-                imcb_log( ic, "Incorrect port number, must be in the %d-%d range",
-                               JABBER_PORT_MIN, JABBER_PORT_MAX );
+        for( i = 0; jabber_port_list[i] > 0; i ++ )
+                if( set_getint( &acc->set, "port" ) == jabber_port_list[i] )
+                        break;
+
+        if( jabber_port_list[i] == 0 )
+        {
+                imcb_log( ic, "Illegal port number" );
                 imc_logout( ic, FALSE );
                 return;
@@ -219 +240 @@
 }
 
+/* This generates an unfinished md5_state_t variable. Every time we generate
+   an ID, we finish the state by adding a sequence number and take the hash. */
 static void jabber_generate_id_hash( struct jabber_data *jd )
 {
-        md5_state_t id_hash;
-        md5_byte_t binbuf[16];
+        md5_byte_t binbuf[4];
         char *s;
         
-        md5_init( &id_hash );
-        md5_append( &id_hash, (unsigned char *) jd->username, strlen( jd->username ) );
-        md5_append( &id_hash, (unsigned char *) jd->server, strlen( jd->server ) );
+        md5_init( &jd->cached_id_prefix );
+        md5_append( &jd->cached_id_prefix, (unsigned char *) jd->username, strlen( jd->username ) );
+        md5_append( &jd->cached_id_prefix, (unsigned char *) jd->server, strlen( jd->server ) );
         s = set_getstr( &jd->ic->acc->set, "resource" );
-        md5_append( &id_hash, (unsigned char *) s, strlen( s ) );
-        random_bytes( binbuf, 16 );
-        md5_append( &id_hash, binbuf, 16 );
-        md5_finish( &id_hash, binbuf );
-        
-        s = base64_encode( binbuf, 9 );
-        jd->cached_id_prefix = g_strdup_printf( "%s%s", JABBER_CACHED_ID, s );
-        g_free( s );
+        md5_append( &jd->cached_id_prefix, (unsigned char *) s, strlen( s ) );
+        random_bytes( binbuf, 4 );
+        md5_append( &jd->cached_id_prefix, binbuf, 4 );
 }
 

protocols/jabber/jabber.h

@@ -86 +86 @@
         char *away_message;
         
-        char *cached_id_prefix;
+        md5_state_t cached_id_prefix;
         GHashTable *node_cache;
         GHashTable *buddies;
@@ -134 +134 @@
 
 #define JABBER_XMLCONSOLE_HANDLE "xmlconsole"
-
-#define JABBER_PORT_DEFAULT "5222"
-#define JABBER_PORT_MIN 5220
-#define JABBER_PORT_MAX 5229
 
 /* Prefixes to use for packet IDs (mainly for IQ packets ATM). Usually the

protocols/jabber/jabber_util.c

@@ -23 +23 @@
 
 #include "jabber.h"
+#include "md5.h"
+#include "base64.h"
 
 static unsigned int next_id = 1;
@@ -134 +136 @@
         struct jabber_data *jd = ic->proto_data;
         struct jabber_cache_entry *entry = g_new0( struct jabber_cache_entry, 1 );
-        char *id;
-        
-        id = g_strdup_printf( "%s%05x", jd->cached_id_prefix, ( next_id++ ) & 0xfffff );
+        md5_state_t id_hash;
+        md5_byte_t id_sum[16];
+        char *id, *asc_hash;
+        
+        next_id ++;
+        
+        id_hash = jd->cached_id_prefix;
+        md5_append( &id_hash, (md5_byte_t*) &next_id, sizeof( next_id ) );
+        md5_finish( &id_hash, id_sum );
+        asc_hash = base64_encode( id_sum, 12 );
+        
+        id = g_strdup_printf( "%s%s", JABBER_CACHED_ID, asc_hash );
         xt_add_attr( node, "id", id );
         g_free( id );
+        g_free( asc_hash );
         
         entry->node = node;
@@ -184 +196 @@
         
         if( ( s = xt_find_attr( node, "id" ) ) == NULL ||
-            strncmp( s, jd->cached_id_prefix, strlen( jd->cached_id_prefix ) ) != 0 )
+            strncmp( s, JABBER_CACHED_ID, strlen( JABBER_CACHED_ID ) ) != 0 )
         {
                 /* Silently ignore it, without an ID (or a non-cache
@@ -196 +208 @@
         if( entry == NULL )
         {
+                /*
+                There's no longer an easy way to see if we generated this
+                one or someone else, and there's a ten-minute timeout anyway,
+                so meh.
+                
                 imcb_log( ic, "Warning: Received %s-%s packet with unknown/expired ID %s!",
                               node->name, xt_find_attr( node, "type" ) ? : "(no type)", s );
+                */
         }
         else if( entry->func )
@@ -246 +264 @@
 };
 
-static void jabber_buddy_ask_yes( gpointer w, struct jabber_buddy_ask_data *bla )
-{
+static void jabber_buddy_ask_yes( void *data )
+{
+        struct jabber_buddy_ask_data *bla = data;
+        
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         
@@ -257 +277 @@
 }
 
-static void jabber_buddy_ask_no( gpointer w, struct jabber_buddy_ask_data *bla )
-{
+static void jabber_buddy_ask_no( void *data )
+{
+        struct jabber_buddy_ask_data *bla = data;
+        
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         
@@ -286 +308 @@
         len = strlen( orig );
         new = g_new( char, len + 1 );
-        for( i = 0; i < len; i ++ )
+        
+        /* So it turns out the /resource part is case sensitive. Yeah, and
+           it's Unicode but feck Unicode. :-P So stop once we see a slash. */
+        for( i = 0; i < len && orig[i] != '/' ; i ++ )
                 new[i] = tolower( orig[i] );
+        for( ; orig[i]; i ++ )
+                new[i] = orig[i];
         
         new[i] = 0;
@@ -330 +357 @@
                 {
                         /* Check for dupes. */
-                        if( g_strcasecmp( bi->resource, s + 1 ) == 0 )
+                        if( strcmp( bi->resource, s + 1 ) == 0 )
                         {
                                 *s = '/';
@@ -383 +410 @@
         if( ( s = strchr( jid, '/' ) ) )
         {
-                int none_found = 0;
+                int bare_exists = 0;
                 
                 *s = 0;
@@ -406 +433 @@
                         /* See if there's an exact match. */
                         for( ; bud; bud = bud->next )
-                                if( g_strcasecmp( bud->resource, s + 1 ) == 0 )
+                                if( strcmp( bud->resource, s + 1 ) == 0 )
                                         break;
                 }
                 else
                 {
-                        /* This hack is there to make sure that O_CREAT will
-                           work if there's already another resouce present
-                           for this JID, even if it's an unknown buddy. This
-                           is done to handle conferences properly. */
-                        none_found = 1;
-                        /* TODO(wilmer): Find out what I was thinking when I
-                           wrote this??? And then fix it. This makes me sad... */
-                }
-                
-                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && ( imcb_find_buddy( ic, jid ) || !none_found ) )
+                        /* This variable tells the if down here that the bare
+                           JID already exists and we should feel free to add
+                           more resources, if the caller asked for that. */
+                        bare_exists = 1;
+                }
+                
+                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) &&
+                    ( !bare_exists || imcb_find_buddy( ic, jid ) ) )
                 {
                         *s = '/';
@@ -445 +470 @@
                         /* We want an exact match, so in thise case there shouldn't be a /resource. */
                         return NULL;
-                else if( ( bud->resource == NULL || bud->next == NULL ) )
+                else if( bud->resource == NULL || bud->next == NULL )
                         /* No need for selection if there's only one option. */
                         return bud;
@@ -521 +546 @@
                    matches), removing it is simple. (And the hash reference
                    should be removed too!) */
-                if( bud->next == NULL && ( ( s == NULL || bud->resource == NULL ) || g_strcasecmp( bud->resource, s + 1 ) == 0 ) )
+                if( bud->next == NULL &&
+                    ( ( s == NULL && bud->resource == NULL ) ||
+                      ( bud->resource && s && strcmp( bud->resource, s + 1 ) == 0 ) ) )
                 {
                         g_hash_table_remove( jd->buddies, bud->bare_jid );
@@ -544 +571 @@
                 {
                         for( bi = bud, prev = NULL; bi; bi = (prev=bi)->next )
-                                if( g_strcasecmp( bi->resource, s + 1 ) == 0 )
+                                if( strcmp( bi->resource, s + 1 ) == 0 )
                                         break;
                         

protocols/jabber/message.c

@@ -49 +49 @@
         {
                 GString *fullmsg = g_string_new( "" );
+
+                for( c = node->children; ( c = xt_find_node( c, "x" ) ); c = c->next )
+                {
+                        char *ns = xt_find_attr( c, "xmlns" ), *room;
+                        struct xt_node *inv, *reason;
+                        
+                        if( strcmp( ns, XMLNS_MUC_USER ) == 0 &&
+                            ( inv = xt_find_node( c->children, "invite" ) ) )
+                        {
+                                room = from;
+                                from = xt_find_attr( inv, "from" ) ? : from;
+
+                                g_string_append_printf( fullmsg, "<< \002BitlBee\002 - Invitation to chatroom %s >>\n", room );
+                                if( ( reason = xt_find_node( inv->children, "reason" ) ) && reason->text_len > 0 )
+                                        g_string_append( fullmsg, reason->text );
+                        }
+                }
                 
                 if( ( s = strchr( from, '/' ) ) )

protocols/msn/msn.h

@@ -29 +29 @@
 #define GROUPCHAT_SWITCHBOARD_MESSAGE "\r\r\rME WANT TALK TO MANY PEOPLE\r\r\r"
 
-#ifdef DEBUG
+#ifdef DEBUG_MSN
 #define debug( text... ) imcb_log( ic, text );
 #else

protocols/msn/msn_util.c

@@ -90 +90 @@
 };
 
-static void msn_buddy_ask_yes( gpointer w, struct msn_buddy_ask_data *bla )
-{
+static void msn_buddy_ask_yes( void *data )
+{
+        struct msn_buddy_ask_data *bla = data;
+        
         msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname );
         
@@ -102 +104 @@
 }
 
-static void msn_buddy_ask_no( gpointer w, struct msn_buddy_ask_data *bla )
-{
+static void msn_buddy_ask_no( void *data )
+{
+        struct msn_buddy_ask_data *bla = data;
+        
         msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname );
         

protocols/msn/ns.c

@@ -34 +34 @@
 static int msn_ns_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts );
 
-static void msn_auth_got_passport_id( struct passport_reply *rep );
+static void msn_auth_got_passport_token( struct msn_auth_data *mad );
 
 gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
@@ -178 +178 @@
                         
                         debug( "Connecting to a new switchboard with key %s", cmd[5] );
-                        sb = msn_sb_create( ic, server, port, cmd[5], MSN_SB_NEW );
+
+                        if( ( sb = msn_sb_create( ic, server, port, cmd[5], MSN_SB_NEW ) ) == NULL )
+                        {
+                                /* Although this isn't strictly fatal for the NS connection, it's
+                                   definitely something serious (we ran out of file descriptors?). */
+                                imcb_error( ic, "Could not create new switchboard" );
+                                imc_logout( ic, TRUE );
+                                return( 0 );
+                        }
                         
                         if( md->msgq )
@@ -214 +222 @@
                 {
                         /* Time for some Passport black magic... */
-                        if( !passport_get_id( msn_auth_got_passport_id, ic, ic->acc->user, ic->acc->pass, cmd[4] ) )
+                        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" );
@@ -270 +278 @@
                 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] );
-                        md->groupcount = atoi( cmd[4] );
-                        if( md->groupcount > 0 )
-                                md->grouplist = g_new0( char *, md->groupcount );
-                        
                         if( !*cmd[3] || md->buddycount == 0 )
                                 msn_logged_in( ic );
@@ -468 +490 @@
                 debug( "Got a call from %s (session %d). Key = %s", cmd[5], session, cmd[4] );
                 
-                sb = msn_sb_create( ic, server, port, cmd[4], session );
-                sb->who = g_strdup( cmd[5] );
+                if( ( sb = msn_sb_create( ic, server, port, cmd[4], session ) ) == NULL )
+                {
+                        /* Although this isn't strictly fatal for the NS connection, it's
+                           definitely something serious (we ran out of file descriptors?). */
+                        imcb_error( ic, "Could not create new switchboard" );
+                        imc_logout( ic, TRUE );
+                        return( 0 );
+                }
+                else
+                {
+                        sb->who = g_strdup( cmd[5] );
+                }
         }
         else if( strcmp( cmd[0], "ADD" ) == 0 )
@@ -647 +679 @@
                                         imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
                                 }
+                                
+                                g_free( inbox );
+                                g_free( folders );
                         }
                         else if( g_strncasecmp( ct, "text/x-msmsgsemailnotification", 30 ) == 0 )
@@ -674 +709 @@
 }
 
-static void msn_auth_got_passport_id( struct passport_reply *rep )
+static void msn_auth_got_passport_token( struct msn_auth_data *mad )
 {
-        struct im_connection *ic = rep->data;
-        struct msn_data *md = ic->proto_data;
-        char *key = rep->result;
-        char buf[1024];
-        
-        if( key == NULL )
-        {
-                imcb_error( ic, "Error during Passport authentication (%s)",
-                               rep->error_string ? rep->error_string : "Unknown error" );
+        struct im_connection *ic = mad->data;
+        struct msn_data *md;
+        
+        /* Dead connection? */
+        if( g_slist_find( msn_connections, ic ) == NULL )
+                return;
+        
+        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 ) );
+        }
+        else
+        {
+                imcb_error( ic, "Error during Passport authentication: %s", mad->error );
                 imc_logout( ic, TRUE );
         }
-        else
-        {
-                g_snprintf( buf, sizeof( buf ), "USR %d TWN S %s\r\n", ++md->trId, key );
-                msn_write( ic, buf, strlen( buf ) );
-        }
 }

protocols/msn/passport.c

@@ -1 @@
-/* passport.c
+/** passport.c
  *
- * Functions to login to microsoft passport service for Messenger
- * Copyright (C) 2004 Wouter Paesen <wouter@blue-gate.be>
- * Copyright (C) 2004 Wilmer van der Gaast <wilmer@gaast.net>
+ * Functions to login to Microsoft Passport service for Messenger
+ * Copyright (C) 2004-2008 Wilmer van der Gaast <wilmer@gaast.net>
  *
  * This program is free software; you can redistribute it and/or modify             
@@ -24 +23 @@
 #include "msn.h"
 #include "bitlbee.h"
+#include "url.h"
+#include "misc.h"
+#include "xmltree.h"
 #include <ctype.h>
 #include <errno.h>
 
-#define MSN_BUF_LEN 8192
+static int passport_get_token_real( struct msn_auth_data *mad );
+static void passport_get_token_ready( struct http_request *req );
 
-static char *prd_cached = NULL;
-
-static int passport_get_id_real( gpointer func, gpointer data, char *header );
-static void passport_get_id_ready( struct http_request *req );
-
-static int passport_retrieve_dalogin( gpointer data, gpointer func, char *header );
-static void passport_retrieve_dalogin_ready( struct http_request *req );
-
-static char *passport_create_header( char *cookie, char *email, char *pwd );
-static void destroy_reply( struct passport_reply *rep );
-
-int passport_get_id( gpointer func, gpointer data, char *username, char *password, char *cookie )
+int passport_get_token( gpointer func, gpointer data, char *username, char *password, char *cookie )
 {
-        char *header = passport_create_header( cookie, username, password );
+        struct msn_auth_data *mad = g_new0( struct msn_auth_data, 1 );
+        int i;
         
-        if( prd_cached == NULL )
-                return passport_retrieve_dalogin( func, data, header );
-        else
-                return passport_get_id_real( func, data, header );
+        mad->username = g_strdup( username );
+        mad->password = g_strdup( password );
+        mad->cookie = g_strdup( cookie );
+        
+        mad->callback = func;
+        mad->data = data;
+        
+        mad->url = g_strdup( SOAP_AUTHENTICATION_URL );
+        mad->ttl = 3; /* Max. # of redirects. */
+        
+        /* HTTP-escape stuff and s/,/&/ */
+        http_decode( mad->cookie );
+        for( i = 0; mad->cookie[i]; i ++ )
+                if( mad->cookie[i] == ',' )
+                        mad->cookie[i] = '&';
+        
+        /* Microsoft doesn't allow password longer than 16 chars and silently
+           fails authentication if you give the "full version" of your passwd. */
+        if( strlen( mad->password ) > MAX_PASSPORT_PWLEN )
+                mad->password[MAX_PASSPORT_PWLEN] = 0;
+        
+        return passport_get_token_real( mad );
 }
 
-static int passport_get_id_real( gpointer func, gpointer data, char *header )
+static int passport_get_token_real( struct msn_auth_data *mad )
 {
-        struct passport_reply *rep;
-        char *server, *dummy, *reqs;
+        char *post_payload, *post_request;
         struct http_request *req;
+        url_t url;
         
-        rep = g_new0( struct passport_reply, 1 );
-        rep->data = data;
-        rep->func = func;
-        rep->header = header;
+        url_set( &url, mad->url );
         
-        server = g_strdup( prd_cached );
-        dummy = strchr( server, '/' );
+        post_payload = g_markup_printf_escaped( SOAP_AUTHENTICATION_PAYLOAD,
+                                                mad->username,
+                                                mad->password,
+                                                mad->cookie );
         
-        if( dummy == NULL )
-        {
-                destroy_reply( rep );
-                return( 0 );
-        }
+        post_request = g_strdup_printf( SOAP_AUTHENTICATION_REQUEST,
+                                        url.file, url.host,
+                                        (int) strlen( post_payload ),
+                                        post_payload );
+                                        
+        req = http_dorequest( url.host, url.port, 1, post_request,
+                              passport_get_token_ready, mad );
         
-        reqs = g_strdup_printf( "GET %s HTTP/1.0\r\n%s\r\n\r\n", dummy, header );
+        g_free( post_request );
+        g_free( post_payload );
         
-        *dummy = 0;
-        req = http_dorequest( server, 443, 1, reqs, passport_get_id_ready, rep );
-        
-        g_free( server );
-        g_free( reqs );
-        
-        if( req == NULL )
-                destroy_reply( rep );
-        
-        return( req != NULL );
+        return req != NULL;
 }
 
-static void passport_get_id_ready( struct http_request *req )
+static xt_status passport_xt_extract_token( struct xt_node *node, gpointer data );
+static xt_status passport_xt_handle_fault( struct xt_node *node, gpointer data );
+
+static const struct xt_handler_entry passport_xt_handlers[] = {
+        { "wsse:BinarySecurityToken", "wst:RequestedSecurityToken", passport_xt_extract_token },
+        { "S:Fault",                  "S:Envelope",                 passport_xt_handle_fault  },
+        { NULL,                       NULL,                         NULL                      }
+};
+
+static void passport_get_token_ready( struct http_request *req )
 {
-        struct passport_reply *rep = req->data;
+        struct msn_auth_data *mad = req->data;
+        struct xt_parser *parser;
         
-        if( !g_slist_find( msn_connections, rep->data ) )
+        g_free( mad->url );
+        g_free( mad->error );
+        mad->url = mad->error = NULL;
+        
+        if( req->status_code == 200 )
         {
-                destroy_reply( rep );
-                return;
-        }
-        
-        if( req->finished && req->reply_headers && req->status_code == 200 )
-        {
-                char *dummy;
-                
-                if( ( dummy = strstr( req->reply_headers, "from-PP='" ) ) )
-                {
-                        char *responseend;
-                        
-                        dummy += strlen( "from-PP='" );
-                        responseend = strchr( dummy, '\'' );
-                        if( responseend )
-                                *responseend = 0;
-                        
-                        rep->result = g_strdup( dummy );
-                }
-                else
-                {
-                        rep->error_string = g_strdup( "Could not parse Passport server response" );
-                }
+                parser = xt_new( passport_xt_handlers, mad );
+                xt_feed( parser, req->reply_body, req->body_size );
+                xt_handle( parser, NULL, -1 );
+                xt_free( parser );
         }
         else
         {
-                rep->error_string = g_strdup_printf( "HTTP error: %s",
-                                      req->status_string ? req->status_string : "Unknown error" );
+                mad->error = g_strdup_printf( "HTTP error %d (%s)", req->status_code,
+                                              req->status_string ? req->status_string : "unknown" );
         }
         
-        rep->func( rep );
-        destroy_reply( rep );
+        if( mad->error == NULL && mad->token == NULL )
+                mad->error = g_strdup( "Could not parse Passport server response" );
+        
+        if( mad->url && mad->token == NULL )
+        {
+                passport_get_token_real( mad );
+        }
+        else
+        {
+                mad->callback( mad );
+                
+                g_free( mad->url );
+                g_free( mad->username );
+                g_free( mad->password );
+                g_free( mad->cookie );
+                g_free( mad->token );
+                g_free( mad->error );
+                g_free( mad );
+        }
 }
 
-static char *passport_create_header( char *cookie, char *email, char *pwd )
+static xt_status passport_xt_extract_token( struct xt_node *node, gpointer data )
 {
-        char *buffer;
-        char *currenttoken;
-        char *email_enc, *pwd_enc;
+        struct msn_auth_data *mad = data;
+        char *s;
         
-        currenttoken = strstr( cookie, "lc=" );
-        if( currenttoken == NULL )
-                return NULL;
+        if( ( s = xt_find_attr( node, "Id" ) ) && strcmp( s, "PPToken1" ) == 0 )
+                mad->token = g_memdup( node->text, node->text_len + 1 );
         
-        email_enc = g_new0( char, strlen( email ) * 3 + 1 );
-        strcpy( email_enc, email );
-        http_encode( email_enc );
-        
-        pwd_enc = g_new0( char, strlen( pwd ) * 3 + 1 );
-        strcpy( pwd_enc, pwd );
-        http_encode( pwd_enc );
-        
-        buffer = g_strdup_printf( "Authorization: Passport1.4 OrgVerb=GET,"
-                                  "OrgURL=http%%3A%%2F%%2Fmessenger%%2Emsn%%2Ecom,"
-                                  "sign-in=%s,pwd=%s,%s", email_enc, pwd_enc,
-                                  currenttoken );
-        
-        g_free( email_enc );
-        g_free( pwd_enc );
-        
-        return buffer;
+        return XT_HANDLED;
 }
 
-static int passport_retrieve_dalogin( gpointer func, gpointer data, char *header )
+static xt_status passport_xt_handle_fault( struct xt_node *node, gpointer data )
 {
-        struct passport_reply *rep = g_new0( struct passport_reply, 1 );
-        struct http_request *req;
+        struct msn_auth_data *mad = data;
+        struct xt_node *code = xt_find_node( node->children, "faultcode" );
+        struct xt_node *string = xt_find_node( node->children, "faultstring" );
+        struct xt_node *redirect = xt_find_node( node->children, "psf:redirectUrl" );
         
-        rep->data = data;
-        rep->func = func;
-        rep->header = header;
+        if( redirect && redirect->text_len && mad->ttl-- > 0 )
+                mad->url = g_memdup( redirect->text, redirect->text_len + 1 );
         
-        req = http_dorequest_url( "https://nexus.passport.com/rdr/pprdr.asp", passport_retrieve_dalogin_ready, rep );
+        if( code == NULL || code->text_len == 0 )
+                mad->error = g_strdup( "Unknown error" );
+        else
+                mad->error = g_strdup_printf( "%s (%s)", code->text, string && string->text_len ?
+                                              string->text : "no description available" );
         
-        if( !req )
-                destroy_reply( rep );
-        
-        return( req != NULL );
+        return XT_HANDLED;
 }
-
-static void passport_retrieve_dalogin_ready( struct http_request *req )
-{
-        struct passport_reply *rep = req->data;
-        char *dalogin;
-        char *urlend;
-        
-        if( !g_slist_find( msn_connections, rep->data ) )
-        {
-                destroy_reply( rep );
-                return;
-        }
-        
-        if( !req->finished || !req->reply_headers || req->status_code != 200 )
-        {
-                rep->error_string = g_strdup_printf( "HTTP error while fetching DALogin: %s",
-                                        req->status_string ? req->status_string : "Unknown error" );
-                goto failure;
-        }
-        
-        dalogin = strstr( req->reply_headers, "DALogin=" );     
-        
-        if( !dalogin )
-        {
-                rep->error_string = g_strdup( "Parse error while fetching DALogin" );
-                goto failure;
-        }
-        
-        dalogin += strlen( "DALogin=" );
-        urlend = strchr( dalogin, ',' );
-        if( urlend )
-                *urlend = 0;
-        
-        /* strip the http(s):// part from the url */
-        urlend = strstr( urlend, "://" );
-        if( urlend )
-                dalogin = urlend + strlen( "://" );
-        
-        if( prd_cached == NULL )
-                prd_cached = g_strdup( dalogin );
-        
-        if( passport_get_id_real( rep->func, rep->data, rep->header ) )
-        {
-                rep->header = NULL;
-                destroy_reply( rep );
-                return;
-        }
-        
-failure:        
-        rep->func( rep );
-        destroy_reply( rep );
-}
-
-static void destroy_reply( struct passport_reply *rep )
-{
-        g_free( rep->result );
-        g_free( rep->header );
-        g_free( rep->error_string );
-        g_free( rep );
-}

protocols/msn/passport.h

@@ -1 @@
-#ifndef __PASSPORT_H__
-#define __PASSPORT_H__
 /* passport.h
  *
- * Functions to login to Microsoft Passport Service for Messenger
- * Copyright (C) 2004 Wouter Paesen <wouter@blue-gate.be>,
- *                    Wilmer van der Gaast <wilmer@gaast.net>
+ * Functions to login to Microsoft Passport service for Messenger
+ * Copyright (C) 2004-2008 Wilmer van der Gaast <wilmer@gaast.net>
  *
  * This program is free software; you can redistribute it and/or modify             
@@ -18 +15 @@
  * You should have received a copy of the GNU General Public License                
  * along with this program; if not, write to the Free Software                      
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA          
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA          
  */
+
+/* Thanks to http://msnpiki.msnfanatic.com/index.php/MSNP13:SOAPTweener
+   for the specs! */
+
+#ifndef __PASSPORT_H__
+#define __PASSPORT_H__
 
 #include <stdio.h>
@@ -33 +36 @@
 #include "nogaim.h"
 
-struct passport_reply
+#define MAX_PASSPORT_PWLEN 16
+
+struct msn_auth_data
 {
-        void (*func)( struct passport_reply * );
-        void *data;
-        char *result;
-        char *header;
-        char *error_string;
+        char *url;
+        int ttl;
+        
+        char *username;
+        char *password;
+        char *cookie;
+        
+        /* The end result, the only thing we'll really be interested in
+           once finished. */
+        char *token;
+        char *error; /* Yeah, or that... */
+        
+        void (*callback)( struct msn_auth_data *mad );
+        gpointer data;
 };
 
-int passport_get_id( gpointer func, gpointer data, char *username, char *password, char *cookie );
+#define SOAP_AUTHENTICATION_URL "https://loginnet.passport.com/RST.srf"
+
+#define SOAP_AUTHENTICATION_REQUEST \
+"POST %s HTTP/1.0\r\n" \
+"Accept: text/*\r\n" \
+"User-Agent: BitlBee " BITLBEE_VERSION "\r\n" \
+"Host: %s\r\n" \
+"Content-Length: %d\r\n" \
+"Cache-Control: no-cache\r\n" \
+"\r\n" \
+"%s"
+
+#define SOAP_AUTHENTICATION_PAYLOAD \
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" \
+"<Envelope xmlns=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:wsse=\"http://schemas.xmlsoap.org/ws/2003/06/secext\" xmlns:saml=\"urn:oasis:names:tc:SAML:1.0:assertion\" xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2002/12/policy\" xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\" xmlns:wsa=\"http://schemas.xmlsoap.org/ws/2004/03/addressing\" xmlns:wssc=\"http://schemas.xmlsoap.org/ws/2004/04/sc\" xmlns:wst=\"http://schemas.xmlsoap.org/ws/2004/04/trust\">" \
+  "<Header>" \
+    "<ps:AuthInfo xmlns:ps=\"http://schemas.microsoft.com/Passport/SoapServices/PPCRL\" Id=\"PPAuthInfo\">" \
+      "<ps:HostingApp>{7108E71A-9926-4FCB-BCC9-9A9D3F32E423}</ps:HostingApp>" \
+      "<ps:BinaryVersion>4</ps:BinaryVersion>" \
+      "<ps:UIVersion>1</ps:UIVersion>" \
+      "<ps:Cookies></ps:Cookies>" \
+      "<ps:RequestParams>AQAAAAIAAABsYwQAAAAzMDg0</ps:RequestParams>" \
+    "</ps:AuthInfo>" \
+    "<wsse:Security>" \
+       "<wsse:UsernameToken Id=\"user\">" \
+         "<wsse:Username>%s</wsse:Username>" \
+         "<wsse:Password>%s</wsse:Password>" \
+       "</wsse:UsernameToken>" \
+    "</wsse:Security>" \
+  "</Header>" \
+  "<Body>" \
+    "<ps:RequestMultipleSecurityTokens xmlns:ps=\"http://schemas.microsoft.com/Passport/SoapServices/PPCRL\" Id=\"RSTS\">" \
+      "<wst:RequestSecurityToken Id=\"RST0\">" \
+        "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>" \
+        "<wsp:AppliesTo>" \
+          "<wsa:EndpointReference>" \
+            "<wsa:Address>http://Passport.NET/tb</wsa:Address>" \
+          "</wsa:EndpointReference>" \
+        "</wsp:AppliesTo>" \
+      "</wst:RequestSecurityToken>" \
+      "<wst:RequestSecurityToken Id=\"RST1\">" \
+       "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>" \
+        "<wsp:AppliesTo>" \
+          "<wsa:EndpointReference>" \
+            "<wsa:Address>messenger.msn.com</wsa:Address>" \
+          "</wsa:EndpointReference>" \
+        "</wsp:AppliesTo>" \
+        "<wsse:PolicyReference URI=\"?%s\"></wsse:PolicyReference>" \
+      "</wst:RequestSecurityToken>" \
+    "</ps:RequestMultipleSecurityTokens>" \
+  "</Body>" \
+"</Envelope>"
+
+int passport_get_token( gpointer func, gpointer data, char *username, char *password, char *cookie );
 
 #endif /* __PASSPORT_H__ */

protocols/nogaim.c

@@ -343 +343 @@
 /* dialogs.c */
 
-void imcb_ask( struct im_connection *ic, char *msg, void *data, void *doit, void *dont )
+void imcb_ask( struct im_connection *ic, char *msg, void *data,
+               query_callback doit, query_callback dont )
 {
         query_add( ic->irc, ic, msg, doit, dont, data );
@@ -495 +496 @@
 };
 
-void show_got_added_no( gpointer w, struct show_got_added_data *data )
-{
-        g_free( data->handle );
+void show_got_added_no( void *data )
+{
+        g_free( ((struct show_got_added_data*)data)->handle );
         g_free( data );
 }
 
-void show_got_added_yes( gpointer w, struct show_got_added_data *data )
-{
-        data->ic->acc->prpl->add_buddy( data->ic, data->handle, NULL );
-        /* imcb_add_buddy( data->ic, NULL, data->handle, data->handle ); */
-        
-        return show_got_added_no( w, data );
+void show_got_added_yes( void *data )
+{
+        struct show_got_added_data *sga = data;
+        
+        sga->ic->acc->prpl->add_buddy( sga->ic, sga->handle, NULL );
+        /* imcb_add_buddy( sga->ic, NULL, sga->handle, sga->handle ); */
+        
+        return show_got_added_no( data );
 }
 

protocols/nogaim.h

@@ -42 +42 @@
 #include "account.h"
 #include "proxy.h"
+#include "query.h"
 #include "md5.h"
-
-#define BUF_LEN MSG_LEN
-#define BUF_LONG ( BUF_LEN * 2 )
-#define MSG_LEN 2048
-#define BUF_LEN MSG_LEN
 
 #define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */
@@ -265 +261 @@
  * - 'doit' or 'dont' will be called depending of the answer of the user.
  */
-G_MODULE_EXPORT void imcb_ask( struct im_connection *ic, char *msg, void *data, void *doit, void *dont );
+G_MODULE_EXPORT void imcb_ask( struct im_connection *ic, char *msg, void *data, query_callback doit, query_callback dont );
 G_MODULE_EXPORT void imcb_ask_add( struct im_connection *ic, char *handle, const char *realname );
 

protocols/oscar/oscar.c

@@ -60 +60 @@
 
 #define OSCAR_GROUP "Friends"
+
+#define BUF_LEN 2048
+#define BUF_LONG ( BUF_LEN * 2 )
 
 /* Don't know if support for UTF8 is really working. For now it's UTF16 here.
@@ -240 +243 @@
 };
 static int msgerrreasonlen = 25;
+
+/* Hurray, this function is NOT thread-safe \o/ */
+static char *normalize(const char *s)
+{
+        static char buf[BUF_LEN];
+        char *t, *u;
+        int x = 0;
+
+        g_return_val_if_fail((s != NULL), NULL);
+
+        u = t = g_strdup(s);
+
+        strcpy(t, s);
+        g_strdown(t);
+
+        while (*t && (x < BUF_LEN - 1)) {
+                if (*t != ' ' && *t != '!') {
+                        buf[x] = *t;
+                        x++;
+                }
+                t++;
+        }
+        buf[x] = '\0';
+        g_free(u);
+        return buf;
+}
 
 static gboolean oscar_callback(gpointer data, gint source,
@@ -1002 +1031 @@
         }
 
-        tmp = g_strdup(normalize(ic->acc->user));
-        if (!strcmp(tmp, normalize(info->sn)))
+        if (!aim_sncmp(ic->acc->user, info->sn))
                 g_snprintf(ic->displayname, sizeof(ic->displayname), "%s", info->sn);
-        g_free(tmp);
-
-        imcb_buddy_status(ic, info->sn, flags, state_string, NULL);
-        /* imcb_buddy_times(ic, info->sn, signon, time_idle); */
+
+        tmp = normalize(info->sn);
+        imcb_buddy_status(ic, tmp, flags, state_string, NULL);
+        /* imcb_buddy_times(ic, tmp, signon, time_idle); */
+
 
         return 1;
@@ -1022 +1051 @@
         va_end(ap);
 
-        imcb_buddy_status(ic, info->sn, 0, NULL, NULL );
+        imcb_buddy_status(ic, normalize(info->sn), 0, NULL, NULL );
 
         return 1;
@@ -1078 +1107 @@
         
         strip_linefeed(tmp);
-        imcb_buddy_msg(ic, userinfo->sn, tmp, flags, 0);
+        imcb_buddy_msg(ic, normalize(userinfo->sn), tmp, flags, 0);
         g_free(tmp);
         
@@ -1084 +1113 @@
 }
 
-void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv);
-void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv);
+void oscar_accept_chat(void *data);
+void oscar_reject_chat(void *data);
         
 static int incomingim_chan2(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args) {
@@ -1119 +1148 @@
 }
 
-static void gaim_icq_authgrant(gpointer w, struct icq_auth *data) {
+static void gaim_icq_authgrant(void *data_) {
+        struct icq_auth *data = data_;
         char *uin, message;
         struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
@@ -1134 +1164 @@
 }
 
-static void gaim_icq_authdeny(gpointer w, struct icq_auth *data) {
+static void gaim_icq_authdeny(void *data_) {
+        struct icq_auth *data = data_;
         char *uin, *message;
         struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
@@ -1175 +1206 @@
                         message = g_strdup(args->msg);
                         strip_linefeed(message);
-                        imcb_buddy_msg(ic, uin, message, 0, 0);
+                        imcb_buddy_msg(ic, normalize(uin), message, 0, 0);
                         g_free(uin);
                         g_free(message);
@@ -1194 +1225 @@
 
                         strip_linefeed(message);
-                        imcb_buddy_msg(ic, uin, message, 0, 0);
+                        imcb_buddy_msg(ic, normalize(uin), message, 0, 0);
                         g_free(uin);
                         g_free(m);
@@ -1469 +1500 @@
 
         for (i = 0; i < count; i++)
-                imcb_chat_add_buddy(c->cnv, info[i].sn);
+                imcb_chat_add_buddy(c->cnv, normalize(info[i].sn));
 
         return 1;
@@ -1492 +1523 @@
 
         for (i = 0; i < count; i++)
-                imcb_chat_remove_buddy(c->cnv, info[i].sn, NULL);
+                imcb_chat_remove_buddy(c->cnv, normalize(info[i].sn), NULL);
 
         return 1;
@@ -1543 +1574 @@
         tmp = g_malloc(BUF_LONG);
         g_snprintf(tmp, BUF_LONG, "%s", msg);
-        imcb_chat_msg(ccon->cnv, info->sn, tmp, 0, 0);
+        imcb_chat_msg(ccon->cnv, normalize(info->sn), tmp, 0, 0);
         g_free(tmp);
 
@@ -1756 +1787 @@
                         g_snprintf(sender, sizeof(sender), "%u", msg->sender);
                         strip_linefeed(dialog_msg);
-                        imcb_buddy_msg(ic, sender, dialog_msg, 0, t);
+                        imcb_buddy_msg(ic, normalize(sender), dialog_msg, 0, t);
                         g_free(dialog_msg);
                 } break;
@@ -1777 +1808 @@
 
                         strip_linefeed(dialog_msg);
-                        imcb_buddy_msg(ic, sender, dialog_msg, 0, t);
+                        imcb_buddy_msg(ic, normalize(sender), dialog_msg, 0, t);
                         g_free(dialog_msg);
                         g_free(m);
@@ -2015 +2046 @@
         struct aim_ssi_item *curitem;
         int tmp;
+        char *nrm;
 
         /* Add from server list to local list */
         tmp = 0;
         for (curitem=sess->ssi.items; curitem; curitem=curitem->next) {
+                nrm = curitem->name ? normalize(curitem->name) : NULL;
+                
                 switch (curitem->type) {
                         case 0x0000: /* Buddy */
-                                if ((curitem->name) && (!imcb_find_buddy(ic, curitem->name))) {
+                                if ((curitem->name) && (!imcb_find_buddy(ic, nrm))) {
                                         char *realname = NULL;
 
@@ -2027 +2061 @@
                                                     realname = aim_gettlv_str(curitem->data, 0x0131, 1);
                                                 
-                                        imcb_add_buddy(ic, curitem->name, NULL);
+                                        imcb_add_buddy(ic, nrm, NULL);
                                         
                                         if (realname) {
-                                                imcb_buddy_nick_hint(ic, curitem->name, realname);
-                                                imcb_rename_buddy(ic, curitem->name, realname);
+                                                imcb_buddy_nick_hint(ic, nrm, realname);
+                                                imcb_rename_buddy(ic, nrm, realname);
                                                 g_free(realname);
                                         }
@@ -2043 +2077 @@
                                         if (!list) {
                                                 char *name;
-                                                name = g_strdup(normalize(curitem->name));
+                                                name = g_strdup(nrm);
                                                 ic->permit = g_slist_append(ic->permit, name);
                                                 tmp++;
@@ -2056 +2090 @@
                                         if (!list) {
                                                 char *name;
-                                                name = g_strdup(normalize(curitem->name));
+                                                name = g_strdup(nrm);
                                                 ic->deny = g_slist_append(ic->deny, name);
                                                 tmp++;
@@ -2118 +2152 @@
                         if( st == 0x00 )
                         {
-                                imcb_add_buddy( sess->aux_data, list, NULL );
+                                imcb_add_buddy( sess->aux_data, normalize(list), NULL );
                         }
                         else if( st == 0x0E )
@@ -2448 +2482 @@
         if(type2 == 0x0002) {
                 /* User is typing */
-                imcb_buddy_typing(ic, sn, OPT_TYPING);
+                imcb_buddy_typing(ic, normalize(sn), OPT_TYPING);
         } 
         else if (type2 == 0x0001) {
                 /* User has typed something, but is not actively typing (stale) */
-                imcb_buddy_typing(ic, sn, OPT_THINKING);
+                imcb_buddy_typing(ic, normalize(sn), OPT_THINKING);
         }
         else {
                 /* User has stopped typing */
-                imcb_buddy_typing(ic, sn, 0);
+                imcb_buddy_typing(ic, normalize(sn), 0);
         }
         
@@ -2588 +2622 @@
 }
 
-void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv)
-{
+void oscar_accept_chat(void *data)
+{
+        struct aim_chat_invitation * inv = data;
+        
         oscar_chat_join(inv->ic, inv->name, NULL, NULL);
         g_free(inv->name);
@@ -2595 +2631 @@
 }
 
-void oscar_reject_chat(gpointer w, struct aim_chat_invitation * inv)
-{
+void oscar_reject_chat(void *data)
+{
+        struct aim_chat_invitation * inv = data;
+        
         g_free(inv->name);
         g_free(inv);

protocols/yahoo/libyahoo2.c

@@ -69 +69 @@
 #ifdef __MINGW32__
 # include <winsock2.h>
-# define write(a,b,c) send(a,b,c,0)
-# define read(a,b,c)  recv(a,b,c,0)
 #endif
 
@@ -381 +379 @@
 
 /* call repeatedly to get the next one */
-/*
 static struct yahoo_input_data * find_input_by_id(int id)
 {
@@ -392 +389 @@
         return NULL;
 }
-*/
 
 static struct yahoo_input_data * find_input_by_id_and_webcam_user(int id, const char * who)
@@ -737 +733 @@
 
         memcpy(data + pos, "YMSG", 4); pos += 4;
-        pos += yahoo_put16(data + pos, 0x0a00);
+        pos += yahoo_put16(data + pos, 0x000c);
         pos += yahoo_put16(data + pos, 0x0000);
         pos += yahoo_put16(data + pos, pktlen + extra_pad);
@@ -797 +793 @@
 {
         struct yahoo_data *yd = find_conn_by_id(id);
+        
         if(!yd)
                 return;
@@ -3166 +3163 @@
 
         LOG(("write callback: id=%d fd=%d data=%p", id, fd, data));
-        if(!yid || !yid->txqueues)
+        if(!yid || !yid->txqueues || !find_conn_by_id(id))
                 return -2;
         
@@ -3351 +3348 @@
                                         break;
                                 case 5: 
-                                        if(cp != "\005")
+                                        if(strcmp(cp, "5") != 0)
                                                 yct->location = cp;
                                         k = 0;
@@ -3842 +3839 @@
         }
 
-        
-/*      do {
+        do {
                 yahoo_input_close(yid);
-        } while((yid = find_input_by_id(id)));*/
-        
+        } while((yid = find_input_by_id(id)));
 }
 

protocols/yahoo/yahoo.c

@@ -163 +163 @@
         g_slist_free( yd->buddygroups );
         
-        if( yd->logged_in )
-                yahoo_logoff( yd->y2_id );
-        else
-                yahoo_close( yd->y2_id );
+        yahoo_logoff( yd->y2_id );
         
         g_free( yd );
@@ -315 +312 @@
         struct byahoo_data *yd = (struct byahoo_data *) c->ic->proto_data;
         
-        yahoo_conference_invite( yd->y2_id, NULL, c->data, c->title, msg );
+        yahoo_conference_invite( yd->y2_id, NULL, c->data, c->title, msg ? msg : "" );
 }
 
@@ -454 +451 @@
 {
         struct byahoo_write_ready_data *d = data;
-        
-        if( !byahoo_get_ic_by_id( d->id ) )
-                /* WTF doesn't libyahoo clean this up? */
-                return FALSE;
         
         yahoo_write_ready( d->id, d->fd, d->data );
@@ -798 +791 @@
 }
 
-static void byahoo_accept_conf( gpointer w, struct byahoo_conf_invitation *inv )
-{
+static void byahoo_accept_conf( void *data )
+{
+        struct byahoo_conf_invitation *inv = data;
+        
         yahoo_conference_logon( inv->yid, NULL, inv->members, inv->name );
         imcb_chat_add_buddy( inv->c, inv->ic->acc->user );
@@ -806 +801 @@
 }
 
-static void byahoo_reject_conf( gpointer w, struct byahoo_conf_invitation *inv )
-{
+static void byahoo_reject_conf( void *data )
+{
+        struct byahoo_conf_invitation *inv = data;
+        
         yahoo_conference_decline( inv->yid, NULL, inv->members, inv->name, "User rejected groupchat" );
         imcb_chat_free( inv->c );

protocols/yahoo/yahoo_httplib.c

@@ -51 +51 @@
 #ifdef __MINGW32__
 # include <winsock2.h>
-# define write(a,b,c) send(a,b,c,0)
-# define read(a,b,c)  recv(a,b,c,0)
 # define snprintf _snprintf
 #endif