From dcbb6ae9ed1b37e286bd6475859c686523ce7247 Mon Sep 17 00:00:00 2001 From: PinkP4nther <0x0090@protonmail.com> Date: Thu, 19 Aug 2021 15:17:10 -0700 Subject: [PATCH] Formatting some stuff / cleaned up --- src/data.rs | 4 ---- src/http.rs | 12 +++++------- src/lib.rs | 2 -- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/data.rs b/src/data.rs index 664c81a..dc5ad44 100644 --- a/src/data.rs +++ b/src/data.rs @@ -128,12 +128,8 @@ impl DataHandler { stream.write_all(&data).unwrap(); let _ = stream.flush(); - //println!("[+] Relayed -> {}", host); - - //return Some(stream); Instead of returning we will now set stream object self.relay_stream = Some(stream); return Some(0); } } - } // DataHandler \ No newline at end of file diff --git a/src/http.rs b/src/http.rs index 89e641a..3565213 100644 --- a/src/http.rs +++ b/src/http.rs @@ -21,8 +21,8 @@ pub struct RelayRequest<'a> { http_body: Option, } -/* -fn get_req_headers<'a>(&self, data: &'a Vec) -> Option>> { +/* Unused HTTP helper functions +pub fn get_req_headers<'a>(data: &'a Vec) -> Option>> { let mut headers = [httparse::EMPTY_HEADER; 128]; let mut request = httparse::Request::new(&mut headers); @@ -35,7 +35,7 @@ fn get_req_headers<'a>(&self, data: &'a Vec) -> Option>> { None } -fn get_res_headers(data: &Vec) -> Option> { +pub fn get_res_headers(data: &Vec) -> Option> { let mut headers = [httparse::EMPTY_HEADER; 128]; let mut response = httparse::Response::new(&mut headers); @@ -48,7 +48,7 @@ fn get_res_headers(data: &Vec) -> Option> { None } -fn get_host(&self, data: &Vec) -> Option { +pub fn get_host(data: &Vec) -> Option { return Some("137.220.37.67".to_string()); let mut headers = [httparse::EMPTY_HEADER; 128]; @@ -78,7 +78,7 @@ fn get_host(&self, data: &Vec) -> Option { } } -fn get_cookie(&self, data: &Vec) -> Option { +pub fn get_cookie(data: &Vec) -> Option { let mut headers = [httparse::EMPTY_HEADER; 128]; @@ -107,7 +107,6 @@ fn get_cookie(&self, data: &Vec) -> Option { } } */ - pub fn http_req_verbose(data: &Vec, mode: u8) { let req_info = get_request(&data); @@ -306,7 +305,6 @@ pub fn get_http_body(data: &Vec, headers: Vec
) -> Option> { } else { return Some(blob); } - } } } diff --git a/src/lib.rs b/src/lib.rs index 6b8e1ff..87da6b3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -23,7 +23,6 @@ struct RelayConfig { ssl_private_key_path: String, ssl_cert_path: String, verbose_level: i8, - } pub trait HandlerCallbacks { @@ -44,7 +43,6 @@ pub struct SSLRelay where H: HandlerCallbacks + std::marker::Sync + std::marker::Send + 'static, { - config: Option, handlers: Option, }