Changeset 4aa8a04 for protocols/msn/ns.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/ns.c (modified) (4 diffs)

protocols/msn/ns.c

@@ -111 +111 @@
         handler->rxq = g_new0( char, 1 );
         
-        if( msn_ns_write( ic, -1, "VER %d %s CVR0\r\n", ++md->trId, MSNP_VER ) )
+        if( msn_ns_write( ic, source, "VER %d %s CVR0\r\n", ++md->trId, MSNP_VER ) )
         {
                 handler->inpa = b_input_add( handler->fd, B_EV_IO_READ, msn_ns_callback, handler );
@@ -173 +173 @@
                 }
                 
-                return( msn_ns_write( ic, -1, "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s\r\n",
+                return( msn_ns_write( ic, handler->fd, "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s\r\n",
                                       ++md->trId, ic->acc->user ) );
         }
@@ -179 +179 @@
         {
                 /* We don't give a damn about the information we just received */
-                return msn_ns_write( ic, -1, "USR %d SSO I %s\r\n", ++md->trId, ic->acc->user );
+                return msn_ns_write( ic, handler->fd, "USR %d SSO I %s\r\n", ++md->trId, ic->acc->user );
         }
         else if( strcmp( cmd[0], "XFR" ) == 0 )
@@ -272 +272 @@
                     strcmp( cmd[3], "S" ) == 0 )
                 {
-                        msn_soap_passport_sso_request( ic, cmd[4], cmd[5] );
+                        g_free( md->pp_policy );
+                        md->pp_policy = g_strdup( cmd[4] );
+                        msn_soap_passport_sso_request( ic, cmd[5] );
+                        if( handler == md->auth )
+                        {
+                                msn_ns_close( md->auth );
+                                return 0;
+                        }
                 }
                 else if( strcmp( cmd[2], "OK" ) == 0 )