Changeset 9bf2481

Timestamp:

2010-04-09T23:16:38Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

bb839e8

Parents:

c4bc92a

Message:

First stab at MSN keepalives.

Only kicks in if the user goes offline during a conversation.

Location:

protocols/msn

Files:

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

protocols/msn/msn.c

@@ -41 +41 @@
 
         s = set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
+        
+        s = set_add( &acc->set, "switchboard_keepalives", "false", set_eval_bool, acc );
 }
 

protocols/msn/msn.h

@@ -31 +31 @@
 #define TYPING_NOTIFICATION_MESSAGE "\r\r\rBEWARE, ME R TYPINK MESSAGE!!!!\r\r\r"
 #define GROUPCHAT_SWITCHBOARD_MESSAGE "\r\r\rME WANT TALK TO MANY PEOPLE\r\r\r"
+#define SB_KEEPALIVE_MESSAGE "\r\r\rDONT HANG UP ON ME!\r\r\r"
 
 #ifdef DEBUG_MSN
@@ -53 +54 @@
                            "TypingUser: %s\r\n" \
                            "\r\n\r\n"
+
+#define SB_KEEPALIVE_HEADERS "MIME-Version: 1.0\r\n" \
+                             "Content-Type: text/x-ping\r\n" \
+                             "\r\n\r\n"
 
 #define PROFILE_URL "http://members.msn.com/"
@@ -83 +88 @@
         gint inp;
         struct msn_handler_data *handler;
+        gint keepalive;
         
         int trId;
@@ -179 +185 @@
 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 );
+gboolean msn_sb_keepalive( gpointer data, gint source, b_input_condition cond );
 
 #endif //_MSN_H

protocols/msn/ns.c

@@ -436 +436 @@
         else if( strcmp( cmd[0], "FLN" ) == 0 )
         {
-                if( cmd[1] )
-                        imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
+                struct msn_switchboard *sb;
+                
+                if( cmd[1] == NULL )
+                        return 1;
+                
+                imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
+                
+                if( ( sb = msn_sb_by_handle( ic, cmd[1] ) ) &&
+                    set_getbool( &ic->acc->set, "switchboard_keepalives" ) &&
+                    sb->keepalive == 0 )
+                {
+                        msn_sb_keepalive( sb, 0, 0 );
+                        sb->keepalive = b_timeout_add( 20000, msn_sb_keepalive, sb );
+                }
         }
         else if( strcmp( cmd[0], "NLN" ) == 0 )
         {
                 const struct msn_away_state *st;
+                struct msn_switchboard *sb;
                 
                 if( num_parts != 5 )
@@ -463 +476 @@
                                    ( st != msn_away_state_list ? OPT_AWAY : 0 ),
                                    st->name, NULL );
+                
+                if( ( sb = msn_sb_by_handle( ic, cmd[1] ) ) && sb->keepalive > 0 )
+                {
+                        b_event_remove( sb->keepalive );
+                        sb->keepalive = 0;
+                }
         }
         else if( strcmp( cmd[0], "RNG" ) == 0 )

protocols/msn/sb.c

@@ -168 +168 @@
                 
                 /* Build the message. Convert LF to CR-LF for normal messages. */
-                if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) != 0 )
-                {
-                        buf = g_new0( char, sizeof( MSN_MESSAGE_HEADERS ) + strlen( text ) * 2 + 1 );
-                        i = strlen( MSN_MESSAGE_HEADERS );
-                        
-                        strcpy( buf, MSN_MESSAGE_HEADERS );
-                        for( j = 0; text[j]; j ++ )
-                        {
-                                if( text[j] == '\n' )
-                                        buf[i++] = '\r';
-                                
-                                buf[i++] = text[j];
-                        }
-                }
-                else
+                if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) == 0 )
                 {
                         i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->ic->acc->user );
                         buf = g_new0( char, i );
                         i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->ic->acc->user );
+                }
+                else if( strcmp( text, SB_KEEPALIVE_MESSAGE ) == 0 )
+                {
+                        buf = g_strdup( SB_KEEPALIVE_HEADERS );
+                        i = strlen( buf );
+                }
+                else
+                {
+                        buf = g_new0( char, sizeof( MSN_MESSAGE_HEADERS ) + strlen( text ) * 2 + 1 );
+                        i = strlen( MSN_MESSAGE_HEADERS );
+                        
+                        strcpy( buf, MSN_MESSAGE_HEADERS );
+                        for( j = 0; text[j]; j ++ )
+                        {
+                                if( text[j] == '\n' )
+                                        buf[i++] = '\r';
+                                
+                                buf[i++] = text[j];
+                        }
                 }
                 
@@ -764 +769 @@
         return( 1 );
 }
+
+gboolean msn_sb_keepalive( gpointer data, gint source, b_input_condition cond )
+{
+        struct msn_switchboard *sb = data;
+        return sb->ready && msn_sb_sendmessage( sb, SB_KEEPALIVE_MESSAGE );
+}