rustdesk/rustdesk-server
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk-server.git synced 2026-06-18 06:41:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/open-trade/hbbs

Browse Source
This commit is contained in:
opentrade
2021-04-08 17:54:21 +08:00
parent 25554dd318 34a55668f3
commit 918dfc3bdd
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rendezvous_server.rs
+16 -13
View File
@@ -332,6 +332,8 @@ impl RendezvousServer {
let mut res = register_pk_response::Result::OK; let mut res = register_pk_response::Result::OK;
if !id_change_support { if !id_change_support {
res = register_pk_response::Result::NOT_SUPPORT; res = register_pk_response::Result::NOT_SUPPORT;
} else if !hbb_common::is_valid_custom_id(&rk.id) {
res = register_pk_response::Result::INVALID_ID_FORMAT;
} else if let Some(peer) = rs.pm.get(&rk.id).await { } else if let Some(peer) = rs.pm.get(&rk.id).await {
if peer.uuid != rk.uuid { if peer.uuid != rk.uuid {
res = register_pk_response::Result::ID_EXISTS; res = register_pk_response::Result::ID_EXISTS;
@@ -398,9 +400,7 @@ impl RendezvousServer {
} }
let id = rk.id; let id = rk.id;
let mut res = register_pk_response::Result::OK; let mut res = register_pk_response::Result::OK;
if !hbb_common::is_valid_custom_id(&id) { if let Some(peer) = self.pm.get(&id).await {
res = register_pk_response::Result::INVALID_ID_FORMAT;
} else if let Some(peer) = self.pm.get(&id).await {
if peer.uuid != rk.uuid { if peer.uuid != rk.uuid {
log::warn!( log::warn!(
"Peer {} uuid mismatch: {:?} vs {:?}", "Peer {} uuid mismatch: {:?} vs {:?}",
@@ -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()
}); });
} }