tuxmain/sslrelay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added thread specifiers to error verbose

Browse source
This commit is contained in:
PinkP4nther 2021-09-13 13:48:13 -07:00
commit 81040de23d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/data.rs
View file

@ -61,7 +61,7 @@ impl DownStreamInner {
drop(stream_lock); drop(stream_lock);
if let Err(e) = data_out.send(FullDuplexTcpState::DownStreamRead) { if let Err(e) = data_out.send(FullDuplexTcpState::DownStreamRead) {
println!("[SSLRelay Error]: Failed to send DownStreamRead ready notifier to main thread: {}", e); println!("[SSLRelay DownStream Thread Error]: Failed to send DownStreamRead ready notifier to main thread: {}", e);
return; return;
} }
}, },
@ -88,7 +88,7 @@ impl DownStreamInner {
if byte_count > 0 { if byte_count > 0 {
if let Err(e) = data_out.send(FullDuplexTcpState::UpStreamWrite(self.internal_data_buffer.clone())) { if let Err(e) = data_out.send(FullDuplexTcpState::UpStreamWrite(self.internal_data_buffer.clone())) {
println!("[SSLRelay Error]: Failed to send UpStreamWrite to main thread: {}", e); println!("[SSLRelay DownStream Thread Error]: Failed to send UpStreamWrite to main thread: {}", e);
return; return;
} }
@ -116,7 +116,7 @@ impl DownStreamInner {
} else if byte_count == 0 || byte_count == -2 { } else if byte_count == 0 || byte_count == -2 {
if let Err(e) = data_out.send(FullDuplexTcpState::DownStreamShutDown) { if let Err(e) = data_out.send(FullDuplexTcpState::DownStreamShutDown) {
println!("[SSLRelay Error]: Failed to send shutdown signal to main thread from DownStream thread: {}", e); println!("[SSLRelay DownStream Thread Error]: Failed to send shutdown signal to main thread from DownStream thread: {}", e);
return; return;
} }
let _ = self.ds_stream.as_ref().unwrap().lock().unwrap().get_ref().shutdown(Shutdown::Both); let _ = self.ds_stream.as_ref().unwrap().lock().unwrap().get_ref().shutdown(Shutdown::Both);
@ -223,7 +223,7 @@ impl UpStreamInner {
drop(stream_lock); drop(stream_lock);
if let Err(e) = data_out.send(FullDuplexTcpState::UpStreamRead) { if let Err(e) = data_out.send(FullDuplexTcpState::UpStreamRead) {
println!("[SSLRelay Error]: Failed to send UpStreamRead ready notifier to main thread: {}", e); println!("[SSLRelay UpStream Thread Error]: Failed to send UpStreamRead ready notifier to main thread: {}", e);
return; return;
} }
}, },
@ -249,7 +249,7 @@ impl UpStreamInner {
if byte_count > 0 { if byte_count > 0 {
if let Err(e) = data_out.send(FullDuplexTcpState::DownStreamWrite(self.internal_data_buffer.clone())) { if let Err(e) = data_out.send(FullDuplexTcpState::DownStreamWrite(self.internal_data_buffer.clone())) {
println!("[SSLRelay Error]: Failed to send DownStreamWrite to main thread: {}", e); println!("[SSLRelay UpStream Thread Error]: Failed to send DownStreamWrite to main thread: {}", e);
return; return;
} }
@ -275,7 +275,7 @@ impl UpStreamInner {
} else if byte_count == 0 || byte_count == -2 { } else if byte_count == 0 || byte_count == -2 {
if let Err(e) = data_out.send(FullDuplexTcpState::UpStreamShutDown) { if let Err(e) = data_out.send(FullDuplexTcpState::UpStreamShutDown) {
println!("[SSLRelay Error]: Failed to send shutdown signal to main thread from UpStream thread: {}", e); println!("[SSLRelay UpStream Thread Error]: Failed to send shutdown signal to main thread from UpStream thread: {}", e);
return; return;
} }
let _ = self.us_stream.as_ref().unwrap().lock().unwrap().get_ref().shutdown(Shutdown::Both); let _ = self.us_stream.as_ref().unwrap().lock().unwrap().get_ref().shutdown(Shutdown::Both);