hatter/simple-rust-udp-proxy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

style: changestyle

Browse Source
This commit is contained in:
Hatter Jiang
2020-09-06 00:31:37 +08:00
parent b8f001471f
commit b0b9d16cf1
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.rs
View File

@@ -14,7 +14,6 @@ use std::thread;
use std::time::Duration; use std::time::Duration;
const TIMEOUT: u64 = 3 * 60 * 100; //3 minutes const TIMEOUT: u64 = 3 * 60 * 100; //3 minutes
static mut DEBUG: bool = false;
fn print_usage(program: &str, opts: Options) { fn print_usage(program: &str, opts: Options) {
let program_path = std::path::PathBuf::from(program); let program_path = std::path::PathBuf::from(program);
@@ -52,9 +51,6 @@ fn main() {
std::process::exit(-1); std::process::exit(-1);
}); });
unsafe {
DEBUG = matches.opt_present("d");
}
let local_port: i32 = matches.opt_str("l").unwrap().parse().unwrap(); let local_port: i32 = matches.opt_str("l").unwrap().parse().unwrap();
let remote_port: i32 = matches.opt_str("r").unwrap().parse().unwrap(); let remote_port: i32 = matches.opt_str("r").unwrap().parse().unwrap();
let remote_host = matches.opt_str("h").unwrap(); let remote_host = matches.opt_str("h").unwrap();
@@ -73,8 +69,7 @@ fn forward(bind_addr: &str, local_port: i32, remote_host: &str, remote_port: i32
let remote_addr = format!("{}:{}", remote_host, remote_port); let remote_addr = format!("{}:{}", remote_host, remote_port);
let responder = local let responder = local.try_clone()
.try_clone()
.unwrap_or_else(|_| panic!("Failed to clone primary listening address socket {}", local.local_addr().unwrap())); .unwrap_or_else(|_| panic!("Failed to clone primary listening address socket {}", local.local_addr().unwrap()));
let (main_sender, main_receiver) = channel::<(_, Vec<u8>)>(); let (main_sender, main_receiver) = channel::<(_, Vec<u8>)>();
thread::spawn(move || { thread::spawn(move || {
@@ -82,8 +77,7 @@ fn forward(bind_addr: &str, local_port: i32, remote_host: &str, remote_port: i32
loop { loop {
let (dest, buf) = main_receiver.recv().unwrap(); let (dest, buf) = main_receiver.recv().unwrap();
let to_send = buf.as_slice(); let to_send = buf.as_slice();
responder responder.send_to(to_send, dest)
.send_to(to_send, dest)
.unwrap_or_else(|_| panic!("Failed to forward response from upstream server to client {}", dest)); .unwrap_or_else(|_| panic!("Failed to forward response from upstream server to client {}", dest));
} }
}); });
@@ -171,9 +165,7 @@ fn forward(bind_addr: &str, local_port: i32, remote_host: &str, remote_port: i32
let to_send = buf[..num_bytes].to_vec(); let to_send = buf[..num_bytes].to_vec();
match sender.send(to_send) { match sender.send(to_send) {
Ok(_) => { Ok(_) => break,
break;
}
Err(_) => { Err(_) => {
if !ignore_failure { if !ignore_failure {
panic!("Failed to send message to datagram forwarder for client {}", client_id); panic!("Failed to send message to datagram forwarder for client {}", client_id);
@@ -187,4 +179,3 @@ fn forward(bind_addr: &str, local_port: i32, remote_host: &str, remote_port: i32
} }
} }
} }