Changeset 3330468 for protocols/jabber/iq.c

Timestamp:

2010-03-14T23:15:05Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

81ee561

Parents:

7c5affca (diff), 7e2b593 (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 in head.

File:

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

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 ) )