Changeset 5fecede for protocols

Timestamp:

2010-08-08T17:29:43Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7db65b7

Parents:

2528cda

Message:

Enough changes to successfully login up to (but not including) fetching the
contact list.

Location:

protocols/msn

Files:

• ns.c (modified) (4 diffs)
• sb.c (modified) (1 diff)
• soap.c (modified) (1 diff)
• soap.h (modified) (1 diff)

protocols/msn/ns.c

@@ -73 +73 @@
         md->handler->rxq = g_new0( char, 1 );
         
-        g_snprintf( s, sizeof( s ), "VER %d MSNP8 CVR0\r\n", ++md->trId );
+        g_snprintf( s, sizeof( s ), "VER %d MSNP14 CVR0\r\n", ++md->trId );
         if( msn_write( ic, s, strlen( s ) ) )
         {
@@ -113 +113 @@
         if( strcmp( cmd[0], "VER" ) == 0 )
         {
-                if( cmd[2] && strncmp( cmd[2], "MSNP8", 5 ) != 0 )
+                if( cmd[2] && strncmp( cmd[2], "MSNP14", 5 ) != 0 )
                 {
                         imcb_error( ic, "Unsupported protocol" );
@@ -230 +230 @@
                         }
                 }
-                else if( num_parts >= 7 && strcmp( cmd[2], "OK" ) == 0 )
+                else if( strcmp( cmd[2], "OK" ) == 0 )
                 {
                         if( num_parts == 7 )
@@ -655 +655 @@
                         }
                 }
+        }
+        else if( strcmp( cmd[0], "GCF" ) == 0 )
+        {
+                /* Coming up is cmd[2] bytes of stuff we're supposed to
+                   censore. Meh. */
+                md->handler->msglen = atoi( cmd[2] );
         }
         else if( isdigit( cmd[0][0] ) )

protocols/msn/sb.c

@@ -30 +30 @@
 #include "md5.h"
 #include "soap.h"
+#include "invitation.h"
 
 static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond );

protocols/msn/soap.c

@@ -155 +155 @@
         soap_req->payload = g_markup_printf_escaped( SOAP_OIM_SEND_PAYLOAD,
                 ic->acc->user, display_name_b64, oim->to, md->passport_token,
-                MSNP11_PROD_ID, md->lock_key ? : "", oim->number, oim->number, oim->msg );
+                MSNP11_PROD_ID, md->lock_key ? md->lock_key : "",
+                oim->number, oim->number, oim->msg );
         
         g_free( display_name_b64 );

protocols/msn/soap.h

@@ -74 +74 @@
     "Content-Transfer-Encoding: base64\r\n" \
     "X-OIM-Message-Type: OfflineMessage\r\n" \
-    "X-OIM-Run-Id: {89527393-8723-4F4F-8005-287532973298}\r\n" \
+    "X-OIM-Run-Id: {F9A6C9DD-0D94-4E85-9CC6-F9D118CC1CAF}\r\n" \
     "X-OIM-Sequence-Num: %d\r\n" \
     "\r\n" \