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

jingle: Carry the minidom Element for description, transport and security.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-04-22 19:30:17 +01:00
parent ff5be32a0e
commit 24d563ff18
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/jingle.rs
View file

@ -121,9 +121,9 @@ pub struct Content {
pub disposition: String, pub disposition: String,
pub name: String, pub name: String,
pub senders: Senders, pub senders: Senders,
pub description: String, pub description: (String, Element),
pub transport: String, pub transport: (String, Element),
pub security: Option<String>, pub security: Option<(String, Element)>,
} }
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -246,17 +246,38 @@ pub fn parse_jingle(root: &Element) -> Result<Jingle, Error> {
if description.is_some() { if description.is_some() {
return Err(Error::ParseError("Content must not have more than one description.")); return Err(Error::ParseError("Content must not have more than one description."));
} }
description = Some(stuff.ns().ok_or(Error::ParseError("Description without a namespace."))?); let namespace = stuff.ns()
.and_then(|ns| ns.parse().ok())
// TODO: is this even reachable?
.ok_or(Error::ParseError("Invalid namespace on description element."))?;
description = Some((
namespace,
stuff.clone(),
));
} else if stuff.name() == "transport" { } else if stuff.name() == "transport" {
if transport.is_some() { if transport.is_some() {
return Err(Error::ParseError("Content must not have more than one transport.")); return Err(Error::ParseError("Content must not have more than one transport."));
} }
transport = Some(stuff.ns().ok_or(Error::ParseError("Transport without a namespace."))?); let namespace = stuff.ns()
.and_then(|ns| ns.parse().ok())
// TODO: is this even reachable?
.ok_or(Error::ParseError("Invalid namespace on transport element."))?;
transport = Some((
namespace,
stuff.clone(),
));
} else if stuff.name() == "security" { } else if stuff.name() == "security" {
if security.is_some() { if security.is_some() {
return Err(Error::ParseError("Content must not have more than one security.")); return Err(Error::ParseError("Content must not have more than one security."));
} }
security = stuff.ns().and_then(|ns| ns.parse().ok()); let namespace = stuff.ns()
.and_then(|ns| ns.parse().ok())
// TODO: is this even reachable?
.ok_or(Error::ParseError("Invalid namespace on security element."))?;
security = Some((
namespace,
stuff.clone(),
));
} }
} }
if description.is_none() { if description.is_none() {
@ -274,7 +295,7 @@ pub fn parse_jingle(root: &Element) -> Result<Jingle, Error> {
senders: senders, senders: senders,
description: description, description: description,
transport: transport, transport: transport,
security: security.to_owned(), security: security,
}); });
} else if child.is("reason", ns::JINGLE) { } else if child.is("reason", ns::JINGLE) {
if reason_element.is_some() { if reason_element.is_some() {