acdiu/rustdesk-server
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk-server.git synced 2026-05-25 23:59:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

more log for debugging pk mismatch

Browse Source
This commit is contained in:
open-trade
2020-09-04 11:32:42 +08:00
parent 41c58538b5
commit 8295278479
3 changed files with 229 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

571
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
libs/hbb_common

Submodule libs/hbb_common updated: 45ef8cd75f...3ac832109b

7
src/rendezvous_server.rs
View File

@@ -7,7 +7,7 @@ use hbb_common::{
stream::{SplitSink, StreamExt}, stream::{SplitSink, StreamExt},
}, },
log, log,
protobuf::{parse_from_bytes, Message as _}, protobuf::Message as _,
rendezvous_proto::*, rendezvous_proto::*,
tcp::new_listener, tcp::new_listener,
tokio::{self, net::TcpStream, sync::mpsc}, tokio::{self, net::TcpStream, sync::mpsc},
@@ -144,7 +144,7 @@ impl RendezvousServer {
let mut rs = rs.clone(); let mut rs = rs.clone();
tokio::spawn(async move { tokio::spawn(async move {
while let Some(Ok(bytes)) = b.next().await { while let Some(Ok(bytes)) = b.next().await {
if let Ok(msg_in) = parse_from_bytes::<RendezvousMessage>(&bytes) { if let Ok(msg_in) = RendezvousMessage::parse_from_bytes(&bytes) {
match msg_in.union { match msg_in.union {
Some(rendezvous_message::Union::punch_hole_request(ph)) => { Some(rendezvous_message::Union::punch_hole_request(ph)) => {
allow_err!(rs.handle_tcp_punch_hole_request(addr, ph.id).await); allow_err!(rs.handle_tcp_punch_hole_request(addr, ph.id).await);
@@ -176,7 +176,7 @@ impl RendezvousServer {
addr: SocketAddr, addr: SocketAddr,
socket: &mut FramedSocket, socket: &mut FramedSocket,
) -> ResultType<()> { ) -> ResultType<()> {
if let Ok(msg_in) = parse_from_bytes::<RendezvousMessage>(&bytes) { if let Ok(msg_in) = RendezvousMessage::parse_from_bytes(&bytes) {
match msg_in.union { match msg_in.union {
Some(rendezvous_message::Union::register_peer(rp)) => { Some(rendezvous_message::Union::register_peer(rp)) => {
// B registered // B registered
@@ -193,6 +193,7 @@ impl RendezvousServer {
self.pm.update_pk(id, addr, rk.pk); self.pm.update_pk(id, addr, rk.pk);
} else { } else {
if peer.pk != rk.pk { if peer.pk != rk.pk {
log::warn!("Peer {} pk mismatch: {:?} vs {:?}", id, rk.pk, peer.pk);
res = register_pk_response::Result::PK_MISMATCH; res = register_pk_response::Result::PK_MISMATCH;
} }
} }