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

chore: code style

Browse Source
This commit is contained in:
Hatter Jiang
2020-09-13 10:01:25 +08:00
parent 96b3ca62ea
commit 552f44ab10
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@@ -124,9 +124,9 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]]
name = "getrandom"
version = "0.1.14"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
dependencies = [
"cfg-if",
"libc",
@@ -150,9 +150,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.76"
version = "0.2.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3"
checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"
[[package]]
name = "rand"
@@ -232,9 +232,9 @@ dependencies = [
[[package]]
name = "rust_util"
version = "0.6.7"
version = "0.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47a20a379d025a6f0da1bc84d6284137eea58c493484bf6912144a864f53c3de"
checksum = "c261320f663e65d0869f77036c454f627e82eecbd574946e6eb55a97d3dc490c"
dependencies = [
"lazy_static",
"libc",

38
src/main.rs
View File

@@ -12,6 +12,7 @@ use std::thread;
use std::time::Duration;
use clap::{ Arg, App };
const LOCAL_ADDR: &str = "127.0.0.1";
const TIMEOUT: u64 = 3 * 60 * 100; //3 minutes
fn main() {
@@ -31,34 +32,37 @@ fn main() {
.arg(Arg::with_name("allowed_list").short("A").long("allowed-list").takes_value(true).multiple(true).help("Allowed IP list, e.g. 127.0.0.1, 120.0.0.0/8"))
.get_matches();
let local_port: i32 = matches.value_of("local_port").unwrap().parse().unwrap();
let remote_port: i32 = matches.value_of("remote_port").unwrap().parse().unwrap();
let local_port: u16 = matches.value_of("local_port").unwrap().parse().unwrap();
let remote_port: u16 = matches.value_of("remote_port").unwrap().parse().unwrap();
let remote_host = matches.value_of("host").unwrap();
let bind_addr = match matches.value_of("bind") {
Some(addr) => addr.to_owned(),
None => "127.0.0.1".to_owned(),
None => LOCAL_ADDR.to_owned(),
};
forward(&bind_addr, local_port, &remote_host, remote_port);
}
fn forward(bind_addr: &str, local_port: i32, remote_host: &str, remote_port: i32) {
fn forward(bind_addr: &str, local_port: u16, remote_host: &str, remote_port: u16) {
let local_addr = format!("{}:{}", bind_addr, local_port);
debugging!("Listen address and port: {}", local_addr);
let local = UdpSocket::bind(&local_addr).unwrap_or_else(|_| panic!("Unable to bind to {}", &local_addr));
information!("Listening on {}", local.local_addr().unwrap());
let remote_addr = format!("{}:{}", remote_host, remote_port);
let responder = local.try_clone()
.unwrap_or_else(|_| panic!("Failed to clone primary listening address socket {}", local.local_addr().unwrap()));
let responder = local.try_clone().unwrap_or_else(
|_| panic!("Failed to clone primary listening address socket {}", local.local_addr().unwrap())
);
let (main_sender, main_receiver) = channel::<(_, Vec<u8>)>();
thread::spawn(move || {
debugging!("Started new thread to deal out responses to clients");
loop {
let (dest, buf) = main_receiver.recv().unwrap();
let to_send = buf.as_slice();
responder.send_to(to_send, dest)
.unwrap_or_else(|_| panic!("Failed to forward response from upstream server to client {}", dest));
responder.send_to(to_send, dest).unwrap_or_else(
|_| panic!("Failed to forward response from upstream server to client {}", dest)
);
}
});
@@ -94,10 +98,12 @@ fn forward(bind_addr: &str, local_port: i32, remote_host: &str, remote_port: i32
//connection to 0.0.0.0 in all cases.
let temp_outgoing_addr = format!("0.0.0.0:{}", 1024 + rand::random::<u16>());
debugging!("Establishing new forwarder for client {} on {}", src_addr, &temp_outgoing_addr);
let upstream_send = UdpSocket::bind(&temp_outgoing_addr)
.unwrap_or_else(|_| panic!("Failed to bind to transient address {}", &temp_outgoing_addr));
let upstream_recv = upstream_send.try_clone()
.unwrap_or_else(|_| panic!("Failed to clone client-specific connection to upstream!"));
let upstream_send = UdpSocket::bind(&temp_outgoing_addr).unwrap_or_else(
|_| panic!("Failed to bind to transient address {}", &temp_outgoing_addr)
);
let upstream_recv = upstream_send.try_clone().unwrap_or_else(
|_| panic!("Failed to clone client-specific connection to upstream!")
);
let mut timeouts : u64 = 0;
let timed_out = Arc::new(AtomicBool::new(false));
@@ -110,8 +116,7 @@ fn forward(bind_addr: &str, local_port: i32, remote_host: &str, remote_port: i32
match upstream_recv.recv_from(&mut from_upstream) {
Ok((bytes_rcvd, _)) => {
let to_send = from_upstream[..bytes_rcvd].to_vec();
local_send_queue.send((src_addr, to_send))
.expect("Failed to queue response from upstream server for forwarding!");
local_send_queue.send((src_addr, to_send)).expect("Failed to queue response from upstream server for forwarding!");
},
Err(_) => {
if local_timed_out.load(Ordering::Relaxed) {
@@ -126,8 +131,9 @@ fn forward(bind_addr: &str, local_port: i32, remote_host: &str, remote_port: i32
loop {
match receiver.recv_timeout(Duration::from_millis(TIMEOUT)) {
Ok(from_client) => {
upstream_send.send_to(from_client.as_slice(), &remote_addr_copy)
.unwrap_or_else(|_| panic!("Failed to forward packet from client {} to upstream server!", src_addr));
upstream_send.send_to(from_client.as_slice(), &remote_addr_copy).unwrap_or_else(
|_| panic!("Failed to forward packet from client {} to upstream server!", src_addr)
);
timeouts = 0; //reset timeout count
},
Err(_) => {