aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authoropen-trade <[email protected]>2020-03-11 02:20:45 +0800
committeropen-trade <[email protected]>2020-03-11 02:20:45 +0800
commit5e5d8927e29922079211064d8cbb52767a2a6967 (patch)
treee1a37b46b27f77ef1f7091522b5790ba65d96c69
parentdefac1f338573e705b890dd351d55dc7aa67b8dd (diff)
downloadrustdesk-server-5e5d8927e29922079211064d8cbb52767a2a6967.tar.gz
rustdesk-server-5e5d8927e29922079211064d8cbb52767a2a6967.zip
test if udp/tcp share the same NAT port
-rw-r--r--Cargo.lock1
m---------libs/hbb_common0
-rw-r--r--src/rendezvous_server.rs9
3 files changed, 10 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock
index b25168f..6a1b6ca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -159,6 +159,7 @@ dependencies = [
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
"protobuf 2.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"protobuf-codegen-pure 2.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/libs/hbb_common b/libs/hbb_common
-Subproject 2cc3edf0f634adcb1e290c5c8b11bc21de38e76
+Subproject 489ff100300235ef3b9e7820f1b13dadc75be5f
diff --git a/src/rendezvous_server.rs b/src/rendezvous_server.rs
index d1adca4..989cca3 100644
--- a/src/rendezvous_server.rs
+++ b/src/rendezvous_server.rs
@@ -20,6 +20,15 @@ impl RendezvousServer {
let mut rs = Self {
peer_map: PeerMap::new(),
};
+ /* // used to test if udp/tcp share the same NAT port, yes in my test
+ let addr = addr.to_string();
+ hbb_common::tokio::spawn(async {
+ let mut l = hbb_common::tokio::net::TcpListener::bind(addr).await.unwrap();
+ while let Ok((_, addr)) = l.accept().await {
+ log::debug!("Tcp peer {:?}", addr);
+ }
+ });
+ */
while let Some(Ok((bytes, addr))) = socket.next().await {
rs.handle_msg(&bytes, addr, &mut socket).await?;
}