diff --git a/Cargo.lock b/Cargo.lock index db54f03..e7d20e0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "realm" -version = "0.1.0" +version = "1.0.1" dependencies = [ "futures", "structopt", diff --git a/Cargo.toml b/Cargo.toml index 7b396dd..e85e617 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "realm" -version = "0.1.0" +version = "1.0.1" authors = ["zhboner "] edition = "2018" diff --git a/src/relay.rs b/src/relay.rs index a52da9b..779449c 100644 --- a/src/relay.rs +++ b/src/relay.rs @@ -1,10 +1,10 @@ use futures::future::try_join; use futures::FutureExt; use std::error::Error; -use std::net::{SocketAddr, IpAddr}; +use std::net::{IpAddr, SocketAddr}; use std::sync::mpsc; +use std::sync::{Arc, RwLock}; use std::thread; -use std::sync::{RwLock, Arc}; use tokio; use tokio::io; use tokio::net; @@ -20,10 +20,10 @@ pub async fn start_relay(config: RelayConfig) { let remote_ip = Arc::new(RwLock::new(default_ip.clone())); let resolver_ip = remote_ip.clone(); thread::spawn(move || resolver::dns_resolve(remote_addr, resolver_ip)); - + loop { if *(remote_ip.read().unwrap()) != default_ip { - break + break; } } @@ -40,9 +40,10 @@ pub async fn run( .unwrap(); let mut tcp_listener = net::TcpListener::bind(&client_socket).await?; - let mut remote_socket: SocketAddr = format!("{}:{}", remote_ip.read().unwrap(), config.remote_port) - .parse() - .unwrap(); + let mut remote_socket: SocketAddr = + format!("{}:{}", remote_ip.read().unwrap(), config.remote_port) + .parse() + .unwrap(); // Start UDP connection let udp_remote_ip = remote_ip.clone(); @@ -66,24 +67,26 @@ pub async fn run( // Two thread here // 1. Receive packets and justify the forward destination. Then send packets to the second thread // 2. Send all packets instructed by the first thread -fn udp_transfer(local_socket: SocketAddr, remote_port: u16, remote_ip: Arc>) -> Result<(), io::Error> { +fn udp_transfer( + local_socket: SocketAddr, + remote_port: u16, + remote_ip: Arc>, +) -> Result<(), io::Error> { let sender = std::net::UdpSocket::bind(&local_socket).unwrap(); let receiver = sender.try_clone().unwrap(); let mut sender_vec = Vec::new(); let (packet_sender, packet_receiver) = mpsc::channel::<([u8; 2048], usize, SocketAddr)>(); // Start a new thread to send out packets - thread::spawn(move || { - loop { - if let Ok((data, size, client)) = packet_receiver.recv() { - if let Err(e) = sender.send_to(&data[..size], client) { - println!("failed to send out UDP packet, {}", e); - } + thread::spawn(move || loop { + if let Ok((data, size, client)) = packet_receiver.recv() { + if let Err(e) = sender.send_to(&data[..size], client) { + println!("failed to send out UDP packet, {}", e); } } }); - // Receive packets + // Receive packets // Storing source ip in a FIFO queue to justify the forward destination // Send instruction to the above thread loop { @@ -91,16 +94,22 @@ fn udp_transfer(local_socket: SocketAddr, remote_port: u16, remote_ip: Arc { // forward + true => { + // forward sender_vec.push(from); - packet_sender.send((buf, size, remote_socket.clone())).unwrap(); + packet_sender + .send((buf, size, remote_socket.clone())) + .unwrap(); } - false => { // backward - if sender_vec.len() < 1 {continue} + false => { + // backward + if sender_vec.len() < 1 { + continue; + } let client_socket = sender_vec.remove(0); packet_sender.send((buf, size, client_socket)).unwrap(); } diff --git a/src/resolver.rs b/src/resolver.rs index c2762c9..54cb9a8 100644 --- a/src/resolver.rs +++ b/src/resolver.rs @@ -1,7 +1,7 @@ use std::net; +use std::sync::{Arc, RwLock}; use std::thread::sleep; use std::time::Duration; -use std::sync::{RwLock, Arc}; use trust_dns_resolver::config::*; use trust_dns_resolver::Resolver; @@ -9,7 +9,7 @@ fn need_resolve(addr: &str) -> bool { addr.parse::().is_err() } -pub fn dns_resolve(addr: String, ip: Arc>) { +pub fn dns_resolve(addr: String, ip: Arc>) { let mut cache = "0.0.0.0".parse::().unwrap(); if !need_resolve(&addr) {