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

spawn tcp also for detect local ip for client

Browse Source
This commit is contained in:
open-trade 2020-03-12 20:07:25 +08:00
parent 983486d0ed
commit db89aaa5c6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hbb_common

@ -1 +1 @@
Subproject commit 56d07b3457150de0caa0d08d17b99ec3d267ef61 Subproject commit ad1f6e2e43210eb073500891ffeb70506ee264dd

10
src/rendezvous_server.rs
View File

@ -1,5 +1,5 @@
use hbb_common::{ use hbb_common::{
bytes::BytesMut, log, protobuf::parse_from_bytes, rendezvous_proto::*, udp::FramedSocket, bytes::BytesMut, log, protobuf::parse_from_bytes, rendezvous_proto::*, udp::FramedSocket, tcp::new_listener,
AddrMangle, ResultType, AddrMangle, ResultType,
}; };
use std::{collections::HashMap, net::SocketAddr}; use std::{collections::HashMap, net::SocketAddr};
@ -20,15 +20,15 @@ impl RendezvousServer {
let mut rs = Self { let mut rs = Self {
peer_map: PeerMap::new(), peer_map: PeerMap::new(),
}; };
/* // used to test if udp/tcp share the same NAT port, yes in my test // used to test if udp/tcp share the same NAT port, yes in my test.
// also be used to help client to get local ip.
let addr = addr.to_string(); let addr = addr.to_string();
hbb_common::tokio::spawn(async { hbb_common::tokio::spawn(async {
let mut l = hbb_common::tokio::net::TcpListener::bind(addr).await.unwrap(); let mut l = new_listener(addr, true).await.unwrap();
while let Ok((_, addr)) = l.accept().await { while let Ok((_, addr)) = l.accept().await {
log::debug!("Tcp peer {:?}", addr); log::debug!("Tcp connection from {:?}", addr);
} }
}); });
*/
while let Some(Ok((bytes, addr))) = socket.next().await { while let Some(Ok((bytes, addr))) = socket.next().await {
rs.handle_msg(&bytes, addr, &mut socket).await?; rs.handle_msg(&bytes, addr, &mut socket).await?;
} }