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