Changeset 64768d4 for protocols/msn/sb.c

Timestamp:

2010-09-02T09:15:44Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

bae0617

Parents:

02bb9db

Message:

Replace msn*write functions with saner versions that accept format strings.
Also preparing for additional temporary NS connections (auth token renewal).

File:

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

protocols/msn/sb.c

@@ -35 +35 @@
 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 msn_sb_write( struct msn_switchboard *sb, const char *fmt, ... )
+{
+        va_list params;
+        char *out;
+        size_t len;
         int st;
         
+        va_start( params, fmt );
+        out = g_strdup_vprintf( fmt, params );
+        va_end( params );
+        
         if( getenv( "BITLBEE_DEBUG" ) )
-        {
-                write( 2, "->SB:", 5 );
-                write( 2, s, len );
-        }
-        
-        st = write( sb->fd, s, len );
+                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;
 }
 
@@ -59 +65 @@
         struct msn_data *md = ic->proto_data;
         struct msn_switchboard *sb;
-        char buf[1024];
 
         /* FIXME: *CHECK* the reliability of using spare sb's! */
@@ -67 +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. */
@@ -79 +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 );
@@ -171 +174 @@
         if( sb->ready )
         {
-                char *packet, *buf;
+                char *buf;
                 int i, j;
                 
@@ -207 +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;
                 }
         }
@@ -332 +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
@@ -352 +353 @@
         {
                 time_t now = time( NULL );
-                char buf[1024];
                 
                 if( now - md->first_sb_failure > 600 )
@@ -384 +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;
         }
@@ -397 +396 @@
         struct msn_switchboard *sb = data;
         struct im_connection *ic = sb->ic;
-        char buf[1024];
         
         if( !num_parts )
@@ -426 +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 )