aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/msn
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/msn')
-rw-r--r--protocols/msn/ns.c9
-rw-r--r--protocols/msn/passport.c32
-rw-r--r--protocols/msn/passport.h1
-rw-r--r--protocols/msn/sb.c10
-rw-r--r--protocols/msn/tables.c2
5 files changed, 41 insertions, 13 deletions
diff --git a/protocols/msn/ns.c b/protocols/msn/ns.c
index af3793f2..e4c2b68c 100644
--- a/protocols/msn/ns.c
+++ b/protocols/msn/ns.c
@@ -655,8 +655,15 @@ static void msn_auth_got_passport_id( struct passport_reply *rep )
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
{
diff --git a/protocols/msn/passport.c b/protocols/msn/passport.c
index 34703432..dd1d9b6f 100644
--- a/protocols/msn/passport.c
+++ b/protocols/msn/passport.c
@@ -68,8 +68,7 @@ static int passport_get_id_real( gpointer func, gpointer data, char *header )
return( 0 );
}
- 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;
req = http_dorequest( server, 443, 1, reqs, passport_get_id_ready, rep );
@@ -87,13 +86,13 @@ static void passport_get_id_ready( struct http_request *req )
{
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 );
return;
}
- if( req->status_code == 200 )
+ if( req->finished && req->reply_headers && req->status_code == 200 )
{
char *dummy;
@@ -108,6 +107,15 @@ static void passport_get_id_ready( struct http_request *req )
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" );
}
rep->func( rep );
@@ -144,7 +152,6 @@ static char *passport_create_header( char *cookie, char *email, char *pwd )
return( buffer );
}
-#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 )
{
struct passport_reply *rep = g_new0( struct passport_reply, 1 );
@@ -154,7 +161,7 @@ static int passport_retrieve_dalogin( gpointer func, gpointer data, char *header
rep->func = func;
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 )
destroy_reply( rep );
@@ -168,16 +175,26 @@ static void passport_retrieve_dalogin_ready( struct http_request *req )
char *dalogin;
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 );
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, ',' );
@@ -207,5 +224,6 @@ static void destroy_reply( struct passport_reply *rep )
{
g_free( rep->result );
g_free( rep->header );
+ g_free( rep->error_string );
g_free( rep );
}
diff --git a/protocols/msn/passport.h b/protocols/msn/passport.h
index f7e6ebb6..9fd81a82 100644
--- a/protocols/msn/passport.h
+++ b/protocols/msn/passport.h
@@ -38,6 +38,7 @@ struct passport_reply
void *data;
char *result;
char *header;
+ char *error_string;
};
int passport_get_id( gpointer func, gpointer data, char *username, char *password, char *cookie );
diff --git a/protocols/msn/sb.c b/protocols/msn/sb.c
index 54e89043..63744cd0 100644
--- a/protocols/msn/sb.c
+++ b/protocols/msn/sb.c
@@ -528,14 +528,14 @@ static int msn_sb_command( gpointer data, char **cmd, int num_parts )
if( err->flags & STATUS_SB_FATAL )
{
msn_sb_destroy( sb );
- return( 0 );
+ return 0;
}
- if( err->flags & STATUS_FATAL )
+ else if( err->flags & STATUS_FATAL )
{
signoff( gc );
- return( 0 );
+ return 0;
}
- if( err->flags & STATUS_SB_IM_SPARE )
+ else if( err->flags & STATUS_SB_IM_SPARE )
{
if( sb->who )
{
@@ -558,6 +558,8 @@ static int msn_sb_command( gpointer data, char **cmd, int num_parts )
g_slist_free( sb->msgq );
sb->msgq = NULL;
}
+
+ /* Do NOT return 0 here, we want to keep this sb. */
}
}
else
diff --git a/protocols/msn/tables.c b/protocols/msn/tables.c
index f8e98350..5ba9ea73 100644
--- a/protocols/msn/tables.c
+++ b/protocols/msn/tables.c
@@ -126,7 +126,7 @@ const struct msn_status_code msn_status_code_list[] =
{ 800, "Changing too rapidly", 0 },
{ 910, "Server is busy", STATUS_FATAL },
- { 911, "Authentication failed", STATUS_FATAL },
+ { 911, "Authentication failed", STATUS_SB_FATAL | STATUS_FATAL },
{ 912, "Server is busy", STATUS_FATAL },
{ 913, "Not allowed when hiding", 0 },
{ 914, "Server is unavailable", STATUS_FATAL },
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-22 07:43:43 +0000