xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jingle_s5b: Make Candidate.host an IpAddr instead of a String.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-05-04 21:19:40 +02:00
commit 53e23cbf65
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/jingle_s5b.rs
View file

@ -6,6 +6,7 @@
use try_from::TryFrom;
use std::str::FromStr;
use std::net::IpAddr;
use minidom::{Element, IntoAttributeValue};
use jid::Jid;
@ -32,7 +33,7 @@ generate_id!(StreamId);
generate_element_with_only_attributes!(Candidate, "candidate", ns::JINGLE_S5B, [
cid: CandidateId = "cid" => required,
host: String = "host" => required,
host: IpAddr = "host" => required,
jid: Jid = "jid" => required,
port: Option<u16> = "port" => optional,
priority: u32 = "priority" => required,
@ -40,7 +41,7 @@ generate_element_with_only_attributes!(Candidate, "candidate", ns::JINGLE_S5B, [
]);
impl Candidate {
pub fn new(cid: CandidateId, host: String, jid: Jid, priority: u32) -> Candidate {
pub fn new(cid: CandidateId, host: IpAddr, jid: Jid, priority: u32) -> Candidate {
Candidate {
cid,
host,
@ -238,14 +239,14 @@ mod tests {
#[test]
fn test_serialise_candidate() {
let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:s5b:1' sid='coucou'><candidate cid='coucou' host='coucou' jid='coucou@coucou' priority='0'/></transport>".parse().unwrap();
let elem: Element = "<transport xmlns='urn:xmpp:jingle:transports:s5b:1' sid='coucou'><candidate cid='coucou' host='127.0.0.1' jid='coucou@coucou' priority='0'/></transport>".parse().unwrap();
let transport = Transport {
sid: StreamId(String::from("coucou")),
dstaddr: None,
mode: Mode::Tcp,
payload: TransportPayload::Candidates(vec!(Candidate {
cid: CandidateId(String::from("coucou")),
host: String::from("coucou"),
host: IpAddr::from_str("127.0.0.1").unwrap(),
jid: Jid::from_str("coucou@coucou").unwrap(),
port: None,
priority: 0u32,