jingle: Accept any unknown child, as per the specification.
This commit is contained in:
parent
c20d37a842
commit
10a336f874
1 changed files with 4 additions and 10 deletions
|
|
@ -239,7 +239,7 @@ pub struct Jingle {
|
||||||
pub sid: String,
|
pub sid: String,
|
||||||
pub contents: Vec<Content>,
|
pub contents: Vec<Content>,
|
||||||
pub reason: Option<ReasonElement>,
|
pub reason: Option<ReasonElement>,
|
||||||
//pub other: Vec<Element>,
|
pub other: Vec<Element>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn parse_jingle(root: &Element) -> Result<Jingle, Error> {
|
pub fn parse_jingle(root: &Element) -> Result<Jingle, Error> {
|
||||||
|
|
@ -259,6 +259,7 @@ pub fn parse_jingle(root: &Element) -> Result<Jingle, Error> {
|
||||||
let sid = root.attr("sid")
|
let sid = root.attr("sid")
|
||||||
.ok_or(Error::ParseError("Jingle must have a 'sid' attribute."))?;
|
.ok_or(Error::ParseError("Jingle must have a 'sid' attribute."))?;
|
||||||
let mut reason_element = None;
|
let mut reason_element = None;
|
||||||
|
let mut other = vec!();
|
||||||
|
|
||||||
for child in root.children() {
|
for child in root.children() {
|
||||||
if child.is("content", ns::JINGLE) {
|
if child.is("content", ns::JINGLE) {
|
||||||
|
|
@ -359,7 +360,7 @@ pub fn parse_jingle(root: &Element) -> Result<Jingle, Error> {
|
||||||
text: text,
|
text: text,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
return Err(Error::ParseError("Unknown element in jingle."));
|
other.push(child.clone());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -370,6 +371,7 @@ pub fn parse_jingle(root: &Element) -> Result<Jingle, Error> {
|
||||||
sid: sid.to_owned(),
|
sid: sid.to_owned(),
|
||||||
contents: contents,
|
contents: contents,
|
||||||
reason: reason_element,
|
reason: reason_element,
|
||||||
|
other: other,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -451,14 +453,6 @@ mod tests {
|
||||||
_ => panic!(),
|
_ => panic!(),
|
||||||
};
|
};
|
||||||
assert_eq!(message, "Unknown action.");
|
assert_eq!(message, "Unknown action.");
|
||||||
|
|
||||||
let elem: Element = "<jingle xmlns='urn:xmpp:jingle:1' action='session-accept' sid='coucou'><coucou/></jingle>".parse().unwrap();
|
|
||||||
let error = jingle::parse_jingle(&elem).unwrap_err();
|
|
||||||
let message = match error {
|
|
||||||
Error::ParseError(string) => string,
|
|
||||||
_ => panic!(),
|
|
||||||
};
|
|
||||||
assert_eq!(message, "Unknown element in jingle.");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue