- Timestamp:
- 2010-03-15T01:25:47Z (15 years ago)
- Branches:
- master
- Children:
- 9fca0657
- Parents:
- 7e2b593
- Location:
- protocols/jabber
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/io.c
r7e2b593 r315dd4c 380 380 jd->flags |= JFLAG_WANT_SESSION; 381 381 382 /* This flag is already set if we authenticated via SASL, so now 383 we can resume the session in the new stream, if we don't have 384 to bind/initialize the session. */ 385 if( jd->flags & JFLAG_AUTHENTICATED && ( jd->flags & ( JFLAG_WANT_BIND | JFLAG_WANT_SESSION ) ) == 0 ) 386 { 387 if( !jabber_get_roster( ic ) ) 388 return XT_ABORT; 389 } 390 else if( jd->flags & JFLAG_AUTHENTICATED ) 391 { 382 if( jd->flags & JFLAG_AUTHENTICATED ) 392 383 return jabber_pkt_bind_sess( ic, NULL, NULL ); 393 }394 384 395 385 return XT_HANDLED; -
protocols/jabber/iq.c
r7e2b593 r315dd4c 307 307 strcmp( s + 1, set_getstr( &ic->acc->set, "resource" ) ) != 0 ) 308 308 imcb_log( ic, "Server changed session resource string to `%s'", s + 1 ); 309 310 jd->flags &= ~JFLAG_WANT_BIND;311 }312 else if( node && ( c = xt_find_node( node->children, "session" ) ) )313 {314 jd->flags &= ~JFLAG_WANT_SESSION;315 309 } 316 310 … … 319 313 reply = xt_new_node( "bind", NULL, xt_new_node( "resource", set_getstr( &ic->acc->set, "resource" ), NULL ) ); 320 314 xt_add_attr( reply, "xmlns", XMLNS_BIND ); 315 jd->flags &= ~JFLAG_WANT_BIND; 321 316 } 322 317 else if( jd->flags & JFLAG_WANT_SESSION ) … … 324 319 reply = xt_new_node( "session", NULL, NULL ); 325 320 xt_add_attr( reply, "xmlns", XMLNS_SESSION ); 321 jd->flags &= ~JFLAG_WANT_SESSION; 326 322 } 327 323
Note: See TracChangeset
for help on using the changeset viewer.