.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-	"rust-analyzer.showUnlinkedFileNotification": false
-}

Cargo.toml

@@ -1,13 +1,16 @@
 [package]
 name = "sslrelay"
-version = "0.6.2"
+version = "0.4.4"
 authors = ["PinkP4nther <pinkp4nther@protonmail.com> @Pink_P4nther"]
 edition = "2018"
 description = "A TCP relay library for relaying/modifying/spoofing TCP traffic by implementing callback code."
 repository = "https://github.com/PinkP4nther/SSLRelay-lib"
 keywords = ["tcp", "networking", "relay", "tls", "ssl"]
-categories = ["network-programming"]
+categories = ["reverse-engineering", "network-relay", "tcp"]
 license = "Apache-2.0"
 
 [dependencies.openssl]
 version = "0.10.36"
+
+[dependencies.toml]
+version = "0.5.8"

README.md

@@ -28,10 +28,4 @@ A TCP relay library that can handle raw TCP and SSL/TLS connections. You can rea
 > 10/06/2021 | **v0.4.2** | Added documentation.
 >
 > 10/07/2021 | **v0.4.3** | Blocking callbacks now pass self as a mutable reference. This can allow the developer to create structures that can be accessed every stream write. (ONLY in the BLOCKING callback). The self object is refreshed per TCP connection. Separate TCP connections can not touch eachothers data.
->
 > 10/08/2021 | **v0.4.4** | Added ability to set TLS certificate and certificate private key to nothing. When passing RelayConfig to the relay object use the 'None' variant of Option<T> enum. In a config file put the cert path and key path as an empty 'String' to specify 'None'.
->
-> 10/09/2021 | **v0.6.0** | Gone away with 'ConfigType<T>'! No more specifying config files unless the developer implements it themself. A new config enum 'TLSConfig' has been introduced. This has 3 variants FILE(Specify the cert and pk file paths), DATA(Pass the cert(PEM) data and the pk(PEM) data as bytes), NONE(This is when you are not using TLS on the listening/downstream side of the relay).
->
-> 10/10/2021 | **v0.6.2** | StreamWrite's to master thread are no longer verbose when the opposite stream disconnects randomly.
->

examples/basic.rs

@@ -1,66 +0,0 @@
-use sslrelay::{self, CallbackRet, HandlerCallbacks, RelayConfig, TCPDataType, TLSConfig};
-
-// Handler object
-#[derive(Clone)] // Must have Clone trait implemented.
-struct Handler;
-
-/*
-	Callback traits that can be used to read or inject data
-	into data upstream or downstream.
-*/
-impl HandlerCallbacks for Handler {
-	// DownStream non blocking callback
-	fn ds_nb_callback(&self, in_data: Vec<u8>, _conn_id: u64) {
-		if let Ok(in_data) = str::from_utf8(&in_data) {
-			println!("[downstream] {in_data}");
-		} else {
-			//println!("[downstream] {in_data:?}");
-		}
-	}
-
-	// DownStream blocking callback
-	fn ds_b_callback(&mut self, _in_data: Vec<u8>, _conn_id: u64) -> CallbackRet {
-		//println!("[CALLBACK] Down Stream Blocking CallBack!");
-		CallbackRet::Relay(_in_data)
-	}
-
-	// UpStream non blocking callback
-	fn us_nb_callback(&self, in_data: Vec<u8>, _conn_id: u64) {
-		if let Ok(in_data) = str::from_utf8(&in_data) {
-			println!("[upstream] {in_data}");
-		} else {
-			//println!("[upstream] {in_data:?}");
-		}
-	}
-
-	// UpStream blocking callback
-	fn us_b_callback(&mut self, _in_data: Vec<u8>, _conn_id: u64) -> CallbackRet {
-		//println!("[CALLBACK] Up Stream Blocking CallBack!");
-		CallbackRet::Relay(_in_data)
-	}
-}
-
-fn main() {
-	// Create new SSLRelay object
-	let mut relay = sslrelay::SSLRelay::new(
-		Handler,
-		RelayConfig {
-			downstream_data_type: TCPDataType::TLS,
-			upstream_data_type: TCPDataType::TLS,
-			bind_host: "127.0.0.1".to_string(),
-			bind_port: "443".to_string(),
-			remote_host: |server_name| {
-				server_name.map_or_else(|| panic!("NO HOST"), str::to_string)
-			},
-			remote_port: "443".to_string(),
-			tls_config:
-				TLSConfig::FILE {
-					certificate_path: "/dev/shm/exp/certs/prime256v1/apple.com.crt".to_string(),
-					private_key_path: "/dev/shm/exp/certs/prime256v1/apple.com.key".to_string(),
-				},
-		},
-	);
-
-	// Start listening
-	relay.start();
-}

examples/basic/src/main.rs

@@ -0,0 +1,54 @@
+use sslrelay::{self, ConfigType, RelayConfig, HandlerCallbacks, CallbackRet, TCPDataType};
+
+// Handler object
+#[derive(Clone)] // Must have Clone trait implemented.
+struct Handler;
+
+/*
+    Callback traits that can be used to read or inject data
+    into data upstream or downstream.
+*/
+impl HandlerCallbacks for Handler {
+
+    // DownStream non blocking callback
+    fn ds_nb_callback(&self, _in_data: Vec<u8>) {
+        println!("[CALLBACK] Down Stream Non Blocking CallBack!");
+    }
+
+    // DownStream blocking callback
+    fn ds_b_callback(&mut self, _in_data: Vec<u8>) -> CallbackRet {
+        println!("[CALLBACK] Down Stream Blocking CallBack!");
+        CallbackRet::Relay(_in_data)
+    }
+
+    // UpStream non blocking callback
+    fn us_nb_callback(&self, _in_data: Vec<u8>) {
+        println!("[CALLBACK] Up Stream Non Blocking CallBack!");
+    }
+
+    // UpStream blocking callback
+    fn us_b_callback(&mut self, _in_data: Vec<u8>) -> CallbackRet {
+        println!("[CALLBACK] Up Stream Blocking CallBack!");
+        CallbackRet::Relay(_in_data)
+    }
+}
+
+fn main() {
+
+    // Create new SSLRelay object
+    let mut relay = sslrelay::SSLRelay::new(
+        Handler, 
+        ConfigType::Conf(RelayConfig {
+            downstream_data_type: TCPDataType::TLS,
+            upstream_data_type: TCPDataType::TLS,
+            bind_host: "0.0.0.0".to_string(),
+            bind_port: "443".to_string(),
+            remote_host: "remote.com".to_string(),
+            remote_port: "443".to_string(),
+            ssl_private_key_path: Some("./remote.com.key".to_string()),
+            ssl_cert_path: Some("./remote.com.crt".to_string()),
+        })
+    );
+    // Start listening
+    relay.start();
+}

examples/modifydata/relay_config.toml

@@ -0,0 +1,8 @@
+bind_host = "0.0.0.0"
+bind_port = "443"
+ssl_private_key_path = "./remote.com.key"
+ssl_cert_path = "./remote.com.crt"
+remote_host = "remote.com"
+remote_port = "443"
+downstream_data_type = "tls"
+upstream_data_type = "tls"

examples/modifydata/src/main.rs

@@ -1,4 +1,4 @@
-use sslrelay::{self, TLSConfig, TCPDataType, RelayConfig, HandlerCallbacks, CallbackRet};
+use sslrelay::{self, ConfigType, HandlerCallbacks, CallbackRet};
 
 // Handler object
 #[derive(Clone)] // Must have Clone trait implemented.
