diff options
| -rw-r--r-- | Cargo.lock | 11 | ||||
| -rw-r--r-- | hbak_common/Cargo.toml | 1 | ||||
| -rw-r--r-- | hbak_common/src/conn.rs | 35 | ||||
| -rw-r--r-- | hbakd/src/main.rs | 2 |
4 files changed, 9 insertions, 40 deletions
@@ -352,7 +352,6 @@ dependencies = [ "rand", "serde", "sha2", - "socket2", "subtle", "sys-mount", "thiserror", @@ -634,16 +633,6 @@ dependencies = [ ] [[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/hbak_common/Cargo.toml b/hbak_common/Cargo.toml index d97856d..0006605 100644 --- a/hbak_common/Cargo.toml +++ b/hbak_common/Cargo.toml @@ -15,7 +15,6 @@ hmac = "0.12.1" rand = "0.8.5" serde = { version = "1.0", features = ["derive"] } sha2 = { version = "0.10.8", default-features = false } -socket2 = "0.5.5" subtle = "2.5.0" sys-mount = { version = "2.1.0", default-features = false } thiserror = "1.0" diff --git a/hbak_common/src/conn.rs b/hbak_common/src/conn.rs index 208fe1b..3b9c5a4 100644 --- a/hbak_common/src/conn.rs +++ b/hbak_common/src/conn.rs @@ -5,7 +5,7 @@ use crate::stream::CHUNKSIZE; use crate::system; use crate::{NetworkError, RemoteError}; -use std::io::{self, Read, Write}; +use std::io::{Read, Write}; use std::marker::PhantomData; use std::net::{SocketAddr, TcpStream}; use std::sync::{Mutex, RwLock}; @@ -15,7 +15,6 @@ use std::time::Duration; use chacha20poly1305::aead::generic_array::GenericArray; use chacha20poly1305::aead::stream::{DecryptorBE32, EncryptorBE32}; use chacha20poly1305::{Key, XChaCha20Poly1305}; -use socket2::Socket; use subtle::ConstantTimeEq; /// Default TCP server port. Not officially reserved. @@ -56,7 +55,7 @@ pub struct AuthConn { impl AuthConn { /// Shorthand for `AuthConn::from(TcpStream::connect_timeout(addr, CONNECT_TIMEOUT)?)`. pub fn new(addr: &SocketAddr) -> Result<Self, NetworkError> { - Ok(TcpStream::connect_timeout(addr, CONNECT_TIMEOUT)?.try_into()?) + Ok(TcpStream::connect_timeout(addr, CONNECT_TIMEOUT)?.into()) } /// Performs mutual authentication and encryption of the connection @@ -132,18 +131,9 @@ impl AuthConn { } } -impl TryFrom<TcpStream> for AuthConn { - type Error = io::Error; - - fn try_from(stream: TcpStream) -> io::Result<Self> { - let socket = Socket::from(stream); - - socket.set_send_buffer_size(2 * CHUNKSIZE)?; - socket.set_recv_buffer_size(2 * CHUNKSIZE)?; - - Ok(Self { - stream: socket.into(), - }) +impl From<TcpStream> for AuthConn { + fn from(stream: TcpStream) -> Self { + Self { stream } } } @@ -239,18 +229,9 @@ impl AuthServ { } } -impl TryFrom<TcpStream> for AuthServ { - type Error = io::Error; - - fn try_from(stream: TcpStream) -> io::Result<Self> { - let socket = Socket::from(stream); - - socket.set_send_buffer_size(2 * CHUNKSIZE)?; - socket.set_recv_buffer_size(2 * CHUNKSIZE)?; - - Ok(Self { - stream: socket.into(), - }) +impl From<TcpStream> for AuthServ { + fn from(stream: TcpStream) -> Self { + Self { stream } } } diff --git a/hbakd/src/main.rs b/hbakd/src/main.rs index 721072d..120e754 100644 --- a/hbakd/src/main.rs +++ b/hbakd/src/main.rs @@ -71,7 +71,7 @@ fn handle_client(stream: TcpStream) -> Result<(), NetworkError> { let local_node = LocalNode::new()?; - let auth_serv = AuthServ::try_from(stream)?; + let auth_serv = AuthServ::from(stream); let (stream_conn, remote_node_auth) = auth_serv.secure_stream(local_node.config().auth.clone())?; |