From 7db82a22a9d1712289e760a458d3c76625b596fc Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Tue, 12 Jul 2022 23:22:27 +0800
Subject: [PATCH 1/3] udp bug which causes us a lot of trouble

---
 libs/hbb_common/src/udp.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/hbb_common/src/udp.rs b/libs/hbb_common/src/udp.rs
index 4213392a5..3532dd1e0 100644
--- a/libs/hbb_common/src/udp.rs
+++ b/libs/hbb_common/src/udp.rs
@@ -27,6 +27,8 @@ fn new_socket(addr: SocketAddr, reuse: bool, buf_size: usize) -> Result<Socket,
         socket.set_reuse_port(true)?;
         socket.set_reuse_address(true)?;
     }
+    // only nonblocking work with tokio, https://stackoverflow.com/questions/64649405/receiver-on-tokiompscchannel-only-receives-messages-when-buffer-is-full
+    socket.set_nonblocking(true)?;
     if buf_size > 0 {
         socket.set_recv_buffer_size(buf_size).ok();
     }

From f1724820b1de55ba85aa52fb38fd8218dd5df85d Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Tue, 12 Jul 2022 23:28:32 +0800
Subject: [PATCH 2/3] missed socket.set_nonblocking for tcp

---
 libs/hbb_common/src/tcp.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/hbb_common/src/tcp.rs b/libs/hbb_common/src/tcp.rs
index 7966920c2..ce4a805d5 100644
--- a/libs/hbb_common/src/tcp.rs
+++ b/libs/hbb_common/src/tcp.rs
@@ -68,6 +68,8 @@ fn new_socket(addr: std::net::SocketAddr, reuse: bool) -> Result<TcpSocket, std:
         socket.set_reuseport(true)?;
         socket.set_reuseaddr(true)?;
     }
+    // only nonblocking work with tokio, https://stackoverflow.com/questions/64649405/receiver-on-tokiompscchannel-only-receives-messages-when-buffer-is-full
+    socket.set_nonblocking(true)?;
     socket.bind(addr)?;
     Ok(socket)
 }

From 4e45bc0ee07f97aa538f3e4245f33661bfc88e7f Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Tue, 12 Jul 2022 23:32:37 +0800
Subject: [PATCH 3/3] fix tcp

---
 libs/hbb_common/src/tcp.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libs/hbb_common/src/tcp.rs b/libs/hbb_common/src/tcp.rs
index ce4a805d5..7966920c2 100644
--- a/libs/hbb_common/src/tcp.rs
+++ b/libs/hbb_common/src/tcp.rs
@@ -68,8 +68,6 @@ fn new_socket(addr: std::net::SocketAddr, reuse: bool) -> Result<TcpSocket, std:
         socket.set_reuseport(true)?;
         socket.set_reuseaddr(true)?;
     }
-    // only nonblocking work with tokio, https://stackoverflow.com/questions/64649405/receiver-on-tokiompscchannel-only-receives-messages-when-buffer-is-full
-    socket.set_nonblocking(true)?;
     socket.bind(addr)?;
     Ok(socket)
 }