Changeset 4aa8a04 for protocols/msn/soap.c

Timestamp:

2010-09-04T15:54:52Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

27053b5

Parents:

bae0617

Message:

This works (includes some token sabotage code to ease testing), but I just
realised there's probably no need for the additional temporary NS connection.

File:

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

protocols/msn/soap.c

@@ -137 +137 @@
         {
                 struct xt_parser *parser;
+                struct xt_node *err;
                 
                 parser = xt_new( soap_req->xml_parser, soap_req );
                 xt_feed( parser, http_req->reply_body, http_req->body_size );
+                if( http_req->status_code == 500 &&
+                    ( err = xt_find_path( parser->root, "soap:Body/soap:Fault/detail/errorcode" ) ) &&
+                    err->text_len > 0 && strcmp( err->text, "PassportAuthFail" ) == 0 )
+                {
+                        struct msn_data *md = soap_req->ic->proto_data;
+                        
+                        xt_free( parser );
+                        if( md->auth->fd == -1 )
+                                msn_ns_connect( soap_req->ic, md->auth, MSN_NS_HOST, MSN_NS_PORT );
+                        md->soapq = g_slist_prepend( md->soapq, soap_req );
+                        
+                        return;
+                }
+                
                 xt_handle( parser, NULL, -1 );
                 xt_free( parser );
@@ -202 +217 @@
 }
 
+static int msn_soapq_empty( struct im_connection *ic )
+{
+        struct msn_data *md = ic->proto_data;
+        
+        while( md->soapq )
+        {
+                msn_soap_send_request( (struct msn_soap_req_data*) md->soapq->data );
+                md->soapq = g_slist_remove( md->soapq, md->soapq->data );
+        }
+        
+        return MSN_SOAP_OK;
+}
+
 
 /* passport_sso: Authentication MSNP15+ */
@@ -207 +235 @@
 struct msn_soap_passport_sso_data
 {
-        char *policy;
         char *nonce;
         char *secret;
@@ -217 +244 @@
         struct msn_soap_passport_sso_data *sd = soap_req->data;
         struct im_connection *ic = soap_req->ic;
+        struct msn_data *md = ic->proto_data;
         
         if( g_str_has_suffix( ic->acc->user, "@msn.com" ) )
@@ -224 +252 @@
         
         soap_req->payload = g_markup_printf_escaped( SOAP_PASSPORT_SSO_PAYLOAD,
-                ic->acc->user, ic->acc->pass, sd->policy );
+                ic->acc->user, ic->acc->pass, md->pp_policy );
         
         return MSN_SOAP_OK;
@@ -301 +329 @@
         struct msn_soap_passport_sso_data *sd = soap_req->data;
         struct im_connection *ic = soap_req->ic;
+        struct msn_data *md = ic->proto_data;
         char *key1, *key2, *key3, *blurb64;
         int key1_len;
@@ -326 +355 @@
         };
         
+        if( md->soapq )
+                return msn_soapq_empty( ic );
+        
         if( sd->secret == NULL )
         {
@@ -364 +396 @@
         struct msn_soap_passport_sso_data *sd = soap_req->data;
         
-        g_free( sd->policy );
         g_free( sd->nonce );
         g_free( sd->secret );
@@ -372 +403 @@
 }
 
-int msn_soap_passport_sso_request( struct im_connection *ic, const char *policy, const char *nonce )
+int msn_soap_passport_sso_request( struct im_connection *ic, const char *nonce )
 {
         struct msn_soap_passport_sso_data *sd = g_new0( struct msn_soap_passport_sso_data, 1 );
         
-        sd->policy = g_strdup( policy );
         sd->nonce = g_strdup( nonce );