Changeset b79308b for protocols

Timestamp:

2008-04-14T13:10:53Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (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:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

Location:

protocols

Files:

• Makefile (modified) (1 diff)
• jabber/Makefile (modified) (2 diffs)
• jabber/io.c (modified) (2 diffs)
• jabber/iq.c (modified) (2 diffs)
• jabber/jabber.c (modified) (1 diff)
• jabber/jabber_util.c (modified) (2 diffs)
• jabber/sasl.c (modified) (3 diffs)
• msn/Makefile (modified) (1 diff)
• msn/msn.h (modified) (1 diff)
• msn/msn_util.c (modified) (2 diffs)
• msn/ns.c (modified) (3 diffs)
• msn/passport.c (modified) (2 diffs)
• msn/passport.h (modified) (3 diffs)
• nogaim.c (modified) (2 diffs)
• nogaim.h (modified) (2 diffs)
• oscar/Makefile (modified) (1 diff)
• oscar/oscar.c (modified) (5 diffs)
• yahoo/Makefile (modified) (1 diff)
• yahoo/libyahoo2.c (modified) (2 diffs)
• yahoo/yahoo.c (modified) (3 diffs)

protocols/Makefile

@@ -27 +27 @@
 all: protocols.o
 check: all
-lcov:
+lcov: check
 gcov:
         gcov *.c

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 si.o s5bytestream.o
+objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o si.o s5bytestream.o
 
 CFLAGS += -Wall
@@ -18 +18 @@
 all: jabber_mod.o
 check: all
-lcov:
+lcov: check
 gcov: 
         gcov *.c

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/iq.c

@@ -534 +534 @@
 }
 
+static xt_status jabber_add_to_roster_callback( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
+
 int jabber_add_to_roster( struct im_connection *ic, char *handle, char *name )
 {
@@ -549 +551 @@
         xt_add_attr( node, "xmlns", XMLNS_ROSTER );
         node = jabber_make_packet( "iq", "set", NULL, node );
+        jabber_cache_add( ic, node, jabber_add_to_roster_callback );
         
         st = jabber_write_packet( ic, node );
         
-        xt_free_node( node );
         return st;
+}
+
+static xt_status jabber_add_to_roster_callback( struct im_connection *ic, struct xt_node *node, struct xt_node *orig )
+{
+        char *s, *jid = NULL;
+        struct xt_node *c;
+        
+        if( ( c = xt_find_node( orig->children, "query" ) ) &&
+            ( c = xt_find_node( c->children, "item" ) ) &&
+            ( jid = xt_find_attr( c, "jid" ) ) &&
+            ( s = xt_find_attr( node, "type" ) ) &&
+            strcmp( s, "result" ) == 0 )
+        {
+                if( imcb_find_buddy( ic, jid ) == NULL )
+                        imcb_add_buddy( ic, jid, NULL );
+        }
+        else
+        {
+                imcb_log( ic, "Error while adding `%s' to your contact list.",
+                          jid ? jid : "(unknown handle)" );
+        }
+        
+        return XT_HANDLED;
 }
 

protocols/jabber/jabber.c

@@ -267 +267 @@
         xt_free( jd->xt );
         
+        g_free( jd->cached_id_prefix );
         g_free( jd->away_message );
         g_free( jd->username );

protocols/jabber/jabber_util.c

@@ -250 +250 @@
 };
 
-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" );
         
@@ -261 +263 @@
 }
 
-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" );
         

protocols/jabber/sasl.c

@@ -21 +21 @@
 *                                                                           *
 \***************************************************************************/
+
+#include <ctype.h>
 
 #include "jabber.h"
@@ -107 +109 @@
 }
 
-static char *sasl_get_part( char *data, char *field )
+/* Non-static function, but not mentioned in jabber.h because it's for internal
+   use, just that the unittest should be able to reach it... */
+char *sasl_get_part( char *data, char *field )
 {
         int i, len;
         
         len = strlen( field );
+        
+        while( isspace( *data ) || *data == ',' )
+                data ++;
         
         if( g_strncasecmp( data, field, len ) == 0 && data[len] == '=' )
@@ -129 +136 @@
                         }
                         
-                        /* If we got a comma, we got a new field. Check it. */
-                        if( data[i] == ',' &&
-                            g_strncasecmp( data + i + 1, field, len ) == 0 &&
-                            data[i+len+1] == '=' )
+                        /* If we got a comma, we got a new field. Check it,
+                           find the next key after it. */
+                        if( data[i] == ',' )
                         {
-                                i += len + 2;
-                                break;
+                                while( isspace( data[i] ) || data[i] == ',' )
+                                        i ++;
+                                
+                                if( g_strncasecmp( data + i, field, len ) == 0 &&
+                                    data[i+len] == '=' )
+                                {
+                                        i += len + 1;
+                                        break;
+                                }
                         }
                 }

protocols/msn/Makefile

@@ -18 +18 @@
 all: msn_mod.o
 check: all
-lcov:
+lcov: check
 gcov: 
         gcov *.c

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 )
@@ -214 +214 @@
                 {
                         /* 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" );
@@ -674 +674 @@
 }
 
-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"
 #include "ft.h"
@@ -265 +266 @@
  * - '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/Makefile

@@ -18 +18 @@
 all: oscar_mod.o
 check: all
-lcov:
+lcov: check
 gcov:
         gcov *.c

protocols/oscar/oscar.c

@@ -1084 +1084 @@
 }
 
-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 +1119 @@
 }
 
-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 +1135 @@
 }
 
-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;
@@ -2588 +2590 @@
 }
 
-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 +2599 @@
 }
 
-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/Makefile

@@ -18 +18 @@
 all: yahoo_mod.o
 check: all
-lcov:
+lcov: check
 gcov: 
         gcov *.c

protocols/yahoo/libyahoo2.c

@@ -737 +737 @@
 
         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);
@@ -3351 +3351 @@
                                         break;
                                 case 5: 
-                                        if(cp != "\005")
+                                        if(strcmp(cp, "5") != 0)
                                                 yct->location = cp;
                                         k = 0;

protocols/yahoo/yahoo.c

@@ -315 +315 @@
         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 : "" );
 }
 
@@ -797 +797 @@
 }
 
-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 );
@@ -805 +807 @@
 }
 
-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 );