pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client: Adapt to quickxml

Browse source
This commit is contained in:
Maxime “pep” Buquet 2017-12-28 06:05:13 +01:00
parent 44a03c37d5
commit 06fd0a354a
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/client.rs
View file

@ -1,4 +1,3 @@
use xml;
use jid::Jid; use jid::Jid;
use transport::{Transport, SslTransport}; use transport::{Transport, SslTransport};
use error::Error; use error::Error;
@ -17,7 +16,7 @@ use base64;
use minidom::Element; use minidom::Element;
use xml::reader::XmlEvent as ReaderEvent; use quick_xml::events::Event as XmlEvent;
use std::sync::{Mutex, Arc}; use std::sync::{Mutex, Arc};
@ -156,10 +155,6 @@ impl Client {
self.transport.lock().unwrap().write_element(elem) self.transport.lock().unwrap().write_element(elem)
} }
fn read_event(&self) -> Result<xml::reader::XmlEvent, Error> {
self.transport.lock().unwrap().read_event()
}
fn connect(&mut self, mut credentials: SaslCredentials) -> Result<(), Error> { fn connect(&mut self, mut credentials: SaslCredentials) -> Result<(), Error> {
let features = self.wait_for_features()?; let features = self.wait_for_features()?;
let ms = &features.sasl_mechanisms.ok_or(Error::SaslError(Some("no SASL mechanisms".to_owned())))?; let ms = &features.sasl_mechanisms.ok_or(Error::SaslError(Some("no SASL mechanisms".to_owned())))?;
@ -269,9 +264,10 @@ impl Client {
fn wait_for_features(&mut self) -> Result<StreamFeatures, Error> { fn wait_for_features(&mut self) -> Result<StreamFeatures, Error> {
// TODO: this is very ugly // TODO: this is very ugly
loop { loop {
let e = self.read_event()?; let mut transport = self.transport.lock().unwrap();
let e = transport.read_event();
match e { match e {
ReaderEvent::StartElement { .. } => { Ok(XmlEvent::Start { .. }) => {
break; break;
}, },
_ => (), _ => (),