|
|
@ -103,7 +103,7 @@ pub fn connect_with_config<Req: IntoClientRequest>( |
|
|
|
) -> Result<(WebSocket<AutoStream>, Response)> { |
|
|
|
) -> Result<(WebSocket<AutoStream>, Response)> { |
|
|
|
let uri = request.uri(); |
|
|
|
let uri = request.uri(); |
|
|
|
let mode = uri_mode(uri)?; |
|
|
|
let mode = uri_mode(uri)?; |
|
|
|
let host = request.uri().host().ok_or_else(|| Error::Url(UrlErrorType::NoHostName))?; |
|
|
|
let host = request.uri().host().ok_or(Error::Url(UrlErrorType::NoHostName))?; |
|
|
|
let port = uri.port_u16().unwrap_or(match mode { |
|
|
|
let port = uri.port_u16().unwrap_or(match mode { |
|
|
|
Mode::Plain => 80, |
|
|
|
Mode::Plain => 80, |
|
|
|
Mode::Tls => 443, |
|
|
|
Mode::Tls => 443, |
|
|
@ -165,7 +165,7 @@ pub fn connect<Req: IntoClientRequest>(request: Req) -> Result<(WebSocket<AutoSt |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
fn connect_to_some(addrs: &[SocketAddr], uri: &Uri, mode: Mode) -> Result<AutoStream> { |
|
|
|
fn connect_to_some(addrs: &[SocketAddr], uri: &Uri, mode: Mode) -> Result<AutoStream> { |
|
|
|
let domain = uri.host().ok_or_else(|| Error::Url(UrlErrorType::NoHostName))?; |
|
|
|
let domain = uri.host().ok_or(Error::Url(UrlErrorType::NoHostName))?; |
|
|
|
for addr in addrs { |
|
|
|
for addr in addrs { |
|
|
|
debug!("Trying to contact {} at {}...", uri, addr); |
|
|
|
debug!("Trying to contact {} at {}...", uri, addr); |
|
|
|
if let Ok(raw_stream) = TcpStream::connect(addr) { |
|
|
|
if let Ok(raw_stream) = TcpStream::connect(addr) { |
|
|
|