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

remove uuid back compatibility

Browse Source
This commit is contained in:
opentrade 2021-04-06 16:18:09 +08:00
parent 2648a45f33
commit 5e0f429e84
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hbb_common

@ -1 +1 @@
Subproject commit 002939a1037c786d2651a779492a7c813ea4e54a Subproject commit 7bf9906c1fabc2e4437871715db4ef7883fca3d4

25
src/rendezvous_server.rs
View File

@ -321,6 +321,27 @@ impl RendezvousServer {
} }
break; break;
} }
Some(rendezvous_message::Union::register_pk(rk)) => {
if rk.uuid.is_empty() {
break;
}
let mut res = register_pk_response::Result::OK;
if let Some(peer) = rs.pm.get(&rk.id).await {
if peer.uuid != rk.uuid {
res = register_pk_response::Result::ID_EXISTS;
}
}
let mut msg_out = RendezvousMessage::new();
msg_out.set_register_pk_response(RegisterPkResponse {
result: res.into(),
..Default::default()
});
if let Some(tcp) = sender.as_mut() {
if let Ok(bytes) = msg_out.write_to_bytes() {
allow_err!(tcp.send(Bytes::from(bytes)).await);
}
}
}
_ => { _ => {
break; break;
} }
@ -372,7 +393,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 let Some(peer) = self.pm.get(&id).await { if let Some(peer) = self.pm.get(&id).await {
if !peer.uuid.is_empty() && peer.uuid != rk.uuid { if peer.uuid != rk.uuid {
log::warn!( log::warn!(
"Peer {} uuid mismatch: {:?} vs {:?}", "Peer {} uuid mismatch: {:?} vs {:?}",
id, id,
@ -380,7 +401,7 @@ impl RendezvousServer {
peer.uuid peer.uuid
); );
res = register_pk_response::Result::UUID_MISMATCH; res = register_pk_response::Result::UUID_MISMATCH;
} else if peer.uuid.is_empty() || peer.pk != rk.pk { } else if peer.pk != rk.pk {
self.pm.update_pk(id, addr, rk.uuid, rk.pk); self.pm.update_pk(id, addr, rk.uuid, rk.pk);
} }
} else { } else {