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

bug fix

Browse Source
This commit is contained in:
open-trade 2020-05-11 16:59:09 +08:00
parent 4e07acdb6c
commit 47e3601783
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rendezvous_server.rs
View File

@ -48,7 +48,7 @@ impl RendezvousServer {
loop { loop {
tokio::select! { tokio::select! {
Some((addr, id)) = rx.recv() => { Some((addr, id)) = rx.recv() => {
allow_err!(rs.handle_punch_hole_request(addr, &id, &mut socket).await); allow_err!(rs.handle_punch_hole_request(addr, &id, &mut socket, true).await);
} }
Some(Ok((bytes, addr))) = socket.next() => { Some(Ok((bytes, addr))) = socket.next() => {
allow_err!(rs.handle_msg(&bytes, addr, &mut socket).await); allow_err!(rs.handle_msg(&bytes, addr, &mut socket).await);
@ -115,7 +115,8 @@ impl RendezvousServer {
} }
} }
Some(rendezvous_message::Union::punch_hole_request(ph)) => { Some(rendezvous_message::Union::punch_hole_request(ph)) => {
self.handle_punch_hole_request(addr, &ph.id, socket).await?; self.handle_punch_hole_request(addr, &ph.id, socket, false)
.await?;
} }
Some(rendezvous_message::Union::punch_hole_sent(phs)) => { Some(rendezvous_message::Union::punch_hole_sent(phs)) => {
self.handle_hole_sent(&phs, addr, Some(socket)).await?; self.handle_hole_sent(&phs, addr, Some(socket)).await?;
@ -188,6 +189,7 @@ impl RendezvousServer {
addr: SocketAddr, addr: SocketAddr,
id: &str, id: &str,
socket: &mut FramedSocket, socket: &mut FramedSocket,
is_tcp: bool,
) -> ResultType<()> { ) -> ResultType<()> {
// punch hole request from A, forward to B, // punch hole request from A, forward to B,
// check if in same intranet first, // check if in same intranet first,
@ -201,7 +203,11 @@ impl RendezvousServer {
failure: punch_hole_response::Failure::OFFLINE.into(), failure: punch_hole_response::Failure::OFFLINE.into(),
..Default::default() ..Default::default()
}); });
return socket.send(&msg_out, addr).await; return if is_tcp {
self.send_to_tcp(&msg_out, addr).await
} else {
socket.send(&msg_out, addr).await
};
} }
let mut msg_out = RendezvousMessage::new(); let mut msg_out = RendezvousMessage::new();
let same_intranet = match peer.socket_addr { let same_intranet = match peer.socket_addr {
@ -245,7 +251,11 @@ impl RendezvousServer {
failure: punch_hole_response::Failure::ID_NOT_EXIST.into(), failure: punch_hole_response::Failure::ID_NOT_EXIST.into(),
..Default::default() ..Default::default()
}); });
socket.send(&msg_out, addr).await? return if is_tcp {
self.send_to_tcp(&msg_out, addr).await
} else {
socket.send(&msg_out, addr).await
};
} }
Ok(()) Ok(())
} }