Changeset 8e6c732

Timestamp:

2006-09-26T13:12:11Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

022df46

Parents:

281859e

Message:

Proper detection of resource changed strings from the server.

File:

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

protocols/jabber/iq.c

@@ -111 +111 @@
         else if( strcmp( type, "result" ) == 0 && orig )
         {
-                struct xt_node *node;
+                struct xt_node *c;
                 
                 if( !( jd->flags & JFLAG_AUTHENTICATED ) &&
-                    ( node = xt_find_node( orig->children, "query" ) ) &&
-                    ( node = xt_find_node( node->children, "username" ) ) &&
-                    node->text_len )
+                    ( c = xt_find_node( orig->children, "query" ) ) &&
+                    ( c = xt_find_node( c->children, "username" ) ) &&
+                    c->text_len )
                 {
                         /* This happens when we just successfully authenticated
@@ -124 +124 @@
                                 return XT_ABORT;
                 }
-                else if( ( node = xt_find_node( orig->children, "bind" ) ) ||
-                         ( node = xt_find_node( orig->children, "session" ) ) )
-                {
-                        if( strcmp( node->name, "bind" ) == 0 )
+                /* Tricky: Look for <bind> in the reply, because the server
+                   should confirm the chosen resource string there. For
+                   <session>, however, look in the cache, because the server
+                   will probably not include it in its reply. */
+                else if( ( c = xt_find_node( node->children, "bind" ) ) ||
+                         ( c = xt_find_node( orig->children, "session" ) ) )
+                {
+                        if( strcmp( c->name, "bind" ) == 0 )
+                        {
+                                c = xt_find_node( c->children, "jid" );
+                                if( c && c->text_len && ( s = strchr( c->text, '/' ) ) &&
+                                    strcmp( s + 1, set_getstr( &gc->acc->set, "resource" ) ) != 0 )
+                                        serv_got_crap( gc, "Server changed session resource string to `%s'", s + 1 );
+                                
                                 jd->flags &= ~JFLAG_WAIT_BIND;
-                        else if( strcmp( node->name, "session" ) == 0 )
+                        }
+                        else if( strcmp( c->name, "session" ) == 0 )
                                 jd->flags &= ~JFLAG_WAIT_SESSION;