Changeset 06aed9a for protocols/msn/sb.c

Timestamp:

2012-10-01T22:51:39Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4fdb102

Parents:

a992d7a (diff), 4c9d377 (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:

Merge msnp18 branch. It's stable enough and really not that intrusive.

File:

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

protocols/msn/sb.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2010 Wilmer van der Gaast and others                *
+  * Copyright 2002-2012 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -122 +122 @@
 }
 
-struct msn_switchboard *msn_sb_by_handle( struct im_connection *ic, char *handle )
+struct msn_switchboard *msn_sb_by_handle( struct im_connection *ic, const char *handle )
 {
         struct msn_data *md = ic->proto_data;
@@ -308 +308 @@
         struct msn_switchboard *sb = data;
         struct im_connection *ic;
+        struct msn_data *md;
         char buf[1024];
         
@@ -315 +316 @@
         
         ic = sb->ic;
+        md = ic->proto_data;
         
         if( source != sb->fd )
@@ -332 +334 @@
         
         if( sb->session == MSN_SB_NEW )
-                g_snprintf( buf, sizeof( buf ), "USR %d %s %s\r\n", ++sb->trId, ic->acc->user, sb->key );
+                g_snprintf( buf, sizeof( buf ), "USR %d %s;{%s} %s\r\n", ++sb->trId, ic->acc->user, md->uuid, sb->key );
         else
-                g_snprintf( buf, sizeof( buf ), "ANS %d %s %s %d\r\n", ++sb->trId, ic->acc->user, sb->key, sb->session );
+                g_snprintf( buf, sizeof( buf ), "ANS %d %s;{%s} %s %d\r\n", ++sb->trId, ic->acc->user, md->uuid, sb->key, sb->session );
         
         if( msn_sb_write( sb, "%s", buf ) )
@@ -453 +455 @@
                         char buf[1024];
                         
-                        if( num == 1 )
+                        /* For as much as I understand this MPOP stuff now, a
+                           switchboard has two (or more) roster entries per
+                           participant. One "bare JID" and one JID;UUID. Ignore
+                           the latter. */
+                        if( !strchr( cmd[4], ';' ) )
                         {
-                                g_snprintf( buf, sizeof( buf ), "MSN groupchat session %d", sb->session );
-                                sb->chat = imcb_chat_new( ic, buf );
+                                /* HACK: Since even 1:1 chats now have >2 participants
+                                   (ourselves included) it gets hard to tell them apart
+                                   from rooms. Let's hope this is enough: */
+                                if( sb->chat == NULL && num != tot )
+                                {
+                                        g_snprintf( buf, sizeof( buf ), "MSN groupchat session %d", sb->session );
+                                        sb->chat = imcb_chat_new( ic, buf );
+                                        
+                                        g_free( sb->who );
+                                        sb->who = NULL;
+                                }
                                 
-                                g_free( sb->who );
-                                sb->who = NULL;
-                        }
-                        
-                        imcb_chat_add_buddy( sb->chat, cmd[4] );
-                        
-                        if( num == tot )
+                                if( sb->chat )
+                                        imcb_chat_add_buddy( sb->chat, cmd[4] );
+                        }
+                        
+                        /* We have the full roster, start showing the channel to
+                           the user. */
+                        if( num == tot && sb->chat )
                         {
                                 imcb_chat_add_buddy( sb->chat, ic->acc->user );
@@ -506 +521 @@
                         return( 0 );
                 }
+                
+                /* See IRO above. Handle "bare JIDs" only. */
+                if( strchr( cmd[1], ';' ) )
+                        return 1;
                 
                 if( sb->who && g_strcasecmp( cmd[1], sb->who ) == 0 )
@@ -541 +560 @@
                         return( st );
                 }
+                else if( strcmp( cmd[1], ic->acc->user ) == 0 )
+                {
+                        /* Well, gee thanks. Thanks for letting me know I've arrived.. */
+                }
                 else if( sb->who )
                 {
@@ -613 +636 @@
                            The server will clean it up when it's idle for too long. */
                 }
-                else if( sb->chat )
+                else if( sb->chat && !strchr( cmd[1], ';' ) )
                 {
                         imcb_chat_remove_buddy( sb->chat, cmd[1], "" );
@@ -629 +652 @@
                 /* If the person is offline, send an offline message instead,
                    and don't report an error. */
-                /* TODO: Support for OIMs that works. (#874) */
-                /*
                 if( num == 217 )
-                        msn_soap_oim_send_queue( ic, &sb->msgq );
+                        msn_ns_oim_send_queue( ic, &sb->msgq );
                 else
-                */
                         imcb_error( ic, "Error reported by switchboard server: %s", err->text );