tuxmain/sslrelay
Watch
1
0
Fork
You've already forked sslrelay
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clippy

Browse source
This commit is contained in:
Pascal Engélibert 2026-08-24 09:20:01 +02:00
commit 5e0007fab6
4 changed files with 28 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/data.rs
View file

@ -74,7 +74,6 @@ impl DownStreamInner {
} else if byte_count == -1 { } else if byte_count == -1 {
continue; continue;
} }
} else {
} }
} }
} }
@ -138,7 +137,6 @@ impl DownStreamInner {
} else if byte_count == -1 { } else if byte_count == -1 {
continue; continue;
} }
} else {
} }
} }
} }
@ -186,7 +184,7 @@ impl DownStreamInner {
}, },
} }
} }
return Some(data_length); Some(data_length)
} }
} }
@ -257,7 +255,6 @@ impl UpStreamInner {
} else if byte_count == -1 { } else if byte_count == -1 {
continue; continue;
} }
} else {
} }
} }
} }
@ -317,7 +314,6 @@ impl UpStreamInner {
} else if byte_count == -1 { } else if byte_count == -1 {
continue; continue;
} }
} else {
} }
} }
} }
@ -365,6 +361,6 @@ impl UpStreamInner {
}, },
} }
} }
return Some(data_length); Some(data_length)
} }
} }

2
src/lib.rs
View file

@ -61,7 +61,6 @@
//! } //! }
//! } //! }
//! //!
//! fn main() {
//! // Create new SSLRelay object //! // Create new SSLRelay object
//! let mut relay = sslrelay::SSLRelay::new( //! let mut relay = sslrelay::SSLRelay::new(
//! Handler, //! Handler,
@ -81,7 +80,6 @@
//! //!
//! // Start listening //! // Start listening
//! relay.start(); //! relay.start();
//! }
//! ``` //! ```
use openssl::{ use openssl::{

6
src/relay.rs
View file

@ -16,7 +16,7 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
} }
/// Starts the SSLRelay connection handling. /// Starts the SSLRelay connection handling.
pub fn start(&mut self) { pub fn start(&mut self) {
let rhost = self.config.remote_host.clone(); let rhost = self.config.remote_host;
let rport = self.config.remote_port.clone(); let rport = self.config.remote_port.clone();
let upstream_data_stream_type = self.config.upstream_data_type; let upstream_data_stream_type = self.config.upstream_data_type;
@ -38,7 +38,7 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
let acceptor = acceptor.clone(); let acceptor = acceptor.clone();
let mut handler_clone = self.handlers.as_ref().unwrap().clone(); let mut handler_clone = self.handlers.as_ref().unwrap().clone();
let r_host = rhost.clone(); let r_host = rhost;
let r_port = rport.clone(); let r_port = rport.clone();
let this_conn_id = conn_id; let this_conn_id = conn_id;
@ -91,7 +91,7 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
Ok(stream) => { Ok(stream) => {
let handler_clone = self.handlers.as_ref().unwrap().clone(); let handler_clone = self.handlers.as_ref().unwrap().clone();
let r_host = rhost.clone(); let r_host = rhost;
let r_port = rport.clone(); let r_port = rport.clone();
let this_conn_id = conn_id; let this_conn_id = conn_id;

14
src/tcp.rs
View file

@ -311,9 +311,8 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
Err(e) => { Err(e) => {
Self::handle_error( Self::handle_error(
format!( format!(
"Can't connect to remote host: {}\nErr: {}", "Can't connect to remote host: {}:{}\nErr: {}",
format!("{}:{}", remote_host, remote_port), remote_host, remote_port, e
e
) )
.as_str(), .as_str(),
); );
@ -321,7 +320,7 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
} }
}; };
let _ = s.set_read_timeout(Some(Duration::from_millis(50))); let _ = s.set_read_timeout(Some(Duration::from_millis(50)));
return Ok(DataStreamType::RAW(s)); Ok(DataStreamType::RAW(s))
} }
TCPDataType::TLS => { TCPDataType::TLS => {
let mut sslbuilder = SslConnector::builder(SslMethod::tls()).unwrap(); let mut sslbuilder = SslConnector::builder(SslMethod::tls()).unwrap();
@ -334,9 +333,8 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
Err(e) => { Err(e) => {
Self::handle_error( Self::handle_error(
format!( format!(
"Can't connect to remote host: {}\nErr: {}", "Can't connect to remote host: {}:{}\nErr: {}",
format!("{}:{}", remote_host, remote_port), remote_host, remote_port, e
e
) )
.as_str(), .as_str(),
); );
@ -357,7 +355,7 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
let _ = s let _ = s
.get_ref() .get_ref()
.set_read_timeout(Some(Duration::from_millis(50))); .set_read_timeout(Some(Duration::from_millis(50)));
return Ok(DataStreamType::TLS(s)); Ok(DataStreamType::TLS(s))
} }
} }
} }