Changeset a830512

Timestamp:

2008-08-10T09:15:26Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3b32017, 87f525e

Parents:

4230221

Message:

Added msn_sb_write_msg() (patch from ulim).

Location:

protocols/msn

Files:

• msn.c (modified) (6 diffs)
• msn.h (modified) (2 diffs)
• sb.c (modified) (1 diff)

protocols/msn/msn.c

@@ -113 +113 @@
 {
         struct msn_switchboard *sb;
-        struct msn_data *md = ic->proto_data;
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -122 +121 @@
         {
                 struct msn_message *m;
-                char buf[1024];
                 
                 /* Create a message. We have to arrange a usable switchboard, and send the message later. */
@@ -129 +127 @@
                 m->text = g_strdup( message );
                 
-                /* FIXME: *CHECK* the reliability of using spare sb's! */
-                if( ( sb = msn_sb_spare( ic ) ) )
-                {
-                        debug( "Trying to use a spare switchboard to message %s", who );
-                        
-                        sb->who = g_strdup( who );
-                        g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, who );
-                        if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                        {
-                                /* He/She should join the switchboard soon, let's queue the message. */
-                                sb->msgq = g_slist_append( sb->msgq, m );
-                                return( 1 );
-                        }
-                }
-                
-                debug( "Creating a new switchboard to message %s", who );
-                
-                /* 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 ) ) )
-                {
-                        g_free( m->who );
-                        g_free( m->text );
-                        g_free( m );
-                        
-                        return( 0 );
-                }
-                
-                /* And queue the message to md. We'll pick it up when the switchboard comes up. */
-                md->msgq = g_slist_append( md->msgq, m );
-                
-                /* FIXME: If the switchboard creation fails, the message will not be sent. */
-                
-                return( 1 );
+                return msn_sb_write_msg( ic, m );
         }
         
@@ -252 +217 @@
 {
         struct msn_switchboard *sb;
-        struct msn_data *md = ic->proto_data;
-        char buf[1024];
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -263 +226 @@
         {
                 struct msn_message *m;
-                
-                if( ( sb = msn_sb_spare( ic ) ) )
-                {
-                        debug( "Trying to reuse an existing switchboard as a groupchat with %s", who );
-                        g_snprintf( buf, sizeof( buf ), "CAL %d %s\r\n", ++sb->trId, who );
-                        if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                                return msn_sb_to_chat( sb );
-                }
-                
-                /* If the stuff above failed for some reason: */
-                debug( "Creating a new switchboard to groupchat with %s", who );
-                
-                /* Request a new switchboard. */
-                g_snprintf( buf, sizeof( buf ), "XFR %d SB\r\n", ++md->trId );
-                if( !msn_write( ic, buf, strlen( buf ) ) )
-                        return( 0 );
                 
                 /* Create a magic message. This is quite hackish, but who cares? :-P */
@@ -285 +232 @@
                 m->text = g_strdup( GROUPCHAT_SWITCHBOARD_MESSAGE );
                 
-                /* Queue the magic message and cross your fingers. */
-                md->msgq = g_slist_append( md->msgq, m );
-                
-                /* FIXME: Can I try to return something here already? */
+                msn_sb_write_msg( ic, m );
+
                 return NULL;
         }

protocols/msn/msn.h

@@ -23 +23 @@
   Suite 330, Boston, MA  02111-1307  USA
 */
+
+#ifndef _MSN_H
+#define _MSN_H
 
 /* Some hackish magicstrings to make special-purpose messages/switchboards.
@@ -176 +179 @@
 void msn_sb_destroy( struct msn_switchboard *sb );
 gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond );
+int msn_sb_write_msg( struct im_connection *ic, struct msn_message *m );
+
+#endif //_MSN_H

protocols/msn/sb.c

@@ -44 +44 @@
                 return( 0 );
         }
+        
+        return( 1 );
+}
+
+int msn_sb_write_msg( struct im_connection *ic, struct msn_message *m )
+{
+        struct msn_data *md = ic->proto_data;
+        struct msn_switchboard *sb;
+        char buf[1024];
+
+        /* FIXME: *CHECK* the reliability of using spare sb's! */
+        if( ( sb = msn_sb_spare( ic ) ) )
+        {
+                debug( "Trying to use a spare switchboard to message %s", m->who );
+                
+                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 ) ) )
+                {
+                        /* He/She should join the switchboard soon, let's queue the message. */
+                        sb->msgq = g_slist_append( sb->msgq, m );
+                        return( 1 );
+                }
+        }
+        
+        debug( "Creating a new switchboard to message %s", m->who );
+        
+        /* 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 ) ) )
+        {
+                g_free( m->who );
+                g_free( m->text );
+                g_free( m );
+                
+                return( 0 );
+        }
+        
+        /* And queue the message to md. We'll pick it up when the switchboard comes up. */
+        md->msgq = g_slist_append( md->msgq, m );
+        
+        /* FIXME: If the switchboard creation fails, the message will not be sent. */
         
         return( 1 );