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

forward renamed to relay

Browse Source
This commit is contained in:
open-trade 2020-09-17 18:55:35 +08:00
parent 1d19007a46
commit fcd949c556
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hbb_common

@ -1 +1 @@
Subproject commit 6ccb0d96e7bb37ea43df5c53e07983d6c07804e5 Subproject commit fdaa6c740c475f6023c93a148bc851655d0093ac

8
src/hbbf/main.rs
View File

@ -38,14 +38,14 @@ async fn make_pair(stream: FramedStream, addr: SocketAddr) -> ResultType<()> {
let mut stream = stream; let mut stream = stream;
if let Some(Ok(bytes)) = stream.next_timeout(30_000).await { if let Some(Ok(bytes)) = stream.next_timeout(30_000).await {
if let Ok(msg_in) = RendezvousMessage::parse_from_bytes(&bytes) { if let Ok(msg_in) = RendezvousMessage::parse_from_bytes(&bytes) {
if let Some(rendezvous_message::Union::request_forward(rf)) = msg_in.union { if let Some(rendezvous_message::Union::request_relay(rf)) = msg_in.union {
if !rf.uuid.is_empty() { if !rf.uuid.is_empty() {
let peer = PEERS.lock().unwrap().remove(&rf.uuid); let peer = PEERS.lock().unwrap().remove(&rf.uuid);
if let Some(peer) = peer { if let Some(peer) = peer {
log::info!("Forward request {} from {} got paired", rf.uuid, addr); log::info!("Forward request {} from {} got paired", rf.uuid, addr);
return forward(stream, peer).await; return relay(stream, peer).await;
} else { } else {
log::info!("New forward request {} from {}", rf.uuid, addr); log::info!("New relay request {} from {}", rf.uuid, addr);
PEERS.lock().unwrap().insert(rf.uuid.clone(), stream); PEERS.lock().unwrap().insert(rf.uuid.clone(), stream);
sleep(30.).await; sleep(30.).await;
PEERS.lock().unwrap().remove(&rf.uuid); PEERS.lock().unwrap().remove(&rf.uuid);
@ -57,7 +57,7 @@ async fn make_pair(stream: FramedStream, addr: SocketAddr) -> ResultType<()> {
Ok(()) Ok(())
} }
async fn forward(stream: FramedStream, peer: FramedStream) -> ResultType<()> { async fn relay(stream: FramedStream, peer: FramedStream) -> ResultType<()> {
let mut peer = peer; let mut peer = peer;
let mut stream = stream; let mut stream = stream;
peer.set_raw(); peer.set_raw();

21
src/rendezvous_server.rs
View File

@ -157,17 +157,18 @@ impl RendezvousServer {
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);
} }
Some(rendezvous_message::Union::request_forward(mut rf)) => { Some(rendezvous_message::Union::request_relay(mut rf)) => {
if !rs.pm.is_in_memory(&rf.id) { if !rs.pm.is_in_memory(&rf.id) {
break; break;
} }
let mut msg_out = RendezvousMessage::new(); let mut msg_out = RendezvousMessage::new();
rf.socket_addr = AddrMangle::encode(addr); rf.socket_addr = AddrMangle::encode(addr);
msg_out.set_request_forward(rf); msg_out.set_request_relay(rf);
rs.tx.send((msg_out, addr)).ok(); rs.tx.send((msg_out, addr)).ok();
} }
Some(rendezvous_message::Union::request_forward_response(rfr)) => { Some(rendezvous_message::Union::request_relay_response(mut rfr)) => {
let addr_b = AddrMangle::decode(&rfr.socket_addr); let addr_b = AddrMangle::decode(&rfr.socket_addr);
rfr.socket_addr = Default::default();
let sender_b= rs.tcp_punch.lock().unwrap().remove(&addr_b); let sender_b= rs.tcp_punch.lock().unwrap().remove(&addr_b);
if let Some(mut sender_b) = sender_b { if let Some(mut sender_b) = sender_b {
if let Ok(bytes) = rfr.write_to_bytes() { if let Ok(bytes) = rfr.write_to_bytes() {
@ -186,6 +187,8 @@ impl RendezvousServer {
} }
_ => {} _ => {}
} }
} else {
break;
} }
} }
rs.tcp_punch.lock().unwrap().remove(&addr); rs.tcp_punch.lock().unwrap().remove(&addr);
@ -252,10 +255,10 @@ impl RendezvousServer {
}); });
} }
} }
Some(rendezvous_message::Union::request_forward(rf)) => { Some(rendezvous_message::Union::request_relay(rf)) => {
if self.pm.is_in_memory(&rf.id) { if self.pm.is_in_memory(&rf.id) {
let mut msg_out = RendezvousMessage::new(); let mut msg_out = RendezvousMessage::new();
msg_out.set_request_forward(rf); msg_out.set_request_relay(rf);
socket.send(&msg_out, addr).await? socket.send(&msg_out, addr).await?
} }
} }
@ -347,11 +350,11 @@ impl RendezvousServer {
Some(peer) => peer.pk, Some(peer) => peer.pk,
_ => Vec::new(), _ => Vec::new(),
}; };
let forward_server = phs.forward_server; let relay_server = phs.relay_server;
msg_out.set_punch_hole_response(PunchHoleResponse { msg_out.set_punch_hole_response(PunchHoleResponse {
socket_addr: AddrMangle::encode(addr), socket_addr: AddrMangle::encode(addr),
pk, pk,
forward_server, relay_server,
..Default::default() ..Default::default()
}); });
if let Some(socket) = socket { if let Some(socket) = socket {
@ -369,7 +372,7 @@ impl RendezvousServer {
addr: SocketAddr, addr: SocketAddr,
socket: Option<&'a mut FramedSocket>, socket: Option<&'a mut FramedSocket>,
) -> ResultType<()> { ) -> ResultType<()> {
// forward local addrs of B to A // relay local addrs of B to A
let addr_a = AddrMangle::decode(&la.socket_addr); let addr_a = AddrMangle::decode(&la.socket_addr);
log::debug!( log::debug!(
"{} local addrs response to {:?} from {:?}", "{} local addrs response to {:?} from {:?}",
@ -396,7 +399,7 @@ impl RendezvousServer {
addr: SocketAddr, addr: SocketAddr,
id: String, id: String,
) -> ResultType<(RendezvousMessage, Option<SocketAddr>)> { ) -> ResultType<(RendezvousMessage, Option<SocketAddr>)> {
// punch hole request from A, forward to B, // punch hole request from A, relay to B,
// check if in same intranet first, // check if in same intranet first,
// fetch local addrs if in same intranet. // fetch local addrs if in same intranet.
// because punch hole won't work if in the same intranet, // because punch hole won't work if in the same intranet,