fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-05-30 03:01:21 +00:00
Code Issues Projects Releases Wiki Activity

Add support for the unimplemented protocols in rust-multiaddr (#123)

Browse Source 
* Add support for the unimplemented protocols in rust-multiaddr

* Fix concern
This commit is contained in:
Pierre Krieger 2018-02-14 14:10:55 +01:00 committed by Marek Kotewicz
parent 6f450eeef3
commit 025bb04dea
3 changed files with 120 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rust-multiaddr/src/errors.rs
View File

@ -1,4 +1,4 @@
use std::{net, fmt, error, io, num}; use std::{net, fmt, error, io, num, string};
use cid; use cid;
use byteorder; use byteorder;
@ -69,3 +69,9 @@ impl From<num::ParseIntError> for Error {
Error::ParsingError(err.into()) Error::ParsingError(err.into())
} }
} }
impl From<string::FromUtf8Error> for Error {
fn from(err: string::FromUtf8Error) -> Error {
Error::ParsingError(err.into())
}
}

135
rust-multiaddr/src/protocol.rs
View File

@ -22,15 +22,21 @@ pub enum ProtocolId {
UDP = 17, UDP = 17,
DCCP = 33, DCCP = 33,
IP6 = 41, IP6 = 41,
DNS4 = 54,
DNS6 = 55,
SCTP = 132, SCTP = 132,
UDT = 301, UDT = 301,
UTP = 302, UTP = 302,
UNIX = 400,
P2P = 420,
IPFS = 421, IPFS = 421,
HTTP = 480, HTTP = 480,
HTTPS = 443, HTTPS = 443,
ONION = 444, ONION = 444,
QUIC = 460,
WS = 477, WS = 477,
WSS = 478, WSS = 478,
Libp2pWebsocketStar = 479,
Libp2pWebrtcStar = 275, Libp2pWebrtcStar = 275,
Libp2pWebrtcDirect = 276, Libp2pWebrtcDirect = 276,
P2pCircuit = 290, P2pCircuit = 290,
@ -51,24 +57,30 @@ impl From<ProtocolId> for u64 {
impl ToString for ProtocolId { impl ToString for ProtocolId {
fn to_string(&self) -> String { fn to_string(&self) -> String {
match *self { match *self {
ProtocolId::IP4 => "ip4".to_owned(), ProtocolId::IP4 => "ip4",
ProtocolId::TCP => "tcp".to_owned(), ProtocolId::TCP => "tcp",
ProtocolId::UDP => "udp".to_owned(), ProtocolId::UDP => "udp",
ProtocolId::DCCP => "dccp".to_owned(), ProtocolId::DCCP => "dccp",
ProtocolId::IP6 => "ip6".to_owned(), ProtocolId::IP6 => "ip6",
ProtocolId::SCTP => "sctp".to_owned(), ProtocolId::DNS4 => "dns4",
ProtocolId::UDT => "udt".to_owned(), ProtocolId::DNS6 => "dns6",
ProtocolId::UTP => "utp".to_owned(), ProtocolId::SCTP => "sctp",
ProtocolId::IPFS => "ipfs".to_owned(), ProtocolId::UDT => "udt",
ProtocolId::HTTP => "http".to_owned(), ProtocolId::UTP => "utp",
ProtocolId::HTTPS => "https".to_owned(), ProtocolId::UNIX => "unix",
ProtocolId::ONION => "onion".to_owned(), ProtocolId::P2P => "p2p",
ProtocolId::WS => "ws".to_owned(), ProtocolId::IPFS => "ipfs",
ProtocolId::WSS => "wss".to_owned(), ProtocolId::HTTP => "http",
ProtocolId::Libp2pWebrtcStar => "libp2p-webrtc-star".to_owned(), ProtocolId::HTTPS => "https",
ProtocolId::Libp2pWebrtcDirect => "libp2p-webrtc-direct".to_owned(), ProtocolId::ONION => "onion",
ProtocolId::P2pCircuit => "p2p-circuit".to_owned(), ProtocolId::QUIC => "quic",
} ProtocolId::WS => "ws",
ProtocolId::WSS => "wss",
ProtocolId::Libp2pWebsocketStar => "p2p-websocket-star",
ProtocolId::Libp2pWebrtcStar => "p2p-webrtc-star",
ProtocolId::Libp2pWebrtcDirect => "p2p-webrtc-direct",
ProtocolId::P2pCircuit => "p2p-circuit",
}.to_owned()
} }
} }
@ -82,17 +94,23 @@ impl FromStr for ProtocolId {
"udp" => Ok(ProtocolId::UDP), "udp" => Ok(ProtocolId::UDP),
"dccp" => Ok(ProtocolId::DCCP), "dccp" => Ok(ProtocolId::DCCP),
"ip6" => Ok(ProtocolId::IP6), "ip6" => Ok(ProtocolId::IP6),
"dns4" => Ok(ProtocolId::DNS4),
"dns6" => Ok(ProtocolId::DNS6),
"sctp" => Ok(ProtocolId::SCTP), "sctp" => Ok(ProtocolId::SCTP),
"udt" => Ok(ProtocolId::UDT), "udt" => Ok(ProtocolId::UDT),
"utp" => Ok(ProtocolId::UTP), "utp" => Ok(ProtocolId::UTP),
"unix" => Ok(ProtocolId::UNIX),
"p2p" => Ok(ProtocolId::P2P),
"ipfs" => Ok(ProtocolId::IPFS), "ipfs" => Ok(ProtocolId::IPFS),
"http" => Ok(ProtocolId::HTTP), "http" => Ok(ProtocolId::HTTP),
"https" => Ok(ProtocolId::HTTPS), "https" => Ok(ProtocolId::HTTPS),
"onion" => Ok(ProtocolId::ONION), "onion" => Ok(ProtocolId::ONION),
"quic" => Ok(ProtocolId::QUIC),
"ws" => Ok(ProtocolId::WS), "ws" => Ok(ProtocolId::WS),
"wss" => Ok(ProtocolId::WSS), "wss" => Ok(ProtocolId::WSS),
"libp2p-webrtc-star" => Ok(ProtocolId::Libp2pWebrtcStar), "p2p-websocket-star" => Ok(ProtocolId::Libp2pWebsocketStar),
"libp2p-webrtc-direct" => Ok(ProtocolId::Libp2pWebrtcDirect), "p2p-webrtc-star" => Ok(ProtocolId::Libp2pWebrtcStar),
"p2p-webrtc-direct" => Ok(ProtocolId::Libp2pWebrtcDirect),
"p2p-circuit" => Ok(ProtocolId::P2pCircuit), "p2p-circuit" => Ok(ProtocolId::P2pCircuit),
_ => Err(Error::UnknownProtocolString), _ => Err(Error::UnknownProtocolString),
} }
@ -118,15 +136,21 @@ impl ProtocolId {
17 => Ok(ProtocolId::UDP), 17 => Ok(ProtocolId::UDP),
33 => Ok(ProtocolId::DCCP), 33 => Ok(ProtocolId::DCCP),
41 => Ok(ProtocolId::IP6), 41 => Ok(ProtocolId::IP6),
54 => Ok(ProtocolId::DNS4),
55 => Ok(ProtocolId::DNS6),
132 => Ok(ProtocolId::SCTP), 132 => Ok(ProtocolId::SCTP),
301 => Ok(ProtocolId::UDT), 301 => Ok(ProtocolId::UDT),
302 => Ok(ProtocolId::UTP), 302 => Ok(ProtocolId::UTP),
400 => Ok(ProtocolId::UNIX),
420 => Ok(ProtocolId::P2P),
421 => Ok(ProtocolId::IPFS), 421 => Ok(ProtocolId::IPFS),
480 => Ok(ProtocolId::HTTP), 480 => Ok(ProtocolId::HTTP),
443 => Ok(ProtocolId::HTTPS), 443 => Ok(ProtocolId::HTTPS),
444 => Ok(ProtocolId::ONION), 444 => Ok(ProtocolId::ONION),
460 => Ok(ProtocolId::QUIC),
477 => Ok(ProtocolId::WS), 477 => Ok(ProtocolId::WS),
478 => Ok(ProtocolId::WSS), 478 => Ok(ProtocolId::WSS),
479 => Ok(ProtocolId::Libp2pWebsocketStar),
275 => Ok(ProtocolId::Libp2pWebrtcStar), 275 => Ok(ProtocolId::Libp2pWebrtcStar),
276 => Ok(ProtocolId::Libp2pWebrtcDirect), 276 => Ok(ProtocolId::Libp2pWebrtcDirect),
290 => Ok(ProtocolId::P2pCircuit), 290 => Ok(ProtocolId::P2pCircuit),
@ -152,15 +176,21 @@ impl ProtocolId {
ProtocolId::UDP => ProtocolArgSize::Fixed { bytes: 2 }, ProtocolId::UDP => ProtocolArgSize::Fixed { bytes: 2 },
ProtocolId::DCCP => ProtocolArgSize::Fixed { bytes: 2 }, ProtocolId::DCCP => ProtocolArgSize::Fixed { bytes: 2 },
ProtocolId::IP6 => ProtocolArgSize::Fixed { bytes: 16 }, ProtocolId::IP6 => ProtocolArgSize::Fixed { bytes: 16 },
ProtocolId::DNS4 => ProtocolArgSize::Variable,
ProtocolId::DNS6 => ProtocolArgSize::Variable,
ProtocolId::SCTP => ProtocolArgSize::Fixed { bytes: 2 }, ProtocolId::SCTP => ProtocolArgSize::Fixed { bytes: 2 },
ProtocolId::UDT => ProtocolArgSize::Fixed { bytes: 0 }, ProtocolId::UDT => ProtocolArgSize::Fixed { bytes: 0 },
ProtocolId::UTP => ProtocolArgSize::Fixed { bytes: 0 }, ProtocolId::UTP => ProtocolArgSize::Fixed { bytes: 0 },
ProtocolId::UNIX => ProtocolArgSize::Variable,
ProtocolId::P2P => ProtocolArgSize::Variable,
ProtocolId::IPFS => ProtocolArgSize::Variable, ProtocolId::IPFS => ProtocolArgSize::Variable,
ProtocolId::HTTP => ProtocolArgSize::Fixed { bytes: 0 }, ProtocolId::HTTP => ProtocolArgSize::Fixed { bytes: 0 },
ProtocolId::HTTPS => ProtocolArgSize::Fixed { bytes: 0 }, ProtocolId::HTTPS => ProtocolArgSize::Fixed { bytes: 0 },
ProtocolId::ONION => ProtocolArgSize::Fixed { bytes: 10 }, ProtocolId::ONION => ProtocolArgSize::Fixed { bytes: 10 },
ProtocolId::QUIC => ProtocolArgSize::Fixed { bytes: 0 },
ProtocolId::WS => ProtocolArgSize::Fixed { bytes: 0 }, ProtocolId::WS => ProtocolArgSize::Fixed { bytes: 0 },
ProtocolId::WSS => ProtocolArgSize::Fixed { bytes: 0 }, ProtocolId::WSS => ProtocolArgSize::Fixed { bytes: 0 },
ProtocolId::Libp2pWebsocketStar => ProtocolArgSize::Fixed { bytes: 0 },
ProtocolId::Libp2pWebrtcStar => ProtocolArgSize::Fixed { bytes: 0 }, ProtocolId::Libp2pWebrtcStar => ProtocolArgSize::Fixed { bytes: 0 },
ProtocolId::Libp2pWebrtcDirect => ProtocolArgSize::Fixed { bytes: 0 }, ProtocolId::Libp2pWebrtcDirect => ProtocolArgSize::Fixed { bytes: 0 },
ProtocolId::P2pCircuit => ProtocolArgSize::Fixed { bytes: 0 }, ProtocolId::P2pCircuit => ProtocolArgSize::Fixed { bytes: 0 },
@ -202,6 +232,12 @@ impl ProtocolId {
let addr = Ipv6Addr::from_str(a)?; let addr = Ipv6Addr::from_str(a)?;
Ok(AddrComponent::IP6(addr)) Ok(AddrComponent::IP6(addr))
} }
ProtocolId::DNS4 => {
Ok(AddrComponent::DNS4(a.to_owned()))
}
ProtocolId::DNS6 => {
Ok(AddrComponent::DNS6(a.to_owned()))
}
ProtocolId::TCP => { ProtocolId::TCP => {
let parsed: u16 = a.parse()?; let parsed: u16 = a.parse()?;
Ok(AddrComponent::TCP(parsed)) Ok(AddrComponent::TCP(parsed))
@ -218,17 +254,26 @@ impl ProtocolId {
let parsed: u16 = a.parse()?; let parsed: u16 = a.parse()?;
Ok(AddrComponent::SCTP(parsed)) Ok(AddrComponent::SCTP(parsed))
} }
ProtocolId::P2P => {
let bytes = Cid::from(a)?.to_bytes();
Ok(AddrComponent::P2P(bytes))
}
ProtocolId::IPFS => { ProtocolId::IPFS => {
let bytes = Cid::from(a)?.to_bytes(); let bytes = Cid::from(a)?.to_bytes();
Ok(AddrComponent::IPFS(bytes)) Ok(AddrComponent::IPFS(bytes))
} }
ProtocolId::ONION => unimplemented!(), // TODO: ProtocolId::ONION => unimplemented!(), // TODO:
ProtocolId::QUIC => Ok(AddrComponent::QUIC),
ProtocolId::UTP => Ok(AddrComponent::UTP), ProtocolId::UTP => Ok(AddrComponent::UTP),
ProtocolId::UNIX => {
Ok(AddrComponent::UNIX(a.to_owned()))
}
ProtocolId::UDT => Ok(AddrComponent::UDT), ProtocolId::UDT => Ok(AddrComponent::UDT),
ProtocolId::HTTP => Ok(AddrComponent::HTTP), ProtocolId::HTTP => Ok(AddrComponent::HTTP),
ProtocolId::HTTPS => Ok(AddrComponent::HTTPS), ProtocolId::HTTPS => Ok(AddrComponent::HTTPS),
ProtocolId::WS => Ok(AddrComponent::WS), ProtocolId::WS => Ok(AddrComponent::WS),
ProtocolId::WSS => Ok(AddrComponent::WSS), ProtocolId::WSS => Ok(AddrComponent::WSS),
ProtocolId::Libp2pWebsocketStar => Ok(AddrComponent::Libp2pWebsocketStar),
ProtocolId::Libp2pWebrtcStar => Ok(AddrComponent::Libp2pWebrtcStar), ProtocolId::Libp2pWebrtcStar => Ok(AddrComponent::Libp2pWebrtcStar),
ProtocolId::Libp2pWebrtcDirect => Ok(AddrComponent::Libp2pWebrtcDirect), ProtocolId::Libp2pWebrtcDirect => Ok(AddrComponent::Libp2pWebrtcDirect),
ProtocolId::P2pCircuit => Ok(AddrComponent::P2pCircuit), ProtocolId::P2pCircuit => Ok(AddrComponent::P2pCircuit),
@ -243,15 +288,21 @@ pub enum AddrComponent {
UDP(u16), UDP(u16),
DCCP(u16), DCCP(u16),
IP6(Ipv6Addr), IP6(Ipv6Addr),
DNS4(String),
DNS6(String),
SCTP(u16), SCTP(u16),
UDT, UDT,
UTP, UTP,
UNIX(String),
P2P(Vec<u8>),
IPFS(Vec<u8>), IPFS(Vec<u8>),
HTTP, HTTP,
HTTPS, HTTPS,
ONION(Vec<u8>), ONION(Vec<u8>),
QUIC,
WS, WS,
WSS, WSS,
Libp2pWebsocketStar,
Libp2pWebrtcStar, Libp2pWebrtcStar,
Libp2pWebrtcDirect, Libp2pWebrtcDirect,
P2pCircuit, P2pCircuit,
@ -267,15 +318,21 @@ impl AddrComponent {
AddrComponent::UDP(_) => ProtocolId::UDP, AddrComponent::UDP(_) => ProtocolId::UDP,
AddrComponent::DCCP(_) => ProtocolId::DCCP, AddrComponent::DCCP(_) => ProtocolId::DCCP,
AddrComponent::IP6(_) => ProtocolId::IP6, AddrComponent::IP6(_) => ProtocolId::IP6,
AddrComponent::DNS4(_) => ProtocolId::DNS4,
AddrComponent::DNS6(_) => ProtocolId::DNS6,
AddrComponent::SCTP(_) => ProtocolId::SCTP, AddrComponent::SCTP(_) => ProtocolId::SCTP,
AddrComponent::UDT => ProtocolId::UDT, AddrComponent::UDT => ProtocolId::UDT,
AddrComponent::UTP => ProtocolId::UTP, AddrComponent::UTP => ProtocolId::UTP,
AddrComponent::UNIX(_) => ProtocolId::UNIX,
AddrComponent::P2P(_) => ProtocolId::P2P,
AddrComponent::IPFS(_) => ProtocolId::IPFS, AddrComponent::IPFS(_) => ProtocolId::IPFS,
AddrComponent::HTTP => ProtocolId::HTTP, AddrComponent::HTTP => ProtocolId::HTTP,
AddrComponent::HTTPS => ProtocolId::HTTPS, AddrComponent::HTTPS => ProtocolId::HTTPS,
AddrComponent::ONION(_) => ProtocolId::ONION, AddrComponent::ONION(_) => ProtocolId::ONION,
AddrComponent::QUIC => ProtocolId::QUIC,
AddrComponent::WS => ProtocolId::WS, AddrComponent::WS => ProtocolId::WS,
AddrComponent::WSS => ProtocolId::WSS, AddrComponent::WSS => ProtocolId::WSS,
AddrComponent::Libp2pWebsocketStar => ProtocolId::Libp2pWebsocketStar,
AddrComponent::Libp2pWebrtcStar => ProtocolId::Libp2pWebrtcStar, AddrComponent::Libp2pWebrtcStar => ProtocolId::Libp2pWebrtcStar,
AddrComponent::Libp2pWebrtcDirect => ProtocolId::Libp2pWebrtcDirect, AddrComponent::Libp2pWebrtcDirect => ProtocolId::Libp2pWebrtcDirect,
AddrComponent::P2pCircuit => ProtocolId::P2pCircuit, AddrComponent::P2pCircuit => ProtocolId::P2pCircuit,
@ -320,6 +377,12 @@ impl AddrComponent {
seg[7]); seg[7]);
AddrComponent::IP6(addr) AddrComponent::IP6(addr)
} }
ProtocolId::DNS4 => {
AddrComponent::DNS4(String::from_utf8(data.to_owned())?)
}
ProtocolId::DNS6 => {
AddrComponent::DNS6(String::from_utf8(data.to_owned())?)
}
ProtocolId::TCP => { ProtocolId::TCP => {
let mut rdr = Cursor::new(data); let mut rdr = Cursor::new(data);
let num = rdr.read_u16::<BigEndian>()?; let num = rdr.read_u16::<BigEndian>()?;
@ -340,17 +403,26 @@ impl AddrComponent {
let num = rdr.read_u16::<BigEndian>()?; let num = rdr.read_u16::<BigEndian>()?;
AddrComponent::SCTP(num) AddrComponent::SCTP(num)
} }
ProtocolId::UNIX => {
AddrComponent::UNIX(String::from_utf8(data.to_owned())?)
}
ProtocolId::P2P => {
let bytes = Cid::from(data)?.to_bytes();
AddrComponent::P2P(bytes)
}
ProtocolId::IPFS => { ProtocolId::IPFS => {
let bytes = Cid::from(data)?.to_bytes(); let bytes = Cid::from(data)?.to_bytes();
AddrComponent::IPFS(bytes) AddrComponent::IPFS(bytes)
} }
ProtocolId::ONION => unimplemented!(), // TODO: ProtocolId::ONION => unimplemented!(), // TODO:
ProtocolId::QUIC => AddrComponent::QUIC,
ProtocolId::UTP => AddrComponent::UTP, ProtocolId::UTP => AddrComponent::UTP,
ProtocolId::UDT => AddrComponent::UDT, ProtocolId::UDT => AddrComponent::UDT,
ProtocolId::HTTP => AddrComponent::HTTP, ProtocolId::HTTP => AddrComponent::HTTP,
ProtocolId::HTTPS => AddrComponent::HTTPS, ProtocolId::HTTPS => AddrComponent::HTTPS,
ProtocolId::WS => AddrComponent::WS, ProtocolId::WS => AddrComponent::WS,
ProtocolId::WSS => AddrComponent::WSS, ProtocolId::WSS => AddrComponent::WSS,
ProtocolId::Libp2pWebsocketStar => AddrComponent::Libp2pWebsocketStar,
ProtocolId::Libp2pWebrtcStar => AddrComponent::Libp2pWebrtcStar, ProtocolId::Libp2pWebrtcStar => AddrComponent::Libp2pWebrtcStar,
ProtocolId::Libp2pWebrtcDirect => AddrComponent::Libp2pWebrtcDirect, ProtocolId::Libp2pWebrtcDirect => AddrComponent::Libp2pWebrtcDirect,
ProtocolId::P2pCircuit => AddrComponent::P2pCircuit, ProtocolId::P2pCircuit => AddrComponent::P2pCircuit,
@ -376,19 +448,26 @@ impl AddrComponent {
AddrComponent::SCTP(port) => { AddrComponent::SCTP(port) => {
out.write_u16::<BigEndian>(port)?; out.write_u16::<BigEndian>(port)?;
} }
AddrComponent::IPFS(bytes) => { AddrComponent::DNS4(s) | AddrComponent::DNS6(s) | AddrComponent::UNIX(s) => {
let bytes = s.as_bytes();
out.write_varint(bytes.len())?;
out.write_all(&bytes)?;
}
AddrComponent::P2P(bytes) | AddrComponent::IPFS(bytes) => {
out.write_varint(bytes.len())?; out.write_varint(bytes.len())?;
out.write_all(&bytes)?; out.write_all(&bytes)?;
} }
AddrComponent::ONION(_) => { AddrComponent::ONION(_) => {
unimplemented!() // TODO: unimplemented!() // TODO:
}, },
AddrComponent::QUIC |
AddrComponent::UTP | AddrComponent::UTP |
AddrComponent::UDT | AddrComponent::UDT |
AddrComponent::HTTP | AddrComponent::HTTP |
AddrComponent::HTTPS | AddrComponent::HTTPS |
AddrComponent::WS | AddrComponent::WS |
AddrComponent::WSS | AddrComponent::WSS |
AddrComponent::Libp2pWebsocketStar |
AddrComponent::Libp2pWebrtcStar | AddrComponent::Libp2pWebrtcStar |
AddrComponent::Libp2pWebrtcDirect | AddrComponent::Libp2pWebrtcDirect |
AddrComponent::P2pCircuit => {} AddrComponent::P2pCircuit => {}
@ -406,9 +485,17 @@ impl ToString for AddrComponent {
AddrComponent::UDP(port) => format!("/udp/{}", port), AddrComponent::UDP(port) => format!("/udp/{}", port),
AddrComponent::DCCP(port) => format!("/dccp/{}", port), AddrComponent::DCCP(port) => format!("/dccp/{}", port),
AddrComponent::IP6(ref addr) => format!("/ip6/{}", addr), AddrComponent::IP6(ref addr) => format!("/ip6/{}", addr),
AddrComponent::DNS4(ref s) => format!("/dns4/{}", s.clone()),
AddrComponent::DNS6(ref s) => format!("/dns6/{}", s.clone()),
AddrComponent::SCTP(port) => format!("/sctp/{}", port), AddrComponent::SCTP(port) => format!("/sctp/{}", port),
AddrComponent::UDT => format!("/udt"), AddrComponent::UDT => format!("/udt"),
AddrComponent::UTP => format!("/utp"), AddrComponent::UTP => format!("/utp"),
AddrComponent::UNIX(ref s) => format!("/unix/{}", s.clone()),
AddrComponent::P2P(ref bytes) => {
// TODO: meh for cloning
let c = Cid::from(bytes.clone()).expect("cid is known to be valid");
format!("/p2p/{}", c)
},
AddrComponent::IPFS(ref bytes) => { AddrComponent::IPFS(ref bytes) => {
// TODO: meh for cloning // TODO: meh for cloning
let c = Cid::from(bytes.clone()).expect("cid is known to be valid"); let c = Cid::from(bytes.clone()).expect("cid is known to be valid");
@ -417,10 +504,12 @@ impl ToString for AddrComponent {
AddrComponent::HTTP => format!("/http"), AddrComponent::HTTP => format!("/http"),
AddrComponent::HTTPS => format!("/https"), AddrComponent::HTTPS => format!("/https"),
AddrComponent::ONION(_) => unimplemented!(),//format!("/onion"), // TODO: AddrComponent::ONION(_) => unimplemented!(),//format!("/onion"), // TODO:
AddrComponent::QUIC => format!("/quic"),
AddrComponent::WS => format!("/ws"), AddrComponent::WS => format!("/ws"),
AddrComponent::WSS => format!("/wss"), AddrComponent::WSS => format!("/wss"),
AddrComponent::Libp2pWebrtcStar => format!("/libp2p-webrtc-star"), AddrComponent::Libp2pWebsocketStar => format!("/p2p-websocket-star"),
AddrComponent::Libp2pWebrtcDirect => format!("/libp2p-webrtc-direct"), AddrComponent::Libp2pWebrtcStar => format!("/p2p-webrtc-star"),
AddrComponent::Libp2pWebrtcDirect => format!("/p2p-webrtc-direct"),
AddrComponent::P2pCircuit => format!("/p2p-circuit"), AddrComponent::P2pCircuit => format!("/p2p-circuit"),
} }
} }

2
rust-multiaddr/tests/lib.rs
View File

@ -90,7 +90,7 @@ fn construct_success() {
"29200108A07AC542013AC986FFFE317095061F40DD03A5\ "29200108A07AC542013AC986FFFE317095061F40DD03A5\
03221220D52EBB89D85B02A284948203A62FF28389C57C9F42BEEC4EC20DB76A68911C0B", 03221220D52EBB89D85B02A284948203A62FF28389C57C9F42BEEC4EC20DB76A68911C0B",
vec![IP6, TCP, WS, IPFS]); vec![IP6, TCP, WS, IPFS]);
ma_valid("/libp2p-webrtc-star/ip4/127.0.0.\ ma_valid("/p2p-webrtc-star/ip4/127.0.0.\
1/tcp/9090/ws/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC", 1/tcp/9090/ws/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC",
"9302047F000001062382DD03A503221220D52EBB89D85B\ "9302047F000001062382DD03A503221220D52EBB89D85B\
02A284948203A62FF28389C57C9F42BEEC4EC20DB76A68911C0B", 02A284948203A62FF28389C57C9F42BEEC4EC20DB76A68911C0B",