Changeset 3901b5d

Timestamp:

2012-09-25T22:48:56Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

208db4b

Parents:

ba86713

Message:

Support for receiving messages via the NS (UBM command).

File:

• protocols/msn/ns.c (modified) (5 diffs)

protocols/msn/ns.c

@@ -571 +571 @@
                 if( num_parts >= 2 )
                         handler->msglen = atoi( cmd[1] );
+        }
+        else if( strcmp( cmd[0], "UBM" ) == 0 )
+        {
+                if( num_parts >= 7 )
+                        handler->msglen = atoi( cmd[6] );
         }
         else if( isdigit( cmd[0][0] ) )
@@ -773 +778 @@
                                         continue;
                                 
+                                /* FIXME: Use "t" here, guess I should just add it
+                                   as a prefix like elsewhere in the protocol. */
                                 handle = g_strdup_printf( "%s@%s", cn, dn );
                                 if( !( ( bu = bee_user_by_handle( ic->bee, ic, handle ) ) ||
@@ -798 +805 @@
                 }
         }
-        
-        return( 1 );
+        else if( strcmp( cmd[0], "UBM" ) == 0 )
+        {
+                char *ct = get_rfc822_header( msg, "Content-Type", msglen );
+                char *handle;
+                
+                if( strncmp( ct, "text/plain", 10 ) != 0 )
+                {
+                        g_free( ct );
+                        return 1;
+                }
+                if( strcmp( cmd[2], "1" ) != 0 )
+                        handle = g_strdup_printf( "%s:%s", cmd[2], cmd[1] );
+                else
+                        handle = g_strdup( cmd[1] );
+                
+                imcb_buddy_msg( ic, handle, body, 0, 0 );
+                g_free( handle );
+        }
+        
+        return 1;
 }
 
@@ -866 +891 @@
         xt_add_attr( c, "n", handle );
         xt_add_attr( c, "l", l );
-        xt_add_attr( c, "t", "1" ); /* 1 means normal, 4 means mobile? */
+        xt_add_attr( c, "t", "1" ); /* FIXME: Network type, i.e. 32 for Y!MSG */
         xt_insert_child( d, c );
         
@@ -958 +983 @@
         if( msn_ns_write( ic, -1, "UUM %d %s %d %d %zd\r\n%s",
                                   ++md->trId, bu->handle,
-                                  1, /* type == MSN offline message */
+                                  1, /* type == MSN (offline) message */
                                   1, /* type == IM (not nudge/typing) */
                                   strlen( buf ), buf ) )