Changeset 8fb1263 for protocols

Timestamp:

2010-03-14T17:45:33Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fb00989

Parents:

af7f046

Message:

Don't send bind and session requests at the same time when logging in
because some very picky jabberd's don't like it. (Fixes Bug #569)

Location:

protocols/jabber

Files:

• io.c (modified) (1 diff)
• iq.c (modified) (2 diffs)
• jabber.h (modified) (1 diff)

protocols/jabber/io.c

@@ -375 +375 @@
         
         if( ( c = xt_find_node( node->children, "bind" ) ) )
-        {
-                reply = xt_new_node( "bind", NULL, xt_new_node( "resource", set_getstr( &ic->acc->set, "resource" ), NULL ) );
-                xt_add_attr( reply, "xmlns", XMLNS_BIND );
-                reply = jabber_make_packet( "iq", "set", NULL, reply );
-                jabber_cache_add( ic, reply, jabber_pkt_bind_sess );
-                
-                if( !jabber_write_packet( ic, reply ) )
-                        return XT_ABORT;
-                
-                jd->flags |= JFLAG_WAIT_BIND;
-        }
+                jd->flags |= JFLAG_WANT_BIND;
         
         if( ( c = xt_find_node( node->children, "session" ) ) )
-        {
-                reply = xt_new_node( "session", NULL, NULL );
-                xt_add_attr( reply, "xmlns", XMLNS_SESSION );
-                reply = jabber_make_packet( "iq", "set", NULL, reply );
-                jabber_cache_add( ic, reply, jabber_pkt_bind_sess );
-                
-                if( !jabber_write_packet( ic, reply ) )
-                        return XT_ABORT;
-                
-                jd->flags |= JFLAG_WAIT_SESSION;
-        }
+                jd->flags |= JFLAG_WANT_SESSION;
         
         /* This flag is already set if we authenticated via SASL, so now
            we can resume the session in the new stream, if we don't have
            to bind/initialize the session. */
-        if( jd->flags & JFLAG_AUTHENTICATED && ( jd->flags & ( JFLAG_WAIT_BIND | JFLAG_WAIT_SESSION ) ) == 0 )
+        if( jd->flags & JFLAG_AUTHENTICATED && ( jd->flags & ( JFLAG_WANT_BIND | JFLAG_WANT_SESSION ) ) == 0 )
         {
                 if( !jabber_get_roster( ic ) )
                         return XT_ABORT;
+        }
+        else if( jd->flags & JFLAG_AUTHENTICATED )
+        {
+                return jabber_pkt_bind_sess( ic, NULL, NULL );
         }
         

protocols/jabber/iq.c

@@ -298 +298 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct xt_node *c;
+        struct xt_node *c, *reply = NULL;
         char *s;
         
-        if( ( c = xt_find_node( node->children, "bind" ) ) )
+        if( node && ( c = xt_find_node( node->children, "bind" ) ) )
         {
                 c = xt_find_node( c->children, "jid" );
@@ -308 +308 @@
                         imcb_log( ic, "Server changed session resource string to `%s'", s + 1 );
                 
-                jd->flags &= ~JFLAG_WAIT_BIND;
-        }
-        else
-        {
-                jd->flags &= ~JFLAG_WAIT_SESSION;
-        }
-        
-        if( ( jd->flags & ( JFLAG_WAIT_BIND | JFLAG_WAIT_SESSION ) ) == 0 )
+                jd->flags &= ~JFLAG_WANT_BIND;
+        }
+        else if( node && ( c = xt_find_node( node->children, "session" ) ) )
+        {
+                jd->flags &= ~JFLAG_WANT_SESSION;
+        }
+        
+        if( jd->flags & JFLAG_WANT_BIND )
+        {
+                reply = xt_new_node( "bind", NULL, xt_new_node( "resource", set_getstr( &ic->acc->set, "resource" ), NULL ) );
+                xt_add_attr( reply, "xmlns", XMLNS_BIND );
+        }
+        else if( jd->flags & JFLAG_WANT_SESSION )
+        {
+                reply = xt_new_node( "session", NULL, NULL );
+                xt_add_attr( reply, "xmlns", XMLNS_SESSION );
+        }
+        
+        if( reply != NULL )
+        {
+                reply = jabber_make_packet( "iq", "set", NULL, reply );
+                jabber_cache_add( ic, reply, jabber_pkt_bind_sess );
+                
+                if( !jabber_write_packet( ic, reply ) )
+                        return XT_ABORT;
+        }
+        else if( ( jd->flags & ( JFLAG_WANT_BIND | JFLAG_WANT_SESSION ) ) == 0 )
         {
                 if( !jabber_get_roster( ic ) )

protocols/jabber/jabber.h

@@ -40 +40 @@
         JFLAG_STREAM_RESTART = 4,       /* Set when we want to restart the stream (after
                                            SASL or TLS). */
-        JFLAG_WAIT_SESSION = 8,         /* Set if we sent a <session> tag and need a reply
+        JFLAG_WANT_SESSION = 8,         /* Set if the server wants a <session/> tag
                                            before we continue. */
-        JFLAG_WAIT_BIND = 16,           /* ... for <bind> tag. */
+        JFLAG_WANT_BIND = 16,           /* ... for <bind> tag. */
         JFLAG_WANT_TYPING = 32,         /* Set if we ever sent a typing notification, this
                                            activates all XEP-85 related code. */