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

jingle_s5b: Make jid a Jid and not a String.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-06-25 22:20:24 +01:00
parent f6b222f49a
commit 4338d9d638
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/jingle_s5b.rs
View file

@ -8,6 +8,7 @@ use std::convert::TryFrom;
use std::str::FromStr; use std::str::FromStr;
use minidom::{Element, IntoAttributeValue}; use minidom::{Element, IntoAttributeValue};
use jid::Jid;
use error::Error; use error::Error;
@ -33,7 +34,7 @@ generate_id!(StreamId);
pub struct Candidate { pub struct Candidate {
pub cid: CandidateId, pub cid: CandidateId,
pub host: String, pub host: String,
pub jid: String, pub jid: Jid,
pub port: Option<u16>, pub port: Option<u16>,
pub priority: u32, pub priority: u32,
pub type_: Type, pub type_: Type,
@ -45,7 +46,7 @@ impl Into<Element> for Candidate {
.ns(ns::JINGLE_S5B) .ns(ns::JINGLE_S5B)
.attr("cid", self.cid) .attr("cid", self.cid)
.attr("host", self.host) .attr("host", self.host)
.attr("jid", self.jid) .attr("jid", String::from(self.jid))
.attr("port", self.port) .attr("port", self.port)
.attr("priority", self.priority) .attr("priority", self.priority)
.attr("type", self.type_) .attr("type", self.type_)
@ -217,7 +218,7 @@ mod tests {
payload: TransportPayload::Candidates(vec!(Candidate { payload: TransportPayload::Candidates(vec!(Candidate {
cid: CandidateId(String::from("coucou")), cid: CandidateId(String::from("coucou")),
host: String::from("coucou"), host: String::from("coucou"),
jid: String::from("coucou@coucou"), jid: Jid::from_str("coucou@coucou").unwrap(),
port: None, port: None,
priority: 0u32, priority: 0u32,
type_: Type::Direct, type_: Type::Direct,