Changeset bd28e6a

Timestamp:

2006-10-24T10:40:28Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a3a3778

Parents:

6237ded

Message:

MSN message packets are now sent at once instead of separately. Probably
the MSN servers don't care, but it looks a bit prettier in wireshark. ;-)

File:

• protocols/msn/sb.c (modified) (2 diffs)

protocols/msn/sb.c

@@ -122 +122 @@
         if( sb->ready )
         {
-                char cmd[1024], *buf;
+                char *packet, *buf;
                 int i, j;
                 
+                /* Build the message. Convert LF to CR-LF for normal messages. */
                 if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) != 0 )
                 {
@@ -142 +143 @@
                 {
                         i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->gc->username );
-                        buf = g_new0( char, strlen( MSN_TYPING_HEADERS ) + strlen( sb->gc->username ) );
+                        buf = g_new0( char, i );
                         i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->gc->username );
                 }
                 
-                g_snprintf( cmd, sizeof( cmd ), "MSG %d N %d\r\n", ++sb->trId, i );
-                if( msn_sb_write( sb, cmd, strlen( cmd ) ) && msn_sb_write( sb, buf, i ) )
-                {
-                        g_free( buf );
+                /* Build the final packet (MSG command + the message). */
+                packet = g_strdup_printf( "MSG %d N %d\r\n%s", ++sb->trId, i, buf );
+                g_free( buf );
+                if( msn_sb_write( sb, packet, strlen( packet ) ) )
+                {
+                        g_free( packet );
                         return( 1 );
                 }
                 else
                 {
-                        g_free( buf );
+                        g_free( packet );
                         return( 0 );
                 }