From 1c50fadfde1acd1172e7228ec5dd2f5b5a8d2490 Mon Sep 17 00:00:00 2001 From: yggverse Date: Thu, 28 Nov 2024 02:31:50 +0200 Subject: [PATCH] get connection ownership on wrap --- src/client.rs | 6 +++--- src/client/connection.rs | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/client.rs b/src/client.rs index 78ac177..4b09094 100644 --- a/src/client.rs +++ b/src/client.rs @@ -82,9 +82,9 @@ impl Client { move |result| match result { Ok(connection) => { match Connection::new_wrap( - &connection, - certificate.as_ref(), - Some(&network_address), + connection, + certificate, + Some(network_address), ) { Ok(result) => request_async( result, diff --git a/src/client/connection.rs b/src/client/connection.rs index 7e9cb5f..137a247 100644 --- a/src/client/connection.rs +++ b/src/client/connection.rs @@ -17,9 +17,9 @@ impl Connection { /// Create new `Self` pub fn new_wrap( - socket_connection: &SocketConnection, - certificate: Option<&TlsCertificate>, - server_identity: Option<&NetworkAddress>, + socket_connection: SocketConnection, + certificate: Option, + server_identity: Option, ) -> Result { if socket_connection.is_closed() { return Err(Error::SocketConnectionClosed); @@ -29,8 +29,11 @@ impl Connection { socket_connection: socket_connection.clone(), tls_client_connection: match certificate { Some(certificate) => { - match new_tls_client_connection(socket_connection, certificate, server_identity) - { + match new_tls_client_connection( + &socket_connection, + &certificate, + server_identity.as_ref(), + ) { Ok(tls_client_connection) => Some(tls_client_connection), Err(reason) => return Err(reason), }