Changeset 62f53b50 for protocols/msn/sb.c

Timestamp:

2010-10-02T05:34:53Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2af3e23

Parents:

05bf2a0 (diff), 04cd284 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging msnp13 branch which, confusingly, upgrades the msn module to use
MSNP15. (The reason for this is that A) IMHO MSNP13 is what causes most of
the pain in this upgade and B) I initially intended to only implement MSNP13
but then discovered MS doesn't support it anymore.)

This fixes issues with display names being forgotten, adding contacts (and
them automatically getting blocked sometimes!!), and adds support for
away/status messages and some support for sending offline messages.

File:

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

protocols/msn/sb.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2005 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 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( 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 )
-{
+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;
         int st;
         
-        st = write( sb->fd, s, len );
+        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 );
         if( st != len )
         {
                 msn_sb_destroy( sb );
-                return( 0 );
-        }
-        
-        return( 1 );
+                return 0;
+        }
+        
+        return 1;
 }
 
@@ -53 +65 @@
         struct msn_data *md = ic->proto_data;
         struct msn_switchboard *sb;
-        char buf[1024];
 
         /* FIXME: *CHECK* the reliability of using spare sb's! */
@@ -61 +72 @@
                 
                 sb->who = g_strdup( m->who );
-                g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, m->who );
-                if( msn_sb_write( sb, buf, strlen( buf ) ) )
+                if( msn_sb_write( sb, "CAL %d %s\r\n", ++sb->trId, m->who ) )
                 {
                         /* He/She should join the switchboard soon, let's queue the message. */
@@ -73 +83 @@
         
         /* If we reach this line, there was no spare switchboard, so let's make one. */
-        g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
-        if( !msn_write( ic, buf, strlen( buf ) ) )
+        if( !msn_ns_write( ic, -1, "XFR %d SB\r\n", ++md->trId ) )
         {
                 g_free( m->who );
@@ -165 +174 @@
         if( sb->ready )
         {
-                char *packet, *buf;
+                char *buf;
                 int i, j;
                 
@@ -201 +210 @@
                 
                 /* 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 );
+                if( msn_sb_write( sb, "MSG %d N %d\r\n%s", ++sb->trId, i, buf ) )
+                {
+                        g_free( buf );
+                        return 1;
                 }
                 else
                 {
-                        g_free( packet );
-                        return( 0 );
+                        g_free( buf );
+                        return 0;
                 }
         }
@@ -326 +333 @@
                 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, buf, strlen( buf ) ) )
+        if( msn_sb_write( sb, "%s", buf ) )
                 sb->inp = b_input_add( sb->fd, B_EV_IO_READ, msn_sb_callback, sb );
         else
@@ -346 +353 @@
         {
                 time_t now = time( NULL );
-                char buf[1024];
                 
                 if( now - md->first_sb_failure > 600 )
@@ -378 +384 @@
                 debug( "Moved queued messages back to the main queue, "
                        "creating a new switchboard to retry." );
-                g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
-                if( !msn_write( ic, buf, strlen( buf ) ) )
+                if( !msn_ns_write( ic, -1, "XFR %d SB\r\n", ++md->trId ) )
                         return FALSE;
         }
@@ -387 +392 @@
 }
 
-static int msn_sb_command( gpointer data, char **cmd, int num_parts )
-{
-        struct msn_switchboard *sb = data;
+static int msn_sb_command( struct msn_handler_data *handler, char **cmd, int num_parts )
+{
+        struct msn_switchboard *sb = handler->data;
         struct im_connection *ic = sb->ic;
-        char buf[1024];
         
         if( !num_parts )
@@ -407 +411 @@
         else if( strcmp( cmd[0], "USR" ) == 0 )
         {
-                if( num_parts != 5 )
+                if( num_parts < 5 )
                 {
                         msn_sb_destroy( sb );
@@ -420 +424 @@
                 
                 if( sb->who )
-                {
-                        g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, sb->who );
-                        return( msn_sb_write( sb, buf, strlen( buf ) ) );
-                }
+                        return msn_sb_write( sb, "CAL %d %s\r\n", ++sb->trId, sb->who );
                 else
-                {
                         debug( "Just created a switchboard, but I don't know what to do with it." );
-                }
         }
         else if( strcmp( cmd[0], "IRO" ) == 0 )
@@ -433 +432 @@
                 int num, tot;
                 
-                if( num_parts != 6 )
+                if( num_parts < 6 )
                 {
                         msn_sb_destroy( sb );
@@ -470 +469 @@
         else if( strcmp( cmd[0], "ANS" ) == 0 )
         {
-                if( num_parts != 3 )
+                if( num_parts < 3 )
                 {
                         msn_sb_destroy( sb );
@@ -489 +488 @@
         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 );
@@ -499 +498 @@
         else if( strcmp( cmd[0], "JOI" ) == 0 )
         {
-                if( num_parts != 3 )
+                if( num_parts < 3 )
                 {
                         msn_sb_destroy( sb );
@@ -560 +559 @@
         else if( strcmp( cmd[0], "MSG" ) == 0 )
         {
-                if( num_parts != 4 )
+                if( num_parts < 4 )
                 {
                         msn_sb_destroy( sb );
@@ -625 +624 @@
                 const struct msn_status_code *err = msn_status_by_number( num );
                 
-                imcb_error( ic, "Error reported by switchboard server: %s", err->text );
+                /* 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 );
                 
                 if( err->flags & STATUS_SB_FATAL )
@@ -661 +665 @@
 }
 
-static int msn_sb_message( gpointer data, char *msg, int msglen, char **cmd, int num_parts )
-{
-        struct msn_switchboard *sb = data;
+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;
         struct im_connection *ic = sb->ic;
         char *body;
@@ -741 +745 @@
                 else if( g_strncasecmp( ct, "application/x-msnmsgrp2p", 24 ) == 0 ) 
                 {
-                        imcb_error( sb->ic, "Cannot receive file from %s: BitlBee does not "
-                                        "support msnmsgrp2p yet.", sb->who );
+                        /* Not currently implemented. Don't warn about it since
+                           this seems to be used for avatars now. */
                         g_free( ct );
                 }