Merge branch 'set-non-blocking-socket-quic'

2 files changed, 5 insertions, 1 deletions

diff --git a/.github/workflows/git-commit-message-style.yml b/.github/workflows/git-commit-message-style.yml
index 3903db9ca4..53877a5d69 100644
--- a/.github/workflows/git-commit-message-style.yml
+++ b/.github/workflows/git-commit-message-style.yml
@@ -35,4 +35,4 @@ jobs:
           max-subject-line-length: '72'
           # The action's wordlist is a bit short. Add more accepted verbs
           additional-verbs: 'tidy, wrap, obfuscate, bias, prohibit, forbid, revert, slim, impl, disregard, reproduce,
-            signal'
+            signal, guarantee'
diff --git a/tunnel-obfuscation/src/quic.rs b/tunnel-obfuscation/src/quic.rs
index c966bf7d12..7cd4fcc305 100644
--- a/tunnel-obfuscation/src/quic.rs
+++ b/tunnel-obfuscation/src/quic.rs
@@ -151,6 +151,10 @@ impl Quic {
                 socket.set_mark(fwmark).map_err(Error::Fwmark)?;
             }
 
+            // The caller is responsible for ensuring that the socket is in non-blocking mode
+            // when calling UdpSocket::from_std
+            socket.set_nonblocking(true).map_err(Error::BindError)?;
+
             UdpSocket::from_std(std::net::UdpSocket::from(socket)).map_err(Error::BindError)?
         };