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

jingle_s5b: Obtain attributes using the get_attr! macro.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-21 21:00:34 +01:00
parent 8c53d6e415
commit ca9a250efd
1 changed files with 11 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/jingle_s5b.rs
View file

@ -134,15 +134,9 @@ impl<'a> TryFrom<&'a Element> for Transport {
fn try_from(elem: &'a Element) -> Result<Transport, Error> { fn try_from(elem: &'a Element) -> Result<Transport, Error> {
if elem.is("transport", ns::JINGLE_S5B) { if elem.is("transport", ns::JINGLE_S5B) {
let sid = elem.attr("sid") let sid = get_attr!(elem, "sid", required);
.ok_or(Error::ParseError("Required attribute 'sid' missing in JingleS5B transport element."))? let dstaddr = get_attr!(elem, "dstaddr", optional);
.parse()?; let mode = get_attr!(elem, "mode", default);
let dstaddr = elem.attr("dstaddr")
.and_then(|value| Some(value.to_owned()));
let mode = match elem.attr("mode") {
None => Default::default(),
Some(mode) => mode.parse()?,
};
let mut payload = None; let mut payload = None;
for child in elem.children() { for child in elem.children() {
@ -152,26 +146,12 @@ impl<'a> TryFrom<&'a Element> for Transport {
Some(_) => return Err(Error::ParseError("Non-activated child already present in JingleS5B transport element.")), Some(_) => return Err(Error::ParseError("Non-activated child already present in JingleS5B transport element.")),
None => vec!(), None => vec!(),
}; };
let cid = child.attr("cid") let cid = get_attr!(child, "cid", required);
.ok_or(Error::ParseError("Required attribute 'cid' missing in JingleS5B candidate element."))? let host = get_attr!(child, "host", required);
.parse()?; let jid = get_attr!(child, "jid", required);
let host = child.attr("host") let port = get_attr!(child, "port", optional);
.ok_or(Error::ParseError("Required attribute 'host' missing in JingleS5B candidate element."))? let priority = get_attr!(child, "priority", required);
.parse()?; let type_ = get_attr!(child, "type", default);
let jid = child.attr("jid")
.ok_or(Error::ParseError("Required attribute 'jid' missing in JingleS5B candidate element."))?
.parse()?;
let port = match child.attr("port") {
Some(s) => Some(s.parse()?),
None => None,
};
let priority = child.attr("priority")
.ok_or(Error::ParseError("Required attribute 'priority' missing in JingleS5B candidate element."))?
.parse()?;
let type_ = match child.attr("type") {
Some(s) => s.parse()?,
None => Default::default(),
};
candidates.push(Candidate { candidates.push(Candidate {
cid: cid, cid: cid,
host: host, host: host,
@ -185,9 +165,7 @@ impl<'a> TryFrom<&'a Element> for Transport {
if payload.is_some() { if payload.is_some() {
return Err(Error::ParseError("Non-activated child already present in JingleS5B transport element.")); return Err(Error::ParseError("Non-activated child already present in JingleS5B transport element."));
} }
let cid = child.attr("cid") let cid = get_attr!(child, "cid", required);
.ok_or(Error::ParseError("Required attribute 'cid' missing in JingleS5B activated element."))?
.parse()?;
TransportPayload::Activated(cid) TransportPayload::Activated(cid)
} else if child.is("candidate-error", ns::JINGLE_S5B) { } else if child.is("candidate-error", ns::JINGLE_S5B) {
if payload.is_some() { if payload.is_some() {
@ -198,9 +176,7 @@ impl<'a> TryFrom<&'a Element> for Transport {
if payload.is_some() { if payload.is_some() {
return Err(Error::ParseError("Non-candidate-used child already present in JingleS5B transport element.")); return Err(Error::ParseError("Non-candidate-used child already present in JingleS5B transport element."));
} }
let cid = child.attr("cid") let cid = get_attr!(child, "cid", required);
.ok_or(Error::ParseError("Required attribute 'cid' missing in JingleS5B candidate-used element."))?
.parse()?;
TransportPayload::CandidateUsed(cid) TransportPayload::CandidateUsed(cid)
} else if child.is("proxy-error", ns::JINGLE_S5B) { } else if child.is("proxy-error", ns::JINGLE_S5B) {
if payload.is_some() { if payload.is_some() {