Changeset 4ff0966 for protocols/msn/passport.c

Timestamp:

2006-05-28T23:13:47Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

df417ca

Parents:

cdca30b (diff), 79b6213 (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 from main/jelmer.

File:

• protocols/msn/passport.c (modified) (9 diffs)

protocols/msn/passport.c

@@ -69 +69 @@
         }
         
-        reqs = g_malloc( strlen( header ) + strlen( dummy ) + 128 );
-        sprintf( reqs, "GET %s HTTP/1.0\r\n%s\r\n\r\n", dummy, header );
+        reqs = g_strdup_printf( "GET %s HTTP/1.0\r\n%s\r\n\r\n", dummy, header );
         
         *dummy = 0;
@@ -88 +87 @@
         struct passport_reply *rep = req->data;
         
-        if( !g_slist_find( msn_connections, rep->data ) || !req->finished || !req->reply_headers )
+        if( !g_slist_find( msn_connections, rep->data ) )
         {
                 destroy_reply( rep );
@@ -94 +93 @@
         }
         
-        if( req->status_code == 200 )
+        if( req->finished && req->reply_headers && req->status_code == 200 )
         {
                 char *dummy;
@@ -109 +108 @@
                         rep->result = g_strdup( dummy );
                 }
+                else
+                {
+                        rep->error_string = g_strdup( "Could not parse Passport server response" );
+                }
+        }
+        else
+        {
+                rep->error_string = g_strdup_printf( "HTTP error: %s",
+                                      req->status_string ? req->status_string : "Unknown error" );
         }
         
@@ -145 +153 @@
 }
 
-#define PPR_REQUEST "GET /rdr/pprdr.asp HTTP/1.0\r\n\r\n"
 static int passport_retrieve_dalogin( gpointer func, gpointer data, char *header )
 {
@@ -155 +162 @@
         rep->header = header;
         
-        req = http_dorequest( "nexus.passport.com", 443, 1, PPR_REQUEST, passport_retrieve_dalogin_ready, rep );
+        req = http_dorequest_url( "https://nexus.passport.com/rdr/pprdr.asp", passport_retrieve_dalogin_ready, rep );
         
         if( !req )
@@ -169 +176 @@
         char *urlend;
         
-        if( !g_slist_find( msn_connections, rep->data ) || !req->finished || !req->reply_headers )
+        if( !g_slist_find( msn_connections, rep->data ) )
         {
                 destroy_reply( rep );
@@ -175 +182 @@
         }
         
+        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=" );
@@ -208 +225 @@
         g_free( rep->result );
         g_free( rep->header );
+        g_free( rep->error_string );
         g_free( rep );
 }