Changeset 5f40da7 for protocols/jabber/iq.c

Timestamp:

2011-12-26T10:51:19Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

199fea6

Parents:

96f954d (diff), 644b808 (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:

Merging oauth-xmpp branch, which adds support for OAuth2 authentication
against some XMPP services (Google Talk, Facebook and Microsoft's MSN-XMPP
gateway).

File:

• protocols/jabber/iq.c (modified) (3 diffs)

protocols/jabber/iq.c

@@ -31 +31 @@
 {
         struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
         struct xt_node *c, *reply = NULL;
         char *type, *s;
@@ -170 +171 @@
                    was added to (or removed from) the buddy list. AFAIK they're
                    sent even if we added this buddy in our own session. */
-                        int bare_len = strlen( ic->acc->user );
+                        int bare_len = strlen( jd->me );
                         
                         if( ( s = xt_find_attr( node, "from" ) ) == NULL ||
-                            ( strncmp( s, ic->acc->user, bare_len ) == 0 &&
+                            ( strncmp( s, jd->me, bare_len ) == 0 &&
                               ( s[bare_len] == 0 || s[bare_len] == '/' ) ) )
                         {
@@ -343 +344 @@
         {
                 c = xt_find_node( c->children, "jid" );
-                if( c && c->text_len && ( s = strchr( c->text, '/' ) ) &&
-                    strcmp( s + 1, set_getstr( &ic->acc->set, "resource" ) ) != 0 )
+                if( !c || !c->text )
+                {
+                        /* Server is crap, but this is no disaster. */
+                }
+                else if( strncmp( jd->me, c->text, strlen( jd->me ) ) != 0 )
+                {
+                        s = strchr( c->text, '/' );
+                        if( s )
+                                *s = '\0';
+                        jabber_set_me( ic, c->text );
+                        imcb_log( ic, "Server claims your JID is `%s' instead of `%s'. "
+                                  "This mismatch may cause problems with groupchats "
+                                  "and possibly other things.",
+                                  c->text, ic->acc->user );
+                        if( s )
+                                *s = '/';
+                }
+                else if( c && c->text_len && ( s = strchr( c->text, '/' ) ) &&
+                         strcmp( s + 1, set_getstr( &ic->acc->set, "resource" ) ) != 0 )
                         imcb_log( ic, "Server changed session resource string to `%s'", s + 1 );
         }