Changeset a2582c8

Timestamp:

2006-05-26T22:44:48Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

db28304

Parents:

fe23720

Message:

Added error_string variable to Passport client.

Location:

protocols/msn

Files:

• ns.c (modified) (1 diff)
• passport.c (modified) (7 diffs)
• passport.h (modified) (1 diff)

protocols/msn/ns.c

@@ -650 +650 @@
         if( key == NULL )
         {
-                hide_login_progress( gc, "Error during Passport authentication" );
+                char *err;
+                
+                err = g_strdup_printf( "Error during Passport authentication (%s)",
+                                       rep->error_string ? rep->error_string : "Unknown error" );
+                
+                hide_login_progress( gc, err );
                 signoff( gc );
+                
+                g_free( err );
         }
         else

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" );
         }
         
@@ -169 +177 @@
         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 +183 @@
         }
         
+        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 +226 @@
         g_free( rep->result );
         g_free( rep->header );
+        g_free( rep->error_string );
         g_free( rep );
 }

protocols/msn/passport.h

@@ -39 +39 @@
         char *result;
         char *header;
+        char *error_string;
 };