Changeset devel,411 for devel/protocols/msn/ns.c

Timestamp:

2008-07-31T20:44:43Z (2 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

branch-nick:

devel

revision id:

wilmer@gaast.net-20080731204443-lvon6xxb8erdw240

Message:

Reverting to the old MSN/Passport authentication mechanism, the new one
is "broken". (Bug #439)

Files:

• devel/protocols/msn/ns.c (modified) (3 diffs)

devel/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_token( struct msn_auth_data *mad );
+static void msn_auth_got_passport_id( struct passport_reply *rep );
 
 gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
@@ -222 +222 @@
                 {
                         /* Time for some Passport black magic... */
-                        if( !passport_get_token( msn_auth_got_passport_token, ic, ic->acc->user, ic->acc->pass, cmd[4] ) )
+                        if( !passport_get_id( msn_auth_got_passport_id, ic, ic->acc->user, ic->acc->pass, cmd[4] ) )
                         {
                                 imcb_error( ic, "Error while contacting Passport server" );
@@ -709 +709 @@
 }
 
-static void msn_auth_got_passport_token( struct msn_auth_data *mad )
+static void msn_auth_got_passport_id( struct passport_reply *rep )
 {
-        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 );
+        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" );
+                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 ) );
         }
-        else
-        {
-                imcb_error( ic, "Error during Passport authentication: %s", mad->error );
-                imc_logout( ic, TRUE );
-        }
 }