Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remove sockaddrs field from Target #1412

Merged
merged 1 commit into from
Jun 26, 2024
Merged

fix: remove sockaddrs field from Target #1412

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions client/transport/src/ws/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ impl WsTransportClientBuilder {
&self,
uri: Url,
) -> Result<(Sender<Compat<EitherStream>>, Receiver<Compat<EitherStream>>), WsHandshakeError> {
let mut target: Target = uri.try_into()?;
let mut target: Target = uri.clone().try_into()?;
let mut err = None;

// Only build TLS connector if `wss` in URL.
Expand All @@ -336,11 +336,14 @@ impl WsTransportClientBuilder {
Mode::Plain => None,
};

// The sockaddrs might get reused if the server replies with a relative URI.
let mut target_sockaddrs = uri.socket_addrs(|| None).map_err(WsHandshakeError::ResolutionFailed)?;

for _ in 0..self.max_redirections {
tracing::debug!(target: LOG_TARGET, "Connecting to target: {:?}", target);
niklasad1 marked this conversation as resolved.
Show resolved Hide resolved

// The sockaddrs might get reused if the server replies with a relative URI.
let sockaddrs = std::mem::take(&mut target.sockaddrs);
let sockaddrs = std::mem::take(&mut target_sockaddrs);

for sockaddr in &sockaddrs {
#[cfg(feature = "tls")]
let tcp_stream = match connect(*sockaddr, self.connection_timeout, &target.host, connector.as_ref(), self.tcp_no_delay)
Expand Down Expand Up @@ -373,6 +376,11 @@ impl WsTransportClientBuilder {
// redirection with absolute path => need to lookup.
Ok(uri) => {
// Absolute URI.
target_sockaddrs = uri.socket_addrs(|| None).map_err(|e| {
tracing::debug!(target: LOG_TARGET, "Redirection failed: {:?}", e);
e
})?;

target = uri.try_into().map_err(|e| {
tracing::debug!(target: LOG_TARGET, "Redirection failed: {:?}", e);
e
Expand Down Expand Up @@ -407,7 +415,7 @@ impl WsTransportClientBuilder {
}
};
}
target.sockaddrs = sockaddrs;
target_sockaddrs = sockaddrs;
break;
}

Expand Down Expand Up @@ -550,8 +558,6 @@ impl From<soketto::connection::Error> for WsError {
/// Represents a verified remote WebSocket address.
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) struct Target {
/// Socket addresses resolved the host name.
sockaddrs: Vec<SocketAddr>,
/// The host name (domain or IP address).
host: String,
/// The Host request header specifies the host and port number of the server to which the request is being sent.
Expand Down Expand Up @@ -600,8 +606,7 @@ impl TryFrom<url::Url> for Target {

let host_header = if let Some(port) = url.port() { format!("{host}:{port}") } else { host.to_string() };

let sockaddrs = url.socket_addrs(|| None).map_err(WsHandshakeError::ResolutionFailed)?;
Ok(Self { sockaddrs, host, host_header, _mode, path_and_query: path_and_query.to_string(), basic_auth })
Ok(Self { host, host_header, _mode, path_and_query: path_and_query.to_string(), basic_auth })
}
}

Expand Down
Loading