@@ -6,8 +6,6 @@ use std::net::{IpAddr, SocketAddr};
6
6
use std:: sync:: mpsc;
7
7
use std:: sync:: { Arc , RwLock } ;
8
8
use std:: thread;
9
- use std:: thread:: sleep;
10
- use std:: time:: Duration ;
11
9
use tokio;
12
10
use tokio:: io;
13
11
use tokio:: net;
@@ -24,15 +22,12 @@ pub async fn start_relay(configs: Vec<RelayConfig>) {
24
22
25
23
let mut remote_ips: Vec < Arc < RwLock < std:: net:: IpAddr > > > = Vec :: new ( ) ;
26
24
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 ( ) ) ) )
30
26
}
31
27
let cloned_remote_ips = remote_ips. clone ( ) ;
32
28
33
29
thread:: spawn ( move || resolver:: resolve ( remote_addrs, cloned_remote_ips) ) ;
34
30
35
- // sleep(Duration::from_secs(3));
36
31
resolver:: print_ips ( & remote_ips) ;
37
32
38
33
let mut iter = configs. into_iter ( ) . zip ( remote_ips) ;
@@ -62,14 +57,6 @@ pub async fn run(config: RelayConfig, remote_ip: Arc<RwLock<IpAddr>>) {
62
57
thread:: spawn ( move || udp_transfer ( client_socket. clone ( ) , remote_socket. port ( ) , udp_remote_ip) ) ;
63
58
64
59
// 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
-
73
60
while let Ok ( ( inbound, _) ) = tcp_listener. accept ( ) . await {
74
61
remote_socket = format ! ( "{}:{}" , & ( remote_ip. read( ) . unwrap( ) ) , config. remote_port)
75
62
. parse ( )
@@ -151,4 +138,3 @@ async fn transfer_tcp(
151
138
152
139
Ok ( ( ) )
153
140
}
154
-
0 commit comments