Changeset f924563 for protocols/msn

Timestamp:

2010-05-03T00:52:08Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1a3ba05

Parents:

6a9d068 (diff), 6824fb3 (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:

Mainline merge.

Location:

protocols/msn

Files:

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

protocols/msn/msn.c

@@ -38 +38 @@
         set_add( &acc->set, "local_display_name", "false", set_eval_bool, acc );
         set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
+        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/"
@@ -84 +89 @@
         gint inp;
         struct msn_handler_data *handler;
+        gint keepalive;
         
         int trId;
@@ -181 +187 @@
 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 );
+void msn_sb_start_keepalives( struct msn_switchboard *sb, gboolean initial );
+void msn_sb_stop_keepalives( struct msn_switchboard *sb );
 
 /* invitation.c */

protocols/msn/ns.c

@@ -422 +422 @@
         else if( strcmp( cmd[0], "FLN" ) == 0 )
         {
-                if( cmd[1] )
-                        imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
+                if( cmd[1] == NULL )
+                        return 1;
+                
+                imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
+                
+                msn_sb_start_keepalives( msn_sb_by_handle( ic, cmd[1] ), TRUE );
         }
         else if( strcmp( cmd[0], "NLN" ) == 0 )
@@ -449 +453 @@
                                    ( st != msn_away_state_list ? OPT_AWAY : 0 ),
                                    st->name, NULL );
+                
+                msn_sb_stop_keepalives( msn_sb_by_handle( ic, cmd[2] ) );
         }
         else if( strcmp( cmd[0], "RNG" ) == 0 )

protocols/msn/sb.c

@@ -175 +175 @@
                         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 if( strncmp( text, MSN_INVITE_HEADERS, sizeof( MSN_INVITE_HEADERS ) - 1 ) == 0 ) 
                 {
@@ -256 +261 @@
         
         msn_msgq_purge( ic, &sb->msgq );
+        msn_sb_stop_keepalives( sb );
         
         if( sb->key ) g_free( sb->key );
@@ -477 +483 @@
                 
                 sb->ready = 1;
+                
+                msn_sb_start_keepalives( sb, FALSE );
         }
         else if( strcmp( cmd[0], "CAL" ) == 0 )
@@ -526 +534 @@
                         }
                         
+                        msn_sb_start_keepalives( sb, FALSE );
+                        
                         return( st );
                 }
@@ -587 +597 @@
                 if( sb->who )
                 {
+                        msn_sb_stop_keepalives( sb );
+                        
                         /* This is a single-person chat, and the other person is leaving. */
                         g_free( sb->who );
@@ -752 +764 @@
         return( 1 );
 }
+
+static 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 );
+}
+
+void msn_sb_start_keepalives( struct msn_switchboard *sb, gboolean initial )
+{
+        bee_user_t *bu;
+        
+        if( sb && sb->who && sb->keepalive == 0 &&
+            ( bu = bee_user_by_handle( sb->ic->bee, sb->ic, sb->who ) ) &&
+            !( bu->flags & BEE_USER_ONLINE ) &&
+            set_getbool( &sb->ic->acc->set, "switchboard_keepalives" ) )
+        {
+                if( initial )
+                        msn_sb_keepalive( sb, 0, 0 );
+                
+                sb->keepalive = b_timeout_add( 20000, msn_sb_keepalive, sb );
+        }
+}
+
+void msn_sb_stop_keepalives( struct msn_switchboard *sb )
+{
+        if( sb && sb->keepalive > 0 )
+        {
+                b_event_remove( sb->keepalive );
+                sb->keepalive = 0;
+        }
+}