@@ -38,21 +38,7 @@ impl HandlerCallbacks for Handler {
 fn main() {
 
     // Create new SSLRelay object
-    let mut relay = sslrelay::SSLRelay::new(
+    let mut relay = sslrelay::SSLRelay::new(Handler, ConfigType::Default);
-        Handler, 
-        RelayConfig {
-            downstream_data_type: TCPDataType::TLS,
-            upstream_data_type: TCPDataType::TLS,
-            bind_host: "0.0.0.0".to_string(),
-            bind_port: "443".to_string(),
-            remote_host: "remote.com".to_string(),
-            remote_port: "443".to_string(),
-            tls_config: TLSConfig::FILE{
-                certificate_path: "./tls.crt".to_string(),
-                private_key_path: "./tls.key".to_string(),
-            },
-        }
-    );
 
     // Start listening
     relay.start();

relay_config.example.toml

@@ -0,0 +1,8 @@
+bind_host = "0.0.0.0"
+bind_port = "443"
+ssl_private_key_path = "./ssl.key"
+ssl_cert_path = "./ssl.crt"
+remote_host = "remote.com"
+remote_port = "443"
+downstream_data_type = "tls"
+upstream_data_type = "tls"

rustfmt.toml

@@ -1,8 +0,0 @@
-hard_tabs = true
-newline_style = "unix"
-
-unstable_features = true
-format_code_in_doc_comments = true
-format_macro_bodies = true
-format_macro_matchers = true
-format_strings = true

src/data.rs

@@ -1,14 +1,27 @@
 use crate::{
-	io, mpsc, DataPipe, DataStreamType, DownStreamInner, Duration, FullDuplexTcpState, Read,
+    DownStreamInner,
-	Receiver, Sender, Shutdown, UpStreamInner, Write,
+    UpStreamInner,
+    FullDuplexTcpState,
+    DataPipe,
+    DataStreamType,
+    Sender,
+    Receiver,
+    Shutdown,
+    mpsc,
+    Duration,
+    Read,
+    Write,
+    io,
 };
 
 impl DownStreamInner {
+
     fn handle_error(error_description: &str) {
         println!("[SSLRelay DownStream Thread Error]: {}", error_description);
     }
 
     pub fn ds_handler(self, data_out: Sender<FullDuplexTcpState>, data_in: Receiver<DataPipe>) {
+
         match &self.ds_stream {
             DataStreamType::RAW(_) => self.handle_raw(data_out, data_in),
             DataStreamType::TLS(_) => self.handle_tls(data_out, data_in),
@@ -16,172 +29,197 @@ impl DownStreamInner {
     }
 
     fn handle_raw(mut self, data_out: Sender<FullDuplexTcpState>, data_in: Receiver<DataPipe>) {
+
         let mut raw_stream = match &self.ds_stream {
             DataStreamType::RAW(ref s) => s,
             _ => return,
         };
 
         loop {
+
             match data_in.recv_timeout(Duration::from_millis(50)) {
+
                 // DataPipe Received
-				Ok(data_received) => match data_received {
+                Ok(data_received) => {
+
+                    match data_received {
                         DataPipe::DataWrite(data) => {
+
                             match raw_stream.write_all(&data) {
-							Ok(()) => {}
+                                Ok(()) => {},
                                 Err(_e) => {
-								Self::handle_error(
+                                    Self::handle_error("Failed to write data to DownStream tcp stream!");
-									"Failed to write data to DownStream tcp stream!",
-								);
                                     let _ = data_out.send(FullDuplexTcpState::DownStreamShutDown);
                                     let _ = raw_stream.shutdown(Shutdown::Both);
                                     return;
                                 }
                             }
                             let _ = raw_stream.flush();
-					}
+
+                        },
                         DataPipe::Shutdown => {
                             let _ = raw_stream.shutdown(Shutdown::Both);
                             return;
+                        },
                     }
                 },
-				Err(_e) => match _e {
+                Err(_e) => {
-					mpsc::RecvTimeoutError::Timeout => {}
+                    match _e {
+                        mpsc::RecvTimeoutError::Timeout => {},
                         mpsc::RecvTimeoutError::Disconnected => {
                             Self::handle_error("DownStream data_in channel is disconnected!");
                             return;
                         }
-				},
+                    }
+                }
             }// End of data_in receive
 
             // If received data
-			if let Some(byte_count) =
+            if let Some(byte_count) = Self::get_data_stream(&mut raw_stream, &mut self.internal_data_buffer) {
-				Self::get_data_stream(&mut raw_stream, &mut self.internal_data_buffer)
-			{
                 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())) {
-					)) {
+                        Self::handle_error(format!("Failed to send UpStreamWrite to main thread: {}", e).as_str());
-						//Self::handle_error(format!("Failed to send UpStreamWrite to main thread: {}", e).as_str());
-						let _ = raw_stream.shutdown(Shutdown::Both);
                         return;
                     }
 
                     self.internal_data_buffer.clear();
+
                 } else if byte_count == 0 || byte_count == -2 {
+
                     let _ = data_out.send(FullDuplexTcpState::DownStreamShutDown);
                     let _ = raw_stream.shutdown(Shutdown::Both);
                     return;
+
                 } else if byte_count == -1 {
                     continue;
                 }
             } else {
+
             }
         }
     }
 
     fn handle_tls(mut self, data_out: Sender<FullDuplexTcpState>, data_in: Receiver<DataPipe>) {
+
         let mut tls_stream = match self.ds_stream {
             DataStreamType::TLS(ref mut s) => s,
             _ => return,
         };
 
         loop {
+
             match data_in.recv_timeout(Duration::from_millis(50)) {
+
                 // DataPipe Received
-				Ok(data_received) => match data_received {
+                Ok(data_received) => {
+
+                    match data_received {
                         DataPipe::DataWrite(data) => {
+
                             match tls_stream.write_all(&data) {
-							Ok(()) => {}
+                                Ok(()) => {},
                                 Err(_e) => {
-								Self::handle_error(
+                                    Self::handle_error("Failed to write data to DownStream tcp stream!");
-									"Failed to write data to DownStream tcp stream!",
-								);
                                     let _ = data_out.send(FullDuplexTcpState::DownStreamShutDown);
                                     let _ = tls_stream.shutdown();
                                     return;
                                 }
                             }
                             let _ = tls_stream.flush();
-					}
+                        },
                         DataPipe::Shutdown => {
                             let _ = tls_stream.shutdown();
                             return;
+                        },
                     }
                 },
-				Err(_e) => match _e {
+                Err(_e) => {
-					mpsc::RecvTimeoutError::Timeout => {}
+                    match _e {
+                        mpsc::RecvTimeoutError::Timeout => {},
                         mpsc::RecvTimeoutError::Disconnected => {
                             Self::handle_error("DownStream data_in channel is disconnected!");
                             return;
                         }
-				},
+                    }
+                }
             }// End of data_in receive
 
             // If received data
-			if let Some(byte_count) =
+            if let Some(byte_count) = Self::get_data_stream(&mut tls_stream, &mut self.internal_data_buffer) {
-				Self::get_data_stream(&mut tls_stream, &mut self.internal_data_buffer)
-			{
                 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())) {
-					)) {
+                        Self::handle_error(format!("Failed to send UpStreamWrite to main thread: {}", e).as_str());
-						//Self::handle_error(format!("Failed to send UpStreamWrite to main thread: {}", e).as_str());
                         let _ = tls_stream.shutdown();
                         return;
                     }
 
                     self.internal_data_buffer.clear();
+
                 } else if byte_count == 0 || byte_count == -2 {
+
                     let _ = data_out.send(FullDuplexTcpState::DownStreamShutDown);
                     let _ = tls_stream.shutdown();
                     return;
+
                 } else if byte_count == -1 {
                     continue;
                 }
             } else {
+
             }
         }
     }
 
     fn get_data_stream<S: Read>(stream: &mut S, internal_data_buffer: &mut Vec<u8>) -> Option<i64> {
+
         let mut data_length: i64 = 0;
 
         loop {
+
             let mut r_buf = [0; 1024];
 
             match stream.read(&mut r_buf) {
+
                 Ok(bytes_read) => {
+
                     if bytes_read == 0 {
                         break;
+
                     } else if bytes_read != 0 && bytes_read <= 1024 {
+
                         /*
                         let mut tmp_buf = r_buf.to_vec();
                         tmp_buf.truncate(bytes_read);
                         */
                         
+
                         //let _bw = self.internal_data_buffer.write(&tmp_buf).unwrap();
 
-						let _bw = internal_data_buffer
+                        let _bw = internal_data_buffer.write(r_buf.split_at(bytes_read).0).unwrap();
-							.write(r_buf.split_at(bytes_read).0)
-							.unwrap();
                         data_length += bytes_read as i64;
+
                     } else {
                         println!("[+] Else hit!!!!!!!!!!!!!!!!!!!!!!");
                     }
-				}
+                },
-				Err(e) => match e.kind() {
+                Err(e) => {
+                    match e.kind() {
+
                         io::ErrorKind::WouldBlock => {
                             if data_length == 0 {
+
                                 data_length = -1;
                             }
                             break;
-					}
+
+                        },
                         io::ErrorKind::ConnectionReset => {
                             data_length = -2;
                             break;
-					}
+                        },
-					_ => {
+                        _ => {println!("[!!!] Got error: {}",e);}
-						println!("[!!!downstream] Got error: {}", e);
                     }
                 },
             }
@@ -190,30 +228,40 @@ impl DownStreamInner {
     }
 }
 
