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

Performance & Error handling updates

Browse source
This commit is contained in:
PinkP4nther 2021-09-03 21:24:39 -07:00
commit fdbd791e85
2 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,2 +1,3 @@
/target /target
ideas.txt ideas.txt
Cargo.lock

34
src/data.rs
View file

@ -89,7 +89,7 @@ impl DownStreamInner {
println!("[!] Could not receive DataPipe::Finished notifier!"); println!("[!] Could not receive DataPipe::Finished notifier!");
} }
} else if byte_count == 0 { } else if byte_count == 0 || byte_count == -2 {
let _ = data_out.send(FullDuplexTcpState::DownStreamShutDown); let _ = data_out.send(FullDuplexTcpState::DownStreamShutDown);
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);
@ -107,11 +107,13 @@ impl DownStreamInner {
let mut data_length: i64 = 0; let mut data_length: i64 = 0;
let mut stream_lock = self.ds_stream.as_mut().unwrap().lock().unwrap();
loop { loop {
let mut r_buf = [0; 1024]; let mut r_buf = [0; 1024];
match self.ds_stream.as_mut().unwrap().lock().unwrap().read(&mut r_buf) { match stream_lock.read(&mut r_buf) {
Ok(bytes_read) => { Ok(bytes_read) => {
@ -120,10 +122,15 @@ impl DownStreamInner {
} else if bytes_read != 0 && bytes_read <= 1024 { } else if bytes_read != 0 && bytes_read <= 1024 {
/*
let mut tmp_buf = r_buf.to_vec(); let mut tmp_buf = r_buf.to_vec();
tmp_buf.truncate(bytes_read); tmp_buf.truncate(bytes_read);
*/
let _bw = self.internal_data_buffer.write(&tmp_buf).unwrap(); //let _bw = self.internal_data_buffer.write(&tmp_buf).unwrap();
let _bw = self.internal_data_buffer.write(r_buf.split_at(bytes_read).0).unwrap();
data_length += bytes_read as i64; data_length += bytes_read as i64;
} else { } else {
@ -141,6 +148,10 @@ impl DownStreamInner {
break; break;
}, },
io::ErrorKind::ConnectionReset => {
data_length = -2;
break;
},
_ => {println!("[!!!] Got error: {}",e);} _ => {println!("[!!!] Got error: {}",e);}
} }
}, },
@ -214,7 +225,7 @@ impl UpStreamInner {
println!("[!] Could not receive DataPipe::Finished notifier!"); println!("[!] Could not receive DataPipe::Finished notifier!");
} }
} else if byte_count == 0 { } else if byte_count == 0 || byte_count == -2 {
let _ = data_out.send(FullDuplexTcpState::UpStreamShutDown); let _ = data_out.send(FullDuplexTcpState::UpStreamShutDown);
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);
@ -231,11 +242,13 @@ impl UpStreamInner {
let mut data_length: i64 = 0; let mut data_length: i64 = 0;
let mut stream_lock = self.us_stream.as_mut().unwrap().lock().unwrap();
loop { loop {
let mut r_buf = [0; 1024]; let mut r_buf = [0; 1024];
match self.us_stream.as_mut().unwrap().lock().unwrap().read(&mut r_buf) { match stream_lock.read(&mut r_buf) {
Ok(bytes_read) => { Ok(bytes_read) => {
@ -245,10 +258,15 @@ impl UpStreamInner {
} else if bytes_read != 0 && bytes_read <= 1024 { } else if bytes_read != 0 && bytes_read <= 1024 {
/*
let mut tmp_buf = r_buf.to_vec(); let mut tmp_buf = r_buf.to_vec();
tmp_buf.truncate(bytes_read); tmp_buf.truncate(bytes_read);
*/
let _bw = self.internal_data_buffer.write(&tmp_buf).unwrap(); //let _bw = self.internal_data_buffer.write(&tmp_buf).unwrap();
let _bw = self.internal_data_buffer.write(r_buf.split_at(bytes_read).0).unwrap();
data_length += bytes_read as i64; data_length += bytes_read as i64;
} else { } else {
@ -264,6 +282,10 @@ impl UpStreamInner {
} }
break; break;
}, },
io::ErrorKind::ConnectionReset => {
data_length = -2;
break;
},
_ => {println!("[!!!] Got error: {}",e);} _ => {println!("[!!!] Got error: {}",e);}
} }
}, },