Changeset 1ba7e8f for protocols/msn/sb.c

Timestamp:

2008-02-15T17:38:57Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

506e61b

Parents:

0fbd3a6d (diff), eeb85a8 (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:

Merged with upstream r328

Wilmer van der Gaast 2008-02-11 Got rid of some noise at startup: complaining when the default configuration

Wilmer van der Gaast 2008-02-10 Added support for password-protected Jabber chatrooms.
Wilmer van der Gaast 2008-02-10 Making AI_ADDRCONFIG optional, it doesn't exist on at least NetBSD and
Wilmer van der Gaast 2008-02-09 Restored "add -tmp". A bit hackish, but it will do for now.
Wilmer van der Gaast 2008-02-07 Fixed getnameinfo() calls, this fixes Solaris stability issues. Thanks to
Wilmer van der Gaast 2008-02-04 Added bogus G_GNUC_MALLOC to restore GLib 2.4 compatibility (hopefully).
Wilmer van der Gaast 2008-02-03 Messages from the user are also included in backlogs when joining a Jabber
Wilmer van der Gaast 2008-02-03 Disabling "Unknown command" warnings since they're very noisy and pretty
Wilmer van der Gaast 2008-02-03 Implemented XEP-0115. This adds some info to the <presence/> tags so
Wilmer van der Gaast 2008-02-03 Saner garbage collection of cached packets in the Jabber module. Now
Wilmer van der Gaast 2008-02-02 Added help_free() and cleaned up some very stale help-related stuff I
Wilmer van der Gaast 2008-01-30 Fixed handling of OSCAR multi-part messages... They're not arrays, they're
Wilmer van der Gaast 2008-01-24 Keeping track of valid Jabber connections so _connected() events will be
Wilmer van der Gaast 2008-01-24 Fixed two valgrind warnings (partially uninitialized "struct tm" vars.)
Wilmer van der Gaast 2008-01-20 The Jabber module now uses imcb_chat_log() instead of imcb_log() where
Wilmer van der Gaast 2008-01-20 Added imcb_chat_log() for chatroom system messages, so they can be
Wilmer van der Gaast 2008-01-20 GET_BUDDY_FIRST wasn't actually implemented, even though it was in use
Wilmer van der Gaast 2008-01-19 Using test -f instead of test -e. This breaks if the include files are
Wilmer van der Gaast 2008-01-19 Added byte swapping code to the new MD5 checksumming code to make it work
Wilmer van der Gaast 2008-01-18 Moving imcb_chat_new() to a saner location (no code changes) and fixing
Wilmer van der Gaast 2008-01-17 Apparently ext_yahoo_got_im can be called with msg=NULL, so it should be
Wilmer van der Gaast 2008-01-17 Fixing some Solaris compiler warnings (u_int->uint, adding some typecasts
Wilmer van der Gaast 2008-01-13 Fixed handing of failed groupchat joins.
Wilmer van der Gaast 2008-01-13 Fixed "Conditional jump or move depends on uninitialised value(s)" at
Wilmer van der Gaast 2008-01-13 Fixed quickstart2. (Bug #349.)
Wilmer van der Gaast 2008-01-13 Different handling of charset mismatches before login time. Ignoring a
Wilmer van der Gaast 2008-01-12 When a switchboard connection dies (at the TCP level) and there are still
Wilmer van der Gaast 2008-01-12 Killed info_string_append() and now showing the IP address of ICQ users
Wilmer van der Gaast 2008-01-11 Fixing bug #344, now away states should always be correct, even when people
Wilmer van der Gaast 2008-01-11 Adding own handle to protocol name in blist output for people with multiple
Wilmer van der Gaast 2008-01-10 Now setting odata->icq properly again, this got lost some time ago, which
Wilmer van der Gaast 2008-01-06 More consistency in error/warning errors. Until now "WARNING:" was usually
Wilmer van der Gaast 2008-01-06 Changed warning message about unsent MSN messages. It should show the actual
Wilmer van der Gaast 2008-01-05 Added "mail_notifications" setting. Who needs those notifications anyway?
Wilmer van der Gaast 2008-01-05 Build fix from vmiklos.
Wilmer van der Gaast 2008-01-05 Added handling of MSN switchboard NAK messages. Untested, but hey, it
Wilmer van der Gaast 2008-01-05 Removed closure->result. I was planning to add some more stuff, but will
Miklos Vajna 2007-12-31 encode: md5.c is no longer in protocols/, it's in lib/
Wilmer van der Gaast 2007-12-28 Fixed return value check in proxy_connect(), since on some systems
Wilmer van der Gaast 2007-12-28 Added missing return in jabber_login().
Wilmer van der Gaast 2007-12-16 Implemented XEP-0199 (patch from misc@…).
Wilmer van der Gaast 2007-12-12 Checking conn->xcred before trying to clean it up since GnuTLS doesn't
Wilmer van der Gaast 2007-12-12 Killed the <server> parameter to "account add" and changed the default
Wilmer van der Gaast 2007-12-12 Fixed sockerr_again() usage in Jabber module to (hopefully) fix a 100% CPU
Wilmer van der Gaast 2007-12-10 Don't allow nicks that start with a number.
Wilmer van der Gaast 2007-12-10 Fixed "set xxx" syntax (it showed all settings instead of just xxx).
Wilmer van der Gaast 2007-12-09 If I keep forgetting to credit people in commit msgs I should probably add
Wilmer van der Gaast 2007-12-09 Added /invite support for Jabber chatrooms (and fixed the argument order

File:

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

protocols/msn/sb.c

@@ -128 +128 @@
                 if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) != 0 )
                 {
-                        buf = g_new0( char, sizeof( MSN_MESSAGE_HEADERS ) + strlen( text ) * 2 );
+                        buf = g_new0( char, sizeof( MSN_MESSAGE_HEADERS ) + strlen( text ) * 2 + 1 );
                         i = strlen( MSN_MESSAGE_HEADERS );
                         
@@ -207 +207 @@
         debug( "Destroying switchboard: %s", sb->who ? sb->who : sb->key ? sb->key : "" );
         
-        if( sb->msgq )
-        {
-                struct msn_message *m;
-                GSList *l;
-                
-                for( l = sb->msgq; l; l = l->next )
-                {
-                        m = l->data;
-
-                        g_free( m->who );
-                        g_free( m->text );
-                        g_free( m );
-                }
-                g_slist_free( sb->msgq );
-                
-                imcb_log( ic, "Warning: Closing down MSN switchboard connection with "
-                                   "unsent message to %s, you'll have to resend it.",
-                                   sb->who ? sb->who : "(unknown)" );
-        }
+        msn_msgq_purge( ic, &sb->msgq );
         
         if( sb->key ) g_free( sb->key );
@@ -266 +248 @@
         if( source != sb->fd )
         {
-                debug( "ERROR %d while connecting to switchboard server", 1 );
+                debug( "Error %d while connecting to switchboard server", 1 );
                 msn_sb_destroy( sb );
                 return FALSE;
@@ -287 +269 @@
                 sb->inp = b_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
         else
-                debug( "ERROR %d while connecting to switchboard server", 2 );
+                debug( "Error %d while connecting to switchboard server", 2 );
         
         return FALSE;
@@ -295 +277 @@
 {
         struct msn_switchboard *sb = data;
+        struct im_connection *ic = sb->ic;
+        struct msn_data *md = ic->proto_data;
         
         if( msn_handler( sb->handler ) == -1 )
         {
-                debug( "ERROR: Switchboard died" );
+                time_t now = time( NULL );
+                
+                if( now - md->first_sb_failure > 600 )
+                {
+                        /* It's not really the first one, but the start of this "series".
+                           With this, the warning below will be shown only if this happens
+                           at least three times in ten minutes. This algorithm isn't
+                           perfect, but for this purpose it will do. */
+                        md->first_sb_failure = now;
+                        md->sb_failures = 0;
+                }
+                
+                debug( "Error: Switchboard died" );
+                if( ++ md->sb_failures >= 3 )
+                        imcb_log( ic, "Warning: Many switchboard failures on MSN connection. "
+                                      "There might be problems delivering your messages." );
+                
+                if( sb->msgq != NULL )
+                {
+                        char buf[1024];
+                        
+                        if( md->msgq == NULL )
+                        {
+                                md->msgq = sb->msgq;
+                        }
+                        else
+                        {
+                                GSList *l;
+                                
+                                for( l = md->msgq; l->next; l = l->next );
+                                l->next = sb->msgq;
+                        }
+                        sb->msgq = NULL;
+                        
+                        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 ) ) )
+                                return FALSE;
+                }
+                
                 msn_sb_destroy( sb );
                 
@@ -304 +327 @@
         }
         else
+        {
                 return TRUE;
+        }
 }
 
@@ -491 +516 @@
                 }
         }
