Changes in protocols/msn/sb.c [bae0617:f8cb76d]

File:

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

protocols/msn/sb.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2010 Wilmer van der Gaast and others                *
+  * Copyright 2002-2005 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -27 +27 @@
 #include "nogaim.h"
 #include "msn.h"
+#include "passport.h"
 #include "md5.h"
-#include "soap.h"
-#include "invitation.h"
 
 static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond );
-static int msn_sb_command( struct msn_handler_data *handler, char **cmd, int num_parts );
-static int msn_sb_message( struct msn_handler_data *handler, char *msg, int msglen, char **cmd, int num_parts );
-
-int msn_sb_write( struct msn_switchboard *sb, const char *fmt, ... )
-{
-        va_list params;
-        char *out;
-        size_t len;
+static int msn_sb_command( gpointer data, char **cmd, int num_parts );
+static int msn_sb_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts );
+
+int msn_sb_write( struct msn_switchboard *sb, char *s, int len )
+{
         int st;
         
-        va_start( params, fmt );
-        out = g_strdup_vprintf( fmt, params );
-        va_end( params );
-        
-        if( getenv( "BITLBEE_DEBUG" ) )
-                fprintf( stderr, "->SB%d:%s", sb->fd, out );
-        
-        len = strlen( out );
-        st = write( sb->fd, out, len );
-        g_free( out );
+        st = write( sb->fd, s, len );
         if( st != len )
         {
                 msn_sb_destroy( sb );
-                return 0;
-        }
-        
-        return 1;
+                return( 0 );
+        }
+        
+        return( 1 );
 }
 
@@ -65 +52 @@
         struct msn_data *md = ic->proto_data;
         struct msn_switchboard *sb;
+        char buf[1024];
 
         /* FIXME: *CHECK* the reliability of using spare sb's! */
@@ -72 +60 @@
                 
                 sb->who = g_strdup( m->who );
