Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

[client/network] Add support for /wss addresses #13152

Merged
merged 6 commits into from
Jan 17, 2023
Merged

[client/network] Add support for /wss addresses #13152

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae133bb
join dns with another instance of WS transport
melekes Jan 13, 2023
8c59929
WSS transport itself need to wrap DNS transport
melekes Jan 16, 2023
2347cf6
reverse order
melekes Jan 16, 2023
756ef86
simplify code: remove WS from WSS inner DNS transport
melekes Jan 17, 2023
e3cac22
remove the 2nd instance of WS transport
melekes Jan 17, 2023
668ff8c
Merge branch 'master' into anton/12024-wss-support-2
melekes Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions client/network/src/transport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,25 @@ pub fn build_transport(
// Build the base layer of the transport.
let transport = if !memory_only {
let tcp_config = tcp::Config::new().nodelay(true);
let desktop_trans = tcp::tokio::Transport::new(tcp_config.clone());
let desktop_trans = websocket::WsConfig::new(desktop_trans)
let tcp_trans = tcp::tokio::Transport::new(tcp_config.clone());
let desktop_trans = websocket::WsConfig::new(tcp_trans)
.or_transport(tcp::tokio::Transport::new(tcp_config.clone()));
let dns_init = dns::TokioDnsConfig::system(desktop_trans);
EitherTransport::Left(if let Ok(dns) = dns_init {
EitherTransport::Left(dns)
let tcp_trans = tcp::tokio::Transport::new(tcp_config.clone());
let desktop_trans = websocket::WsConfig::new(tcp_trans)
.or_transport(tcp::tokio::Transport::new(tcp_config.clone()));
let dns_init = dns::TokioDnsConfig::system(desktop_trans);
// Secure Websocket transport needs unresolved addresses, so we join DNS transport with
// yet another instance of Websocket transport.
EitherTransport::Left(
websocket::WsConfig::new(dns).or_transport(dns_init.expect("same config to work")),
melekes marked this conversation as resolved.
Show resolved Hide resolved
)
} else {
let desktop_trans = tcp::tokio::Transport::new(tcp_config.clone());
let desktop_trans = websocket::WsConfig::new(desktop_trans)
let tcp_trans = tcp::tokio::Transport::new(tcp_config.clone());
let desktop_trans = websocket::WsConfig::new(tcp_trans)
.or_transport(tcp::tokio::Transport::new(tcp_config));
EitherTransport::Right(desktop_trans.map_err(dns::DnsErr::Transport))
EitherTransport::Right(desktop_trans)
})
} else {
EitherTransport::Right(OptionalTransport::some(
Expand Down