+        else if( strcmp( cmd[0], "NAK" ) == 0 )
+        {
+                if( sb->who )
+                {
+                        imcb_log( ic, "The MSN servers could not deliver one of your messages to %s.", sb->who );
+                }
+                else
+                {
+                        imcb_log( ic, "The MSN servers could not deliver one of your groupchat messages to all participants." );
+                }
+        }
         else if( strcmp( cmd[0], "BYE" ) == 0 )
         {
@@ -544 +580 @@
                         if( sb->who )
                         {
-                                struct msn_message *m;
-                                GSList *l;
-                                
                                 /* Apparently some invitation failed. We might want to use this
                                    board later, so keep it as a spare. */
@@ -553 +586 @@
                                 
                                 /* Also clear the msgq, otherwise someone else might get them. */
-                                for( l = sb->msgq; l; l = l->next )
-                                {
-                                        m = l->data;
-                                        g_free( m->who );
-                                        g_free( m->text );
-                                        g_free( m );
-                                }
-                                g_slist_free( sb->msgq );
-                                sb->msgq = NULL;
+                                msn_msgq_purge( ic, &sb->msgq );
                         }
                         
@@ -569 +594 @@
         else
         {
-                debug( "Received unknown command from switchboard server: %s", cmd[0] );
+                /* debug( "Received unknown command from switchboard server: %s", cmd[0] ); */
         }