+
 impl UpStreamInner {
+
     fn handle_error(error_description: &str) {
         println!("[SSLRelay UpStream Thread Error]: {}", error_description);
     }
 
     pub fn us_handler(self, data_out: Sender<FullDuplexTcpState>, data_in: Receiver<DataPipe>) {
+
         match &self.us_stream {
             DataStreamType::RAW(_) => self.handle_raw(data_out, data_in),
             DataStreamType::TLS(_) => self.handle_tls(data_out, data_in),
         }
+
     }
 
     fn handle_raw(mut self, data_out: Sender<FullDuplexTcpState>, data_in: Receiver<DataPipe>) {
+
         let mut raw_stream = match self.us_stream {
             DataStreamType::RAW(ref s) => s,
             _ => return,
         };
 
         loop {
+
             match data_in.recv_timeout(Duration::from_millis(50)) {
-				Ok(data_received) => match data_received {
+
+                Ok(data_received) => {
+
+                    match data_received {
                         DataPipe::DataWrite(data) => {
+
                             match raw_stream.write_all(&data) {
-							Ok(()) => {}
+                                Ok(()) => {},
                                 Err(_e) => {
                                     Self::handle_error("Failed to write data to UpStream tcp stream!");
                                     let _ = data_out.send(FullDuplexTcpState::UpStreamShutDown);
@@ -222,35 +270,36 @@ impl UpStreamInner {
                                 }
                             }
                             let _ = raw_stream.flush();
-					}
+                        },
                         DataPipe::Shutdown => {
                             let _ = raw_stream.shutdown(Shutdown::Both);
                             return;
                         }
+                    }
                 },
-				Err(e) => match e {
+                Err(e) => {
-					mpsc::RecvTimeoutError::Timeout => {}
+                    match e {
+                        mpsc::RecvTimeoutError::Timeout => {},
                         mpsc::RecvTimeoutError::Disconnected => {
                             Self::handle_error("UpStream data_in channel is disconnected!");
                             return;
                         }
-				},
+                    }
+                }
             }// End of data_in receive
 
-			if let Some(byte_count) =
+            if let Some(byte_count) = Self::get_data_stream(&mut raw_stream, &mut self.internal_data_buffer) {
-				Self::get_data_stream(&mut raw_stream, &mut self.internal_data_buffer)
-			{
                 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())) {
-					)) {
+                        Self::handle_error(format!("Failed to send DownStreamWrite to main thread: {}", e).as_str());
-						//Self::handle_error(format!("Failed to send DownStreamWrite to main thread: {}", e).as_str());
-						let _ = raw_stream.shutdown(Shutdown::Both);
                         return;
                     }
 
                     self.internal_data_buffer.clear();
+
                 } else if byte_count == 0 || byte_count == -2 {
+
                     let _ = data_out.send(FullDuplexTcpState::UpStreamShutDown);
                     let _ = raw_stream.shutdown(Shutdown::Both);
                     return;
@@ -263,17 +312,23 @@ impl UpStreamInner {
     }
 
     fn handle_tls(mut self, data_out: Sender<FullDuplexTcpState>, data_in: Receiver<DataPipe>) {
+
         let mut tls_stream = match self.us_stream {
             DataStreamType::TLS(ref mut s) => s,
             _ => return,
         };
 
         loop {
+
             match data_in.recv_timeout(Duration::from_millis(50)) {
-				Ok(data_received) => match data_received {
+
+                Ok(data_received) => {
+
+                    match data_received {
                         DataPipe::DataWrite(data) => {
+
                             match tls_stream.write_all(&data) {
-							Ok(()) => {}
+                                Ok(()) => {},
                                 Err(_e) => {
                                     Self::handle_error("Failed to write data to UpStream tcp stream!");
                                     let _ = data_out.send(FullDuplexTcpState::UpStreamShutDown);
@@ -282,35 +337,36 @@ impl UpStreamInner {
                                 }
                             }
                             let _ = tls_stream.flush();
-					}
+                        },
                         DataPipe::Shutdown => {
                             let _ = tls_stream.shutdown();
                             return;
                         }
+                    }
                 },
-				Err(e) => match e {
+                Err(e) => {
-					mpsc::RecvTimeoutError::Timeout => {}
+                    match e {
+                        mpsc::RecvTimeoutError::Timeout => {},
                         mpsc::RecvTimeoutError::Disconnected => {
                             Self::handle_error("UpStream data_in channel is disconnected!");
                             return;
                         }
-				},
+                    }
+                }
             }// End of data_in receive
 
-			if let Some(byte_count) =
+            if let Some(byte_count) = Self::get_data_stream(&mut tls_stream, &mut self.internal_data_buffer) {
-				Self::get_data_stream(&mut tls_stream, &mut self.internal_data_buffer)
-			{
                 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())) {
-					)) {
+                        Self::handle_error(format!("Failed to send DownStreamWrite to main thread: {}", e).as_str());
-						//Self::handle_error(format!("Failed to send DownStreamWrite to main thread: {}", e).as_str());
-						let _ = tls_stream.shutdown();
                         return;
                     }
 
                     self.internal_data_buffer.clear();
+
                 } else if byte_count == 0 || byte_count == -2 {
+
                     let _ = data_out.send(FullDuplexTcpState::UpStreamShutDown);
                     let _ = tls_stream.shutdown();
                     return;
@@ -323,44 +379,52 @@ impl UpStreamInner {
     }
 
     fn get_data_stream<S: Read>(stream: &mut S, internal_data_buffer: &mut Vec<u8>) -> Option<i64> {
+
         let mut data_length: i64 = 0;
 
         loop {
+
             let mut r_buf = [0; 1024];
 
             match stream.read(&mut r_buf) {
+
                 Ok(bytes_read) => {
+
                     if bytes_read == 0 {
+
                         break;
+
                     } else if bytes_read != 0 && bytes_read <= 1024 {
+
                         /*
                         let mut tmp_buf = r_buf.to_vec();
                         tmp_buf.truncate(bytes_read);
                         */
                         
+
                         //let _bw = self.internal_data_buffer.write(&tmp_buf).unwrap();
 
-						let _bw = internal_data_buffer
+                        let _bw = internal_data_buffer.write(r_buf.split_at(bytes_read).0).unwrap();
-							.write(r_buf.split_at(bytes_read).0)
-							.unwrap();
                         data_length += bytes_read as i64;
+
                     } else {
                         println!("[+] Else hit!!!!!!!!!!!!!!!!!!!!!!");
                     }
-				}
+                },
-				Err(e) => match e.kind() {
+                Err(e) => {
+                    match e.kind() {
+
                         io::ErrorKind::WouldBlock => {
                             if data_length == 0 {
                                 data_length = -1;
                             }
                             break;
-					}
+                        },
                         io::ErrorKind::ConnectionReset => {
                             data_length = -2;
                             break;
-					}
+                        },
-					_ => {
+                        _ => {println!("[!!!] Got error: {}",e);}
-						println!("[!!!upstream] Got error: {}", e);
                     }
                 },
             }

src/lib.rs

@@ -1,17 +1,13 @@
 //! ## SSLRelay
 
 //! Library for relaying TCP traffic as well as TLS encrypted TCP traffic.
-//! This library allows you to implement callback functions for upstream and downstream traffic.
+//! This Library allows you to implement callback functions for upstream and downstream traffic.
 //! These callbacks can R/W the data from a stream(Blocking) or only R the data(Non-Blocking).
 //!```
 //!pub trait HandlerCallbacks {
-//! 	fn ds_b_callback(&mut self, _in_data: Vec<u8>) -> CallbackRet {
+//!    fn ds_b_callback(&mut self, _in_data: Vec<u8>) -> CallbackRet {CallbackRet::Relay(_in_data)}
-//! 		CallbackRet::Relay(_in_data)
-//! 	}
 //!    fn ds_nb_callback(&self, _in_data: Vec<u8>){}
-//! 	fn us_b_callback(&mut self, _in_data: Vec<u8>) -> CallbackRet {
+//!    fn us_b_callback(&mut self, _in_data: Vec<u8>) -> CallbackRet {CallbackRet::Relay(_in_data)}
-//! 		CallbackRet::Relay(_in_data)
-//! 	}
 //!    fn us_nb_callback(&self, _in_data: Vec<u8>){}
 //!}
 //!```
@@ -27,7 +23,7 @@
 //! ```
 //! ## Example (basic.rs)
 //! ```
-//! use sslrelay::{self, CallbackRet, HandlerCallbacks, RelayConfig, TCPDataType, TLSConfig};
+//! use sslrelay::{self, ConfigType, RelayConfig, HandlerCallbacks, CallbackRet, TCPDataType};
 //! 
 //! // Handler object
 //! #[derive(Clone)] // Must have Clone trait implemented.
@@ -38,6 +34,7 @@
 //!     into data upstream or downstream.
 //! */
 //! impl HandlerCallbacks for Handler {
+//! 
 //!     // DownStream non blocking callback (Read Only)
 //!     fn ds_nb_callback(&self, _in_data: Vec<u8>) {
 //!         println!("[CALLBACK] Down Stream Non Blocking CallBack!");
@@ -62,49 +59,75 @@
 //! }
 //! 
 //! fn main() {
+//! 
 //!     // Create new SSLRelay object
 //!     let mut relay = sslrelay::SSLRelay::new(
 //!         Handler, 
-//! 		RelayConfig {
+//!         ConfigType::Conf(RelayConfig {
 //!             downstream_data_type: TCPDataType::TLS,
 //!             upstream_data_type: TCPDataType::TLS,
 //!             bind_host: "0.0.0.0".to_string(),
 //!             bind_port: "443".to_string(),
-//! 			remote_host: |_| "remote.com",
+//!             remote_host: "remote.com".to_string(),
 //!             remote_port: "443".to_string(),
-//! 			tls_config: TLSConfig::FILE {
+//!             ssl_private_key_path: Some("./remote.com.key".to_string()),
-//! 				certificate_path: "./tls.crt".to_string(),
+//!             ssl_cert_path: Some("./remote.com.crt".to_string()),
-//! 				private_key_path: "./tls.key".to_string(),
+//!         })
-//! 			},
-//! 		},
 //!     );
-//!
 //!     // Start listening
 //!     relay.start();
 //! }
 //! ```
 
-use openssl::{
+use openssl::ssl::{
-	pkey::PKey,
+    SslVerifyMode,
-	ssl::{SslAcceptor, SslConnector, SslFiletype, SslMethod, SslStream, SslVerifyMode},
+    SslConnector,
-	x509::X509,
+    SslAcceptor,
+    SslStream,
+    SslFiletype,
+    SslMethod
 };
 
-use std::net::{Shutdown, TcpListener, TcpStream};
+use std::net::{
+    TcpListener,
+    TcpStream,
+    Shutdown
+};
 
-use std::sync::{Arc, Mutex};
+use std::sync::{
+    Arc,
+    Mutex
+};
 
-use std::thread;
+use std::{
+    process,
+    thread
+};
 
-use std::{path::Path, time::Duration};
+use std::{
+    env,
+    fs,
+    path::Path,
+    time::Duration,
+};
 
-use std::io::{self, Read, Write};
+use std::io::{
+    self,
+    Read,
+    Write
+};
 
-use std::sync::mpsc::{self, Receiver, Sender};
+use std::sync::mpsc::{
+    self,
+    Receiver,
+    Sender
+};
+
+use toml::Value as TValue;
 
 mod data;
-mod relay;
 mod tcp;
+mod relay;
 
 #[derive(Debug)]
 enum FullDuplexTcpState {
@@ -132,21 +155,16 @@ pub enum TCPDataType {
     RAW,
 }
 
-/// TLSConfig is used to specify TLS options.
+/// The relay configuration type.
-/// FILE is for specifying a path to a certificate and private key.
+/// Env: Uses the SSLRELAY_CONFIG environmental variable for the path to the config file.
-/// DATA is for passing the certificate and private key bytes directly.
+/// Path: Specifies the path to the config file.
-/// NONE is for when you are not using TLS on the listening/downstream side of the relay.
+/// Conf: For passing an instance of the object instead of using a config file.
-#[derive(Clone)]
+/// Default: Uses ./relay_config.toml config file.
-pub enum TLSConfig {
+pub enum ConfigType<T> {
-	FILE {
+    Env,
-		certificate_path: String,
+    Path(T),
-		private_key_path: String,
+    Conf(RelayConfig),
-	},
+    Default,
-	DATA {
-		certificate: Vec<u8>,
-		private_key: Vec<u8>,
-	},
-	NONE,
 }
 
 /// Relay Config structure for passing into the SSLRelay::new() config parameter.
@@ -156,10 +174,10 @@ pub struct RelayConfig {
     pub upstream_data_type: TCPDataType,
     pub bind_host: String,
     pub bind_port: String,
-	pub remote_host: fn(Option<&str>) -> String,
+    pub remote_host: String,
-	//pub remote_host: String,
     pub remote_port: String,
-	pub tls_config: TLSConfig,
+    pub ssl_private_key_path: Option<String>,
+    pub ssl_cert_path: Option<String>,
 }
 
 /// CallbackRet for blocking callback functions
@@ -173,15 +191,10 @@ pub enum CallbackRet {
 
 /// Callback functions a user may or may not implement.
 pub trait HandlerCallbacks {
-	fn ds_b_callback(&mut self, _in_data: Vec<u8>, _conn_id: u64) -> CallbackRet {
+    fn ds_b_callback(&mut self, _in_data: Vec<u8>) -> CallbackRet {CallbackRet::Relay(_in_data)}
-		CallbackRet::Relay(_in_data)
+    fn ds_nb_callback(&self, _in_data: Vec<u8>){}
-	}
+    fn us_b_callback(&mut self, _in_data: Vec<u8>) -> CallbackRet {CallbackRet::Relay(_in_data)}
-	fn ds_nb_callback(&self, _in_data: Vec<u8>, _conn_id: u64) {}
+    fn us_nb_callback(&self, _in_data: Vec<u8>){}
-	fn us_b_callback(&mut self, _in_data: Vec<u8>, _conn_id: u64) -> CallbackRet {
-		CallbackRet::Relay(_in_data)
-	}
-	fn us_nb_callback(&self, _in_data: Vec<u8>, _conn_id: u64) {}
-	fn set_server_name(&mut self, _server_name: Option<&str>) {}
 }
 
 /// The main SSLRelay object.
@@ -204,7 +217,6 @@ where
     ds_inner_m: Arc<Mutex<Option<DownStreamInner>>>,
     us_inner_m: Arc<Mutex<Option<UpStreamInner>>>,
     inner_handlers: InnerHandlers<H>,
-	conn_id: u64,
 }
 
 #[derive(Clone)]
@@ -212,15 +224,17 @@ struct InnerHandlers<H>
 where
     H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'static,
 {
-	cb: H,
+    cb: H
 }
 
-struct DownStreamInner {
+struct DownStreamInner
+{
     ds_stream: DataStreamType,
     internal_data_buffer: Vec<u8>,
 }
 
-struct UpStreamInner {
+struct UpStreamInner
+{
     us_stream: DataStreamType,
-	internal_data_buffer: Vec<u8>,
+    internal_data_buffer: Vec<u8>
 }

src/relay.rs

@@ -1,221 +1,208 @@
 //! SSLRelay
 
 use crate::{
-	thread, Arc, DataStreamType, FullDuplexTcp, HandlerCallbacks, InnerHandlers, PKey, Path,
+    SSLRelay,
-	RelayConfig, SSLRelay, SslAcceptor, SslFiletype, SslMethod, TCPDataType, TLSConfig,
+    HandlerCallbacks,
-	TcpListener, X509,
+    InnerHandlers,
+    TCPDataType,
+    ConfigType,
+    TcpListener,
+    thread,
+    FullDuplexTcp,
+    DataStreamType,
+    RelayConfig,
+    env,
+    TValue,
+    fs,
+    process,
+    Arc,
+    SslAcceptor,
+    Path,
+    SslMethod,
+    SslFiletype,
 };
 
 impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'static> SSLRelay<H> {
     /// Creates new SSLRelay instance.
-	pub fn new(handlers: H, config: RelayConfig) -> Self {
+    pub fn new(handlers: H, config: ConfigType<String>) -> Self {
+
         SSLRelay {
-			config,
+            config: Self::load_relay_config(config),
             handlers: Some(InnerHandlers{cb: handlers}),
         }
     }
     /// Starts the SSLRelay connection handling.
     pub fn start(&mut self) {
+
         let rhost = self.config.remote_host.clone();
         let rport = self.config.remote_port.clone();
+        let listener = TcpListener::bind(format!("{}:{}", self.config.bind_host.clone(), self.config.bind_port.clone())).unwrap();
         let upstream_data_stream_type = self.config.upstream_data_type;
 
-		let listener = TcpListener::bind(format!(
-			"{}:{}",
-			self.config.bind_host.clone(),
-			self.config.bind_port.clone()
-		))
-		.unwrap();
-
-		let mut conn_id = 0;
         match self.config.downstream_data_type {
+
             TCPDataType::TLS => {
-				let acceptor = self.setup_ssl_config(&self.config.tls_config);
+                let acceptor = self.setup_ssl_config(self.config.ssl_private_key_path.clone(), self.config.ssl_cert_path.clone());
 
                 for stream in listener.incoming() {
+        
                     match stream {
                         Ok(stream) => {
+        
                             let acceptor = acceptor.clone();
-							let mut handler_clone = self.handlers.as_ref().unwrap().clone();
-
-							let r_host = rhost.clone();
-							let r_port = rport.clone();
-
-							let this_conn_id = conn_id;
-							thread::spawn(move || {
-								match acceptor.accept(stream) {
-									Ok(stream) => {
-										let server_name = stream
-											.ssl()
-											.servername(openssl::ssl::NameType::HOST_NAME);
-										handler_clone.cb.set_server_name(server_name);
-										let remote_host = (r_host)(server_name);
-										
-										// FULL DUPLEX OBJECT CREATION HERE
-										match FullDuplexTcp::new(
-											DataStreamType::TLS(stream),
-											upstream_data_stream_type,
-											remote_host,
-											r_port,
-											handler_clone,
-											this_conn_id,
-										) {
-											Ok(mut fdtcp) => fdtcp.handle(),
-											Err(_ec) => {
-												println!(
-													"[SSLRelay Error] Failed to handle TCP(TLS) \
-													 connection: {}",
-													_ec
-												)
-											}
-										}
-									}
-									Err(e) => {
-										println!("[Error] {}", e);
-									}
-								}
-							});
-							conn_id += 1;
-						}
-						Err(e) => {
-							println!("[Error] Tcp Connection Failed: {}", e)
-						}
-					}
-				}
-			}
-
-			TCPDataType::RAW => {
-				for stream in listener.incoming() {
-					match stream {
-						Ok(stream) => {
                             let handler_clone = self.handlers.as_ref().unwrap().clone();
         
                             let r_host = rhost.clone();
                             let r_port = rport.clone();
         
-							let this_conn_id = conn_id;
                             thread::spawn(move || {
+        
+                                match acceptor.accept(stream) {
+                                    Ok(stream) => {
                                         // FULL DUPLEX OBJECT CREATION HERE
-								match FullDuplexTcp::new(
+                                       match FullDuplexTcp::new(DataStreamType::TLS(stream), upstream_data_stream_type, r_host, r_port, handler_clone) {
-									DataStreamType::RAW(stream),
-									upstream_data_stream_type,
-									(r_host)(None),
-									r_port,
-									handler_clone,
-									this_conn_id,
-								) {
                                            Ok(mut fdtcp) => fdtcp.handle(),
-									Err(_ec) => println!(
+                                           Err(_ec) => {}
-										"[SSLRelay Error] Failed to handle TCP connection: {}",
+                                       }
-										_ec
+                                    },
-									),
+                                    Err(e) => {
+        
+                                        println!("[Error] {}", e);
+                                    }
                                 }
                             });
-							conn_id += 1;
+                        },
+                        Err(e) => {println!("[Error] Tcp Connection Failed: {}", e)}
                     }
-						Err(e) => {
-							println!("[Error] Tcp Connection Failed: {}", e)
                 }
+            },
+
+            TCPDataType::RAW => {
+
+                for stream in listener.incoming() {
+        
+                    match stream {
+                        Ok(stream) => {
+        
+                            let handler_clone = self.handlers.as_ref().unwrap().clone();
+        
+                            let r_host = rhost.clone();
+                            let r_port = rport.clone();
+        
+                            thread::spawn(move || {
+    
+                                // FULL DUPLEX OBJECT CREATION HERE
+                                match FullDuplexTcp::new(DataStreamType::RAW(stream), upstream_data_stream_type, r_host, r_port, handler_clone) {
+                                    Ok(mut fdtcp) => fdtcp.handle(),
+                                    Err(_ec) => {},
+                                }
+
+                            });
+                        },
+                        Err(e) => {println!("[Error] Tcp Connection Failed: {}", e)}
                     }
                 }
             }
         }
     }
 
-	fn setup_ssl_config(&self, tls_config: &TLSConfig) -> Arc<SslAcceptor> {
+    fn load_relay_config(config: ConfigType<String>) -> RelayConfig {
+
+        let mut resolved_path = String::from("./relay_config.toml");
+        match config {
+            ConfigType::Path(path) => {
+                resolved_path = path.clone();
+            },
+            ConfigType::Env => {
+                resolved_path = match env::var("SSLRELAY_CONFIG") {
+                    Ok(p) => p.clone(),
+                    Err(_e) => {
+                        println!("[-] Environmental variable SSLRELAY_CONFIG does not exist.");
+                        std::process::exit(-1);
+                    }
+                };
+            },
+            ConfigType::Conf(conf) => {
+                return conf;
+            }
+            ConfigType::Default => {}
+        }
+
+        let bytes = fs::read(resolved_path).unwrap();
+        let config_file = String::from_utf8_lossy(&bytes);
+        let config_parsed = config_file.parse::<TValue>().unwrap();
+
+        let bind_host = config_parsed["bind_host"].to_string().replace("\"", "");
+        let bind_port = config_parsed["bind_port"].to_string().replace("\"", "");
+        let ssl_private_key_path = config_parsed["ssl_private_key_path"].to_string().replace("\"", "");
+        let ssl_cert_path = config_parsed["ssl_cert_path"].to_string().replace("\"", "");
+        let remote_host = config_parsed["remote_host"].to_string().replace("\"", "");
+        let remote_port = config_parsed["remote_port"].to_string().replace("\"", "");
+        let upstream_tls_conf = config_parsed["upstream_data_type"].to_string().replace("\"", "").to_lowercase();
+        let downstream_tls_conf = config_parsed["downstream_data_type"].to_string().replace("\"", "").to_lowercase();
+
+        let upstream_data_type: TCPDataType;
+        let downstream_data_type: TCPDataType;
+
+        if upstream_tls_conf == "tls" {
+            upstream_data_type = TCPDataType::TLS;
+        } else if upstream_tls_conf == "raw" {
+            upstream_data_type = TCPDataType::RAW;
+        } else {
+            panic!("[SSLRelay Error] Unrecognized TCPDataType for upstream_data_type. Data type received was not 'tcp' or 'tls'!");
+// Create error handling for load_relay_config()
+        }
+
+        if downstream_tls_conf == "tls" {
+            downstream_data_type = TCPDataType::TLS;
+        } else if downstream_tls_conf == "raw" {
+            downstream_data_type = TCPDataType::RAW;
+        } else {
+            panic!("[SSLRelay Error] Unrecognized TCPDataType for downstream_data_type. Data type received was not 'tcp' or 'tls'!");
+// Create error handling for load_relay_config()
+        }
+
+        let mut ssl_pk_path = None;
+        let mut ssl_c_path = None;
+
+        if !ssl_private_key_path.is_empty() {
+            ssl_pk_path = Some(ssl_private_key_path.clone());
+        }
+
+        if !ssl_cert_path.is_empty() {
+            ssl_c_path = Some(ssl_cert_path.clone());
+        }
+
+        RelayConfig {
+            upstream_data_type,
+            downstream_data_type,
+            bind_host: bind_host.clone(),
+            bind_port: bind_port.clone(),
+            ssl_private_key_path: ssl_pk_path,
+            ssl_cert_path: ssl_c_path,
+            remote_host: remote_host.clone(),
+            remote_port: remote_port.clone(),
+        }
+    }
+
+    fn setup_ssl_config(&self, priv_key: Option<String>, cert: Option<String>) -> Arc<SslAcceptor> {
+
         let mut acceptor = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap();
-		match tls_config {
+
-			TLSConfig::FILE {
+        let private_key = priv_key.expect("[SSLRelay Error] No private key file specified!");
-				certificate_path,
+        let certificate = cert.expect("[SSLRelay Error] No certificate file specified!");
-				private_key_path,
+        
-			} => {
+        if !Path::new(&private_key).exists() {
-				if !Path::new(&private_key_path).exists() {
+            panic!("[-] [{}] does not exist!", private_key);
-					panic!("[-] [{}] does not exist!", private_key_path);
         }
-				if !Path::new(&certificate_path).exists() {
+        acceptor.set_private_key_file(private_key, SslFiletype::PEM).unwrap();
-					panic!("[-] [{}] does not exist!", certificate_path);
+
+        if !Path::new(&certificate).exists() {
+            panic!("[-] [{}] does not exist!", certificate);
         }
-				acceptor
+        acceptor.set_certificate_chain_file(certificate).unwrap();
-					.set_private_key_file(private_key_path, SslFiletype::PEM)
+
-					.unwrap();
-				acceptor
-					.set_certificate_chain_file(certificate_path)
-					.unwrap();
         acceptor.check_private_key().unwrap();
-			}
-			TLSConfig::DATA {
-				certificate,
-				private_key,
-			} => {
-				let x_509_certificate = X509::from_pem(certificate.as_slice()).unwrap();
-				let private_key = PKey::private_key_from_pem(private_key.as_slice()).unwrap();
-				acceptor
-					.set_certificate(x_509_certificate.as_ref())
-					.unwrap();
-				acceptor.set_private_key(private_key.as_ref()).unwrap();
-			}
-			TLSConfig::NONE => {
-				panic!(
-					"[SSLRelay Error] Specified NONE for TLSConfig and downstream_data_type as \
-					 TLS."
-				);
-			}
-		}
         Arc::new(acceptor.build())
     }
-
-	// fn setup_ssl_config(&self, tls_configs: &[(&[&str], TLSConfig)]) -> AcceptorDb {
-	// 	let mut acceptor_db = AcceptorDb {
-	// 		acceptors: HashMap::new(),
-	// 	};
-	// 	for (names, tls_config) in tls_configs {
-	// 		let mut acceptor = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap();
-	// 	match tls_config {
-	// 		TLSConfig::FILE {
-	// 			certificate_path,
-	// 			private_key_path,
-	// 		} => {
-	// 			if !Path::new(&private_key_path).exists() {
-	// 				panic!("[-] [{}] does not exist!", private_key_path);
-	// 			}
-	// 			if !Path::new(&certificate_path).exists() {
-	// 				panic!("[-] [{}] does not exist!", certificate_path);
-	// 			}
-	// 			acceptor
-	// 				.set_private_key_file(private_key_path, SslFiletype::PEM)
-	// 				.unwrap();
-	// 			acceptor
-	// 				.set_certificate_chain_file(certificate_path)
-	// 				.unwrap();
-	// 			acceptor.check_private_key().unwrap();
-	// 		}
-	// 		TLSConfig::DATA {
-	// 			certificate,
-	// 			private_key,
-	// 		} => {
-	// 			let x_509_certificate = X509::from_pem(certificate.as_slice()).unwrap();
-	// 			let private_key = PKey::private_key_from_pem(private_key.as_slice()).unwrap();
-	// 			acceptor
-	// 				.set_certificate(x_509_certificate.as_ref())
-	// 				.unwrap();
-	// 			acceptor.set_private_key(private_key.as_ref()).unwrap();
-	// 		}
-	// 		TLSConfig::NONE => {
-	// 			panic!(
-	// 				"[SSLRelay Error] Specified NONE for TLSConfig and downstream_data_type as \
-	// 				 TLS."
-	// 			);
-	// 		}
-	// 	}
-	// 	let acceptor = Arc::new(acceptor.build());
-	// 	for name in *names {
-	// 		acceptor_db.acceptors.insert(name.to_string(), acceptor.clone());
-	// 	}
-	// }
-	// acceptor_db
-	// }
 }// SSLRelay
-
-// struct AcceptorDb {
-// acceptors: HashMap<String, Arc<SslAcceptor>>,
-// }

src/tcp.rs

@@ -1,76 +1,63 @@
 use crate::{
-	mpsc, thread, Arc, CallbackRet, DataPipe, DataStreamType, DownStreamInner, Duration,
+    FullDuplexTcp,
-	FullDuplexTcp, FullDuplexTcpState, HandlerCallbacks, InnerHandlers, Mutex, Receiver, Sender,
+    HandlerCallbacks,
-	Shutdown, SslConnector, SslMethod, SslVerifyMode, TCPDataType, TcpStream, UpStreamInner,
+    DataStreamType,
+    TCPDataType,
+    Duration,
+    Arc,
+    Mutex,
+    DownStreamInner,
+    UpStreamInner,
+    InnerHandlers,
+    Shutdown,
+    Sender,
+    Receiver,
+    FullDuplexTcpState,
+    DataPipe,
+    mpsc,
+    thread,
+    CallbackRet,
+    TcpStream,
+    SslVerifyMode,
+    SslConnector,
+    SslMethod,
 };
 
-impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'static>
+impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'static> FullDuplexTcp<H> {
-	FullDuplexTcp<H>
+
-{
+    pub fn new(ds_tcp_stream: DataStreamType, us_tcp_stream_type: TCPDataType, remote_host: String, remote_port: String, handlers: InnerHandlers<H>) -> Result<Self, i8> {
-	pub fn new(
+
-		ds_tcp_stream: DataStreamType,
-		us_tcp_stream_type: TCPDataType,
-		remote_host: String,
-		remote_port: String,
-		handlers: InnerHandlers<H>,
-		conn_id: u64,
-	) -> Result<Self, i8> {
         match ds_tcp_stream {
-			DataStreamType::RAW(ref s) => {
+            DataStreamType::RAW(ref s) => { let _ = s.set_read_timeout(Some(Duration::from_millis(50))); },
-				let _ = s.set_read_timeout(Some(Duration::from_millis(50)));
+            DataStreamType::TLS(ref s) => { let _ = s.get_ref().set_read_timeout(Some(Duration::from_millis(50))); },
-			}
-			DataStreamType::TLS(ref s) => {
-				let _ = s
-					.get_ref()
-					.set_read_timeout(Some(Duration::from_millis(50)));
-			}
         }
 
-		let us_tcp_stream = match Self::connect_endpoint(
+        let us_tcp_stream = match Self::connect_endpoint(us_tcp_stream_type, remote_host.clone(), remote_port.clone()) {
-			us_tcp_stream_type,
-			remote_host.clone(),
-			remote_port.clone(),
-		) {
             Ok(s) => s,
             Err(ec) => {
                 match ds_tcp_stream {
-					DataStreamType::RAW(s) => {
+                    DataStreamType::RAW(s) => { let _ = s.shutdown(Shutdown::Both); },
-						let _ = s.shutdown(Shutdown::Both);
+                    DataStreamType::TLS(mut s) => { let _ = s.shutdown(); },
-					}
-					DataStreamType::TLS(mut s) => {
-						let _ = s.shutdown();
-					}
                 }
                 return Err(ec);
             }
         };
 
-		Ok(FullDuplexTcp {
+        Ok(
+            FullDuplexTcp {
             remote_host,
             remote_port,
-			ds_inner_m: Arc::new(Mutex::new(Some(DownStreamInner {
+            ds_inner_m: Arc::new(Mutex::new(Some(DownStreamInner{ds_stream: ds_tcp_stream, internal_data_buffer: Vec::<u8>::new()}))),
-				ds_stream: ds_tcp_stream,
+            us_inner_m: Arc::new(Mutex::new(Some(UpStreamInner{us_stream: us_tcp_stream, internal_data_buffer: Vec::<u8>::new()}))),
-				internal_data_buffer: Vec::<u8>::new(),
-			}))),
-			us_inner_m: Arc::new(Mutex::new(Some(UpStreamInner {
-				us_stream: us_tcp_stream,
-				internal_data_buffer: Vec::<u8>::new(),
-			}))),
             inner_handlers: handlers,
-			conn_id,
         })
     }
 
     pub fn handle(&mut self) {
-		let conn_id = self.conn_id;
+
-		let (state_sender, state_receiver): (
+        let (state_sender, state_receiver): (Sender<FullDuplexTcpState>, Receiver<FullDuplexTcpState>) = mpsc::channel();
-			Sender<FullDuplexTcpState>,
+        let (ds_data_pipe_sender, ds_data_pipe_receiver): (Sender<DataPipe>, Receiver<DataPipe>) = mpsc::channel();
-			Receiver<FullDuplexTcpState>,
+        let (us_data_pipe_sender, us_data_pipe_receiver): (Sender<DataPipe>, Receiver<DataPipe>) = mpsc::channel();
-		) = mpsc::channel();
-		let (ds_data_pipe_sender, ds_data_pipe_receiver): (Sender<DataPipe>, Receiver<DataPipe>) =
-			mpsc::channel();
-		let (us_data_pipe_sender, us_data_pipe_receiver): (Sender<DataPipe>, Receiver<DataPipe>) =
-			mpsc::channel();
 
         let ds_method_pointer = self.ds_inner_m.clone();
         let ds_state_bc = state_sender.clone();
@@ -79,29 +66,22 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
         let us_state_bc = state_sender.clone();
 
         thread::spawn(move || {
-			ds_method_pointer
+            ds_method_pointer.lock().unwrap().take().unwrap().ds_handler(ds_state_bc, ds_data_pipe_receiver);
-				.lock()
-				.unwrap()
-				.take()
-				.unwrap()
-				.ds_handler(ds_state_bc, ds_data_pipe_receiver);
         });
 
         thread::spawn(move || {
-			us_method_pointer
+            us_method_pointer.lock().unwrap().take().unwrap().us_handler(us_state_bc, us_data_pipe_receiver);
-				.lock()
-				.unwrap()
-				.take()
-				.unwrap()
-				.us_handler(us_state_bc, us_data_pipe_receiver);
         });
 
         loop {
+
             match state_receiver.recv() {
                 Ok(state_request) => {
                     match state_request {
+
                         // DownStream Write Request
                         FullDuplexTcpState::DownStreamWrite(data) => {
+
                             /*
                                 Callbacks that work with data from UpStream go here
                                 Add callback return types for blocking callback subroutines
@@ -115,70 +95,43 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
                             let in_data = data.clone();
 
                             thread::spawn(move || {
-								inner_handlers_clone.cb.us_nb_callback(in_data, conn_id);
+                                inner_handlers_clone.cb.us_nb_callback(in_data);
                             });
 
-							match self.inner_handlers.cb.us_b_callback(data, conn_id) {
+                            match self.inner_handlers.cb.us_b_callback(data) {
                                 CallbackRet::Relay(retdata) => {
                                     match ds_data_pipe_sender.send(DataPipe::DataWrite(retdata)) {
-										Ok(()) => {}
+                                        Ok(()) => {},
                                         Err(e) => {
-											Self::handle_error(
+                                            Self::handle_error(format!("Failed to send data write to DownStream thread: {}", e).as_str());
-												format!(
-													"Failed to send data write to DownStream \
-													 thread: {}",
-													e
-												)
-												.as_str(),
-											);
                                             return;
                                         }
                                     }
-								}
+                                },
                                 CallbackRet::Spoof(retdata) => {
                                     match us_data_pipe_sender.send(DataPipe::DataWrite(retdata)) {
-										Ok(()) => {}
+                                        Ok(()) => {},
                                         Err(e) => {
-											Self::handle_error(
+                                            Self::handle_error(format!("Failed to send data write to DownStream thread: {}", e).as_str());
-												format!(
-													"Failed to send data write to DownStream \
-													 thread: {}",
-													e
-												)
-												.as_str(),
-											);
                                             return;
                                         }
                                     }
-								}
+                                },
-								CallbackRet::Freeze => {}
+                                CallbackRet::Freeze => {},
                                 CallbackRet::Shutdown => {
                                     if let Err(e) = us_data_pipe_sender.send(DataPipe::Shutdown) {
-										Self::handle_error(
+                                        Self::handle_error(format!("Failed to send Shutdown signal to UpStream thread: {}", e).as_str());
-											format!(
-												"Failed to send Shutdown signal to UpStream \
-												 thread: {}",
-												e
-											)
-											.as_str(),
-										);
                                     }
                                     if let Err(e) = ds_data_pipe_sender.send(DataPipe::Shutdown) {
-										Self::handle_error(
+                                        Self::handle_error(format!("Failed to send Shutdown signal to DownStream thread: {}", e).as_str());
-											format!(
-												"Failed to send Shutdown signal to DownStream \
-												 thread: {}",
-												e
-											)
-											.as_str(),
-										);
                                     }
                                     return;
                                 }
                             }
-						}
+                        },
                         // UpStream Write Request
                         FullDuplexTcpState::UpStreamWrite(data) => {
+
                             /*
                                 Callbacks that work with data from DownStream go here
                             */
@@ -187,111 +140,67 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
                             let in_data = data.clone();
 
                             thread::spawn(move || {
-								inner_handlers_clone.cb.ds_nb_callback(in_data, conn_id);
+                                inner_handlers_clone.cb.ds_nb_callback(in_data);
                             });
 
-							match self.inner_handlers.cb.ds_b_callback(data, conn_id) {
+                            match self.inner_handlers.cb.ds_b_callback(data) {
                                 CallbackRet::Relay(retdata) => {
                                     match us_data_pipe_sender.send(DataPipe::DataWrite(retdata)) {
-										Ok(()) => {}
+                                        Ok(()) => {},
                                         Err(e) => {
-											Self::handle_error(
+                                            Self::handle_error(format!("Failed to send data write to UpStream thread: {}", e).as_str());
-												format!(
-													"Failed to send data write to UpStream \
-													 thread: {}",
-													e
-												)
-												.as_str(),
-											);
                                             return;
                                         }
                                     }
-								}
+                                },
                                 CallbackRet::Spoof(retdata) => {
                                     match ds_data_pipe_sender.send(DataPipe::DataWrite(retdata)) {
-										Ok(()) => {}
+                                        Ok(()) => {},
                                         Err(e) => {
-											Self::handle_error(
+                                            Self::handle_error(format!("Failed to send data write to DownStream thread: {}", e).as_str());
-												format!(
-													"Failed to send data write to DownStream \
-													 thread: {}",
-													e
-												)
-												.as_str(),
-											);
                                             return;
                                         }
                                     }
-								}
+                                },
-								CallbackRet::Freeze => {}
+                                CallbackRet::Freeze => {},
                                 CallbackRet::Shutdown => {
                                     if let Err(e) = ds_data_pipe_sender.send(DataPipe::Shutdown) {
-										Self::handle_error(
+                                        Self::handle_error(format!("Failed to send Shutdown signal to DownStream thread: {}", e).as_str());
-											format!(
-												"Failed to send Shutdown signal to DownStream \
-												 thread: {}",
-												e
-											)
-											.as_str(),
-										);
                                     }
                                     if let Err(e) = us_data_pipe_sender.send(DataPipe::Shutdown) {
-										Self::handle_error(
+                                        Self::handle_error(format!("Failed to send Shutdown signal to UpStream thread: {}", e).as_str());
-											format!(
-												"Failed to send Shutdown signal to UpStream \
-												 thread: {}",
-												e
-											)
-											.as_str(),
-										);
                                     }
                                     return;
                                 }
                             }
-						}
+                        },
                         // DownStreamShutDown Request
                         FullDuplexTcpState::DownStreamShutDown => {
+
                             if let Err(e) = us_data_pipe_sender.send(DataPipe::Shutdown) {
-								Self::handle_error(
+                                Self::handle_error(format!("Failed to send Shutdown signal to UpStream thread: {}", e).as_str());
-									format!(
-										"Failed to send Shutdown signal to UpStream thread: {}",
-										e
-									)
-									.as_str(),
-								);
                                 return;
                             }
                             return;
-						}
+                        },
                         // UpStreamShutDown Request
                         FullDuplexTcpState::UpStreamShutDown => {
+
                             if let Err(e) = ds_data_pipe_sender.send(DataPipe::Shutdown) {
-								Self::handle_error(
+                                Self::handle_error(format!("Failed to send Shutdown signal to DownStream thread: {}", e).as_str());
-									format!(
-										"Failed to send Shutdown signal to DownStream thread: {}",
-										e
-									)
-									.as_str(),
-								);
                                 return;
                             }
                             return;
+                        },
                     }
-					}
+                },
-				}
                 Err(_e) => {
                     Self::handle_error("State receiver communication channel has closed!");
                     if let Err(e) = ds_data_pipe_sender.send(DataPipe::Shutdown) {
-						Self::handle_error(
+                        Self::handle_error(format!("Failed to send Shutdown signal to DownStream thread: {}", e).as_str());
-							format!("Failed to send Shutdown signal to DownStream thread: {}", e)
-								.as_str(),
-						);
                     }
                     if let Err(e) = us_data_pipe_sender.send(DataPipe::Shutdown) {
-						Self::handle_error(
+                        Self::handle_error(format!("Failed to send Shutdown signal to UpStream thread: {}", e).as_str());
-							format!("Failed to send Shutdown signal to UpStream thread: {}", e)
-								.as_str(),
-						);
                     }
                     return;
                 }
@@ -299,31 +208,24 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
         }
     }
     
-	fn connect_endpoint(
+    fn connect_endpoint(stream_data_type: TCPDataType, remote_host: String, remote_port: String) -> Result<DataStreamType, i8> {
-		stream_data_type: TCPDataType,
+
-		remote_host: String,
-		remote_port: String,
-	) -> Result<DataStreamType, i8> {
         match stream_data_type {
+
             TCPDataType::RAW => {
                 let s = match TcpStream::connect(format!("{}:{}", remote_host, remote_port)) {
                     Ok(s) => s,
                     Err(e) => {
-						Self::handle_error(
+                        Self::handle_error(format!("Can't connect to remote host: {}\nErr: {}", format!("{}:{}", remote_host, remote_port), e).as_str());
-							format!(
-								"Can't connect to remote host: {}\nErr: {}",
-								format!("{}:{}", remote_host, remote_port),
-								e
-							)
-							.as_str(),
-						);
                         return Result::Err(-1);
                     }
                 };
                 let _ = s.set_read_timeout(Some(Duration::from_millis(50)));
                 return Ok(DataStreamType::RAW(s));
-			}
+
+            },
             TCPDataType::TLS => {
+
                 let mut sslbuilder = SslConnector::builder(SslMethod::tls()).unwrap();
                 sslbuilder.set_verify(SslVerifyMode::NONE);
         
@@ -332,14 +234,7 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
                 let s = match TcpStream::connect(format!("{}:{}", remote_host, remote_port)) {
                     Ok(s) => s,
                     Err(e) => {
-						Self::handle_error(
+                        Self::handle_error(format!("Can't connect to remote host: {}\nErr: {}", format!("{}:{}", remote_host, remote_port), e).as_str());
-							format!(
-								"Can't connect to remote host: {}\nErr: {}",
-								format!("{}:{}", remote_host, remote_port),
-								e
-							)
-							.as_str(),
-						);
                         return Result::Err(-1);
                     }
                 };
@@ -347,16 +242,12 @@ impl<H: HandlerCallbacks + std::marker::Sync + std::marker::Send + Clone + 'stat
                 let s = match connector.connect(remote_host.as_str(), s) {
                     Ok(s) => s,
                     Err(e) => {
-						Self::handle_error(
+                        Self::handle_error(format!("Failed to accept TLS/SSL handshake: {}", e).as_str());
-							format!("Failed to accept TLS/SSL handshake: {}", e).as_str(),
-						);
                         return Result::Err(-2);
                     }
                 };
 
-				let _ = s
+                let _ = s.get_ref().set_read_timeout(Some(Duration::from_millis(50)));
-					.get_ref()
-					.set_read_timeout(Some(Duration::from_millis(50)));
                 return Ok(DataStreamType::TLS(s));
             }
         }