rustdesk/rustdesk-server
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk-server.git synced 2025-07-04 00:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
open-trade 2021-04-08 14:52:30 +08:00
parent c7bac6b859
commit 34a55668f3
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/rendezvous_server.rs
View File

@ -640,6 +640,17 @@ impl RendezvousServer {
}, },
}; };
let socket_addr = AddrMangle::encode(addr); let socket_addr = AddrMangle::encode(addr);
let relay_server = {
if self.relay_servers.is_empty() {
"".to_owned()
} else {
let i = unsafe {
ROTATION_RELAY_SERVER += 1;
ROTATION_RELAY_SERVER % self.relay_servers.len()
};
self.relay_servers[i].clone()
}
};
if same_intranet { if same_intranet {
log::debug!( log::debug!(
"Fetch local addr {:?} {:?} request from {:?}", "Fetch local addr {:?} {:?} request from {:?}",
@ -647,13 +658,9 @@ impl RendezvousServer {
&peer.socket_addr, &peer.socket_addr,
&addr &addr
); );
let i = unsafe {
ROTATION_RELAY_SERVER += 1;
ROTATION_RELAY_SERVER % self.relay_servers.len()
};
msg_out.set_fetch_local_addr(FetchLocalAddr { msg_out.set_fetch_local_addr(FetchLocalAddr {
socket_addr, socket_addr,
relay_server: self.relay_servers[i].clone(), relay_server,
..Default::default() ..Default::default()
}); });
} else { } else {
@ -663,14 +670,10 @@ impl RendezvousServer {
&peer.socket_addr, &peer.socket_addr,
&addr &addr
); );
let i = unsafe {
ROTATION_RELAY_SERVER += 1;
ROTATION_RELAY_SERVER % self.relay_servers.len()
};
msg_out.set_punch_hole(PunchHole { msg_out.set_punch_hole(PunchHole {
socket_addr, socket_addr,
nat_type: ph.nat_type, nat_type: ph.nat_type,
relay_server: self.relay_servers[i].clone(), relay_server,
..Default::default() ..Default::default()
}); });
} }