Changeset 315dd4c

Timestamp:

2010-03-15T01:25:47Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9fca0657

Parents:

7e2b593

Message:

Oops.. Today's Jabber fix could get stuck in a somewhat infinite loop if a
Jabber server returns an empty <iq type="result"/> response to the session
establishment request (which is valid and actually done by the example, but
my test Jabberd shows different behaviour). Fixed.

Location:

protocols/jabber

Files:

• io.c (modified) (1 diff)
• iq.c (modified) (3 diffs)

protocols/jabber/io.c

@@ -380 +380 @@
                 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_WANT_BIND | JFLAG_WANT_SESSION ) ) == 0 )
-        {
-                if( !jabber_get_roster( ic ) )
-                        return XT_ABORT;
-        }
-        else if( jd->flags & JFLAG_AUTHENTICATED )
-        {
+        if( jd->flags & JFLAG_AUTHENTICATED )
                 return jabber_pkt_bind_sess( ic, NULL, NULL );
-        }
         
         return XT_HANDLED;

protocols/jabber/iq.c

@@ -307 +307 @@
                     strcmp( s + 1, set_getstr( &ic->acc->set, "resource" ) ) != 0 )
                         imcb_log( ic, "Server changed session resource string to `%s'", s + 1 );
-                
-                jd->flags &= ~JFLAG_WANT_BIND;
-        }
-        else if( node && ( c = xt_find_node( node->children, "session" ) ) )
-        {
-                jd->flags &= ~JFLAG_WANT_SESSION;
         }
         
@@ -319 +313 @@
                 reply = xt_new_node( "bind", NULL, xt_new_node( "resource", set_getstr( &ic->acc->set, "resource" ), NULL ) );
                 xt_add_attr( reply, "xmlns", XMLNS_BIND );
+                jd->flags &= ~JFLAG_WANT_BIND;
         }
         else if( jd->flags & JFLAG_WANT_SESSION )
@@ -324 +319 @@
                 reply = xt_new_node( "session", NULL, NULL );
                 xt_add_attr( reply, "xmlns", XMLNS_SESSION );
+                jd->flags &= ~JFLAG_WANT_SESSION;
         }