Merge branch 'master' into forapi
# Conflicts: # Cargo.lock # libs/hbb_common/protos/rendezvous.proto # libs/hbb_common/src/tcp.rs # libs/hbb_common~master
This commit is contained in:
commit
45c900a7e6
28 files changed
+1397
-5413
No files matched your search
@@ -1494,7 +1494,7 @@ async fn create_udp_listener(port: i32, rmem: usize) -> ResultType<FramedSocket>
|
||||
|
||||
#[inline]
|
||||
async fn create_tcp_listener(port: i32) -> ResultType<TcpListener> {
|
||||
let s = listen_any(port as _, true).await?;
|
||||
let s = listen_any(port as _).await?;
|
||||
log::debug!("listen on tcp {:?}", s.local_addr());
|
||||
Ok(s)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user