-                if( msn_sb_write( sb, "CAL %d %s\r\n", ++sb->trId, m->who ) )
+                g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, m->who );
+                if( msn_sb_write( sb, buf, strlen( buf ) ) )
                 {
                         /* He/She should join the switchboard soon, let's queue the message. */
@@ -83 +72 @@
         
         /* If we reach this line, there was no spare switchboard, so let's make one. */
-        if( !msn_ns_write( ic, -1, "XFR %d SB\r\n", ++md->trId ) )
+        g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
+        if( !msn_write( ic, buf, strlen( buf ) ) )
         {
                 g_free( m->who );
@@ -174 +164 @@
         if( sb->ready )
         {
-                char *buf;
+                char *packet, *buf;
                 int i, j;
                 
@@ -187 +177 @@
                 {
                         buf = g_strdup( SB_KEEPALIVE_HEADERS );
-                        i = strlen( buf );
-                }
-                else if( strncmp( text, MSN_INVITE_HEADERS, sizeof( MSN_INVITE_HEADERS ) - 1 ) == 0 ) 
-                {
-                        buf = g_strdup( text );
                         i = strlen( buf );
                 }
@@ -210 +195 @@
                 
                 /* Build the final packet (MSG command + the message). */
-                if( msn_sb_write( sb, "MSG %d N %d\r\n%s", ++sb->trId, i, buf ) )
-                {
-                        g_free( buf );
-                        return 1;
+                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 );
-                        return 0;
+                        g_free( packet );
+                        return( 0 );
                 }
         }
@@ -240 +227 @@
 {
         struct im_connection *ic = sb->ic;
-        struct groupchat *c = NULL;
         char buf[1024];
         
         /* Create the groupchat structure. */
         g_snprintf( buf, sizeof( buf ), "MSN groupchat session %d", sb->session );
-        if( sb->who )
-                c = bee_chat_by_title( ic->bee, ic, sb->who );
-        if( c && !msn_sb_by_chat( c ) )
-                sb->chat = c;
-        else
-                sb->chat = imcb_chat_new( ic, buf );
+        sb->chat = imcb_chat_new( ic, buf );
         
         /* Populate the channel. */
@@ -333 +314 @@
                 g_snprintf( buf, sizeof( buf ), "ANS %d %s %s %d\r\n", ++sb->trId, ic->acc->user, sb->key, sb->session );
         
-        if( msn_sb_write( sb, "%s", buf ) )
-                sb->inp = b_input_add( sb->fd, B_EV_IO_READ, msn_sb_callback, sb );
+        if( msn_sb_write( sb, buf, strlen( buf ) ) )
+                sb->inp = b_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
         else
                 debug( "Error %d while connecting to switchboard server", 2 );
@@ -353 +334 @@
         {
                 time_t now = time( NULL );
+                char buf[1024];
                 
                 if( now - md->first_sb_failure > 600 )
@@ -384 +366 @@
                 debug( "Moved queued messages back to the main queue, "
                        "creating a new switchboard to retry." );
-                if( !msn_ns_write( ic, -1, "XFR %d SB\r\n", ++md->trId ) )
+                g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
+                if( !msn_write( ic, buf, strlen( buf ) ) )
                         return FALSE;
         }
@@ -392 +375 @@
 }
 
-static int msn_sb_command( struct msn_handler_data *handler, char **cmd, int num_parts )
-{
-        struct msn_switchboard *sb = handler->data;
+static int msn_sb_command( gpointer data, char **cmd, int num_parts )
+{
+        struct msn_switchboard *sb = data;
         struct im_connection *ic = sb->ic;
+        char buf[1024];
         
         if( !num_parts )
@@ -411 +395 @@
         else if( strcmp( cmd[0], "USR" ) == 0 )
         {
-                if( num_parts < 5 )
+                if( num_parts != 5 )
                 {
                         msn_sb_destroy( sb );
@@ -424 +408 @@
                 
                 if( sb->who )
-                        return msn_sb_write( sb, "CAL %d %s\r\n", ++sb->trId, sb->who );
+                {
+                        g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, sb->who );
+                        return( msn_sb_write( sb, buf, strlen( buf ) ) );
+                }
                 else
+                {
                         debug( "Just created a switchboard, but I don't know what to do with it." );
+                }
         }
         else if( strcmp( cmd[0], "IRO" ) == 0 )
@@ -432 +421 @@
                 int num, tot;
                 
-                if( num_parts < 6 )
+                if( num_parts != 6 )
                 {
                         msn_sb_destroy( sb );
@@ -469 +458 @@
         else if( strcmp( cmd[0], "ANS" ) == 0 )
         {
-                if( num_parts < 3 )
+                if( num_parts != 3 )
                 {
                         msn_sb_destroy( sb );
@@ -488 +477 @@
         else if( strcmp( cmd[0], "CAL" ) == 0 )
         {
-                if( num_parts < 4 || !isdigit( cmd[3][0] ) )
+                if( num_parts != 4 || !isdigit( cmd[3][0] ) )
                 {
                         msn_sb_destroy( sb );
@@ -498 +487 @@
         else if( strcmp( cmd[0], "JOI" ) == 0 )
         {
-                if( num_parts < 3 )
+                if( num_parts != 3 )
                 {
                         msn_sb_destroy( sb );
@@ -559 +548 @@
         else if( strcmp( cmd[0], "MSG" ) == 0 )
         {
-                if( num_parts < 4 )
+                if( num_parts != 4 )
                 {
                         msn_sb_destroy( sb );
@@ -624 +613 @@
                 const struct msn_status_code *err = msn_status_by_number( num );
                 
-                /* If the person is offline, send an offline message instead,
-                   and don't report an error. */
-                if( num == 217 )
-                        msn_soap_oim_send_queue( ic, &sb->msgq );
-                else
-                        imcb_error( ic, "Error reported by switchboard server: %s", err->text );
+                imcb_error( ic, "Error reported by switchboard server: %s", err->text );
                 
                 if( err->flags & STATUS_SB_FATAL )
@@ -665 +649 @@
 }
 
-static int msn_sb_message( struct msn_handler_data *handler, char *msg, int msglen, char **cmd, int num_parts )
-{
-        struct msn_switchboard *sb = handler->data;
+static int msn_sb_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts )
+{
+        struct msn_switchboard *sb = data;
         struct im_connection *ic = sb->ic;
         char *body;
@@ -708 +692 @@
                         }
                 }
-#if 0
-                // Disable MSN ft support for now.
                 else if( g_strncasecmp( ct, "text/x-msmsgsinvite", 19 ) == 0 )
                 {
-                        char *command = msn_findheader( body, "Invitation-Command:", blen );
-                        char *cookie = msn_findheader( body, "Invitation-Cookie:", blen );
-                        unsigned int icookie;
+                        char *itype = msn_findheader( body, "Application-GUID:", blen );
+                        char buf[1024];
                         
                         g_free( ct );
                         
-                        /* Every invite should have both a Command and Cookie header */
-                        if( !command || !cookie ) {
-                                g_free( command );
-                                g_free( cookie );
-                                imcb_log( ic, "Warning: No command or cookie from %s", sb->who );
-                                return 1;
-                        }
-                        
-                        icookie = strtoul( cookie, NULL, 10 );
-                        g_free( cookie );
-                        
-                        if( g_strncasecmp( command, "INVITE", 6 ) == 0 ) {
-                                msn_invitation_invite( sb, cmd[1], icookie, body, blen );
-                        } else if( g_strncasecmp( command, "ACCEPT", 6 ) == 0 ) {
-                                msn_invitation_accept( sb, cmd[1], icookie, body, blen );
-                        } else if( g_strncasecmp( command, "CANCEL", 6 ) == 0 ) {
-                                msn_invitation_cancel( sb, cmd[1], icookie, body, blen );
-                        } else {
-                                imcb_log( ic, "Warning: Received invalid invitation with "
-                                                "command %s from %s", command, sb->who );
-                        }
-                        
-                        g_free( command );
-                }
-#endif
-                else if( g_strncasecmp( ct, "application/x-msnmsgrp2p", 24 ) == 0 ) 
-                {
-                        /* Not currently implemented. Don't warn about it since
-                           this seems to be used for avatars now. */
-                        g_free( ct );
+                        *buf = 0;
+                        
+                        if( !itype )
+                                return( 1 );
+                        
+                        /* File transfer. */
+                        if( strcmp( itype, "{5D3E02AB-6190-11d3-BBBB-00C04F795683}" ) == 0 )
+                        {
+                                char *name = msn_findheader( body, "Application-File:", blen );
+                                char *size = msn_findheader( body, "Application-FileSize:", blen );
+                                
+                                if( name && size )
+                                {
+                                        g_snprintf( buf, sizeof( buf ), "<< \x02""BitlBee\x02"" - Filetransfer: `%s', %s bytes >>\n"
+                                                    "Filetransfers are not supported by BitlBee for now...", name, size );
+                                }
+                                else
+                                {
+                                        strcpy( buf, "<< \x02""BitlBee\x02"" - Corrupted MSN filetransfer invitation message >>" );
+                                }
+                                
+                                if( name ) g_free( name );
+                                if( size ) g_free( size );
+                        }
+                        else
+                        {
+                                char *iname = msn_findheader( body, "Application-Name:", blen );
+                                
+                                g_snprintf( buf, sizeof( buf ), "<< \x02""BitlBee\x02"" - Unknown MSN invitation - %s (%s) >>",
+                                                                itype, iname ? iname : "no name" );
+                                
+                                if( iname ) g_free( iname );
+                        }
+                        
+                        g_free( itype );
+                        
+                        if( !*buf )
+                                return( 1 );
+                        
+                        if( sb->who )
+                        {
+                                imcb_buddy_msg( ic, cmd[1], buf, 0, 0 );
+                        }
+                        else if( sb->chat )
+                        {
+                                imcb_chat_msg( sb->chat, cmd[1], buf, 0, 0 );
+                        }
+                        else
+                        {
+                                /* PANIC! */
+                        }
                 }
                 else if( g_strncasecmp( ct, "text/x-msmsgscontrol", 20 ) == 0 )
@@ -778 +780 @@
 void msn_sb_start_keepalives( struct msn_switchboard *sb, gboolean initial )
 {
-        bee_user_t *bu;
+        struct buddy *b;
         
         if( sb && sb->who && sb->keepalive == 0 &&
-            ( bu = bee_user_by_handle( sb->ic->bee, sb->ic, sb->who ) ) &&
-            !( bu->flags & BEE_USER_ONLINE ) &&
+            ( b = imcb_find_buddy( sb->ic, sb->who ) ) && !b->present &&
             set_getbool( &sb->ic->acc->set, "switchboard_keepalives" ) )
         {