Skip to content

Commit 70661d9

Browse files
committed
remove uncessary info
1 parent 97e151b commit 70661d9

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

src/relay.rs

+1-15
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ use std::net::{IpAddr, SocketAddr};
66
use std::sync::mpsc;
77
use std::sync::{Arc, RwLock};
88
use std::thread;
9-
use std::thread::sleep;
10-
use std::time::Duration;
119
use tokio;
1210
use tokio::io;
1311
use tokio::net;
@@ -24,15 +22,12 @@ pub async fn start_relay(configs: Vec<RelayConfig>) {
2422

2523
let mut remote_ips: Vec<Arc<RwLock<std::net::IpAddr>>> = Vec::new();
2624
for _ in 0..remote_addrs.len() {
27-
remote_ips.push(
28-
Arc::new(RwLock::new(default_ip.clone()))
29-
)
25+
remote_ips.push(Arc::new(RwLock::new(default_ip.clone())))
3026
}
3127
let cloned_remote_ips = remote_ips.clone();
3228

3329
thread::spawn(move || resolver::resolve(remote_addrs, cloned_remote_ips));
3430

35-
// sleep(Duration::from_secs(3));
3631
resolver::print_ips(&remote_ips);
3732

3833
let mut iter = configs.into_iter().zip(remote_ips);
@@ -62,14 +57,6 @@ pub async fn run(config: RelayConfig, remote_ip: Arc<RwLock<IpAddr>>) {
6257
thread::spawn(move || udp_transfer(client_socket.clone(), remote_socket.port(), udp_remote_ip));
6358

6459
// Start TCP connection
65-
println!(
66-
"[success] Started {}:{} -> {}:{}",
67-
config.listening_address,
68-
config.listening_port,
69-
&(remote_ip.read().unwrap()),
70-
config.remote_port
71-
);
72-
7360
while let Ok((inbound, _)) = tcp_listener.accept().await {
7461
remote_socket = format!("{}:{}", &(remote_ip.read().unwrap()), config.remote_port)
7562
.parse()
@@ -151,4 +138,3 @@ async fn transfer_tcp(
151138

152139
Ok(())
153140
}
154-

src/resolver.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,18 @@ pub fn resolve(addr_list: Vec<String>, ip_list: Vec<Arc<RwLock<net::IpAddr>>>) {
3838
loop {
3939
for (i, addr) in addr_list.iter().enumerate() {
4040
if let Some(new_ip) = resolve_single(&resolver, addr) {
41-
println!("Resolving {}", i);
4241
if new_ip != cache_list[i] {
4342
cache_list[i] = new_ip;
4443
let mut w = ip_list[i].write().unwrap();
4544
*w = new_ip;
4645
drop(w);
4746
println!("Resolved {}: {}", addr, new_ip);
48-
// println!("ip_list[{}]: {}", i, *w);
49-
print_ips(&ip_list);
5047
}
5148
} else {
5249
println!("Cannot resolve address {}", addr);
5350
}
5451
}
55-
52+
5653
sleep(Duration::from_secs(60));
5754
}
5855
}

0 commit comments

Comments
 (0)