equal
deleted
inserted
replaced
388 Info.Log("TLS negotiation succeeded.") |
388 Info.Log("TLS negotiation succeeded.") |
389 cl.Features = nil |
389 cl.Features = nil |
390 |
390 |
391 // Now re-send the initial handshake message to start the new |
391 // Now re-send the initial handshake message to start the new |
392 // session. |
392 // session. |
393 hsOut := &stream{To: cl.Jid.Domain, Version: Version} |
393 hsOut := &stream{To: cl.Jid.Domain, Version: XMPPVersion} |
394 cl.xmlOut <- hsOut |
394 cl.xmlOut <- hsOut |
395 } |
395 } |
396 |
396 |
397 // Synchronize with handleTls(). Called from readTransport() when |
397 // Synchronize with handleTls(). Called from readTransport() when |
398 // cl.socket is nil. |
398 // cl.socket is nil. |
444 case "failure": |
444 case "failure": |
445 Info.Log("SASL authentication failed") |
445 Info.Log("SASL authentication failed") |
446 case "success": |
446 case "success": |
447 Info.Log("Sasl authentication succeeded") |
447 Info.Log("Sasl authentication succeeded") |
448 cl.Features = nil |
448 cl.Features = nil |
449 ss := &stream{To: cl.Jid.Domain, Version: Version} |
449 ss := &stream{To: cl.Jid.Domain, Version: XMPPVersion} |
450 cl.xmlOut <- ss |
450 cl.xmlOut <- ss |
451 } |
451 } |
452 } |
452 } |
453 |
453 |
454 func (cl *Client) saslDigest1(srvMap map[string]string) { |
454 func (cl *Client) saslDigest1(srvMap map[string]string) { |
590 res := cl.Jid.Resource |
590 res := cl.Jid.Resource |
591 bindReq := &bindIq{} |
591 bindReq := &bindIq{} |
592 if res != "" { |
592 if res != "" { |
593 bindReq.Resource = &res |
593 bindReq.Resource = &res |
594 } |
594 } |
595 msg := &Iq{Header: Header{Type: "set", Id: <-Id, |
595 msg := &Iq{Header: Header{Type: "set", Id: NextId(), |
596 Nested: []interface{}{bindReq}}} |
596 Nested: []interface{}{bindReq}}} |
597 f := func(st Stanza) bool { |
597 f := func(st Stanza) bool { |
598 iq, ok := st.(*Iq) |
598 iq, ok := st.(*Iq) |
599 if !ok { |
599 if !ok { |
600 Warn.Log("non-iq response") |
600 Warn.Log("non-iq response") |