Changeset 080c43a for protocols/msn/sb.c

Timestamp:

2012-09-16T13:52:19Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

79bb7e4

Parents:

f9258ae

Message:

Some more tweaks: Should show up online now, and be able to send and receive
messages. Seeing online state is still a problem due to the protocol#: gunk.

File:

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

protocols/msn/sb.c

@@ -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 ) )
@@ -462 +464 @@
                         }
                         
-                        imcb_chat_add_buddy( sb->chat, cmd[4] );
+                        /* 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], ';' ) )
+                                imcb_chat_add_buddy( sb->chat, cmd[4] );
                         
                         if( num == tot )
@@ -506 +513 @@
                         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 +552 @@
                         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 )
                 {