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

add some stream:features handling

Browse source
This commit is contained in:
lumi 2017-02-24 17:44:11 +01:00
parent 79434f2681
commit 61e8124c75
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/client.rs
View file

@ -15,6 +15,11 @@ use xml::reader::XmlEvent as ReaderEvent;
use std::sync::mpsc::{Receiver, channel}; use std::sync::mpsc::{Receiver, channel};
/// Struct that should be moved somewhere else and cleaned up.
pub struct StreamFeatures {
pub sasl_mechanisms: Option<Vec<String>>,
}
/// A builder for `Client`s. /// A builder for `Client`s.
pub struct ClientBuilder { pub struct ClientBuilder {
jid: Jid, jid: Jid,
@ -166,7 +171,7 @@ impl Client {
} }
fn bind(&mut self) -> Result<(), Error> { fn bind(&mut self) -> Result<(), Error> {
self.wait_for_features(); self.wait_for_features()?;
let mut elem = Element::builder("iq") let mut elem = Element::builder("iq")
.attr("id", "bind") .attr("id", "bind")
.attr("type", "set") .attr("type", "set")
@ -184,7 +189,7 @@ impl Client {
} }
} }
fn wait_for_features(&mut self) -> Result<Element, 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.transport.read_event()?; let e = self.transport.read_event()?;
@ -198,7 +203,17 @@ impl Client {
loop { loop {
let n = self.transport.read_element()?; let n = self.transport.read_element()?;
if n.is("features", ns::STREAM) { if n.is("features", ns::STREAM) {
return Ok(n); let mut features = StreamFeatures {
sasl_mechanisms: None,
};
if let Some(ms) = n.get_child("mechanisms", ns::SASL) {
let mut res = Vec::new();
for cld in ms.children() {
res.push(cld.text());
}
features.sasl_mechanisms = Some(res);
}
return Ok(features);
} }
} }
} }