[#508] Fix socket timeouts in windows platform

eclipse-iceoryx · Jan 21, 2025 · 556c618 · 556c618
1 parent bfea951
commit 556c618
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/iceoryx2-cal/tests/event_tests.rs b/iceoryx2-cal/tests/event_tests.rs
@@ -19,7 +19,6 @@ mod event {
     use std::time::Instant;
 
     use iceoryx2_bb_container::semantic_string::*;
-    use iceoryx2_bb_log::{set_log_level, LogLevel};
     use iceoryx2_bb_posix::barrier::*;
     use iceoryx2_bb_system_types::file_name::FileName;
     use iceoryx2_bb_testing::watchdog::Watchdog;

diff --git a/iceoryx2-pal/posix/src/windows/fcntl.rs b/iceoryx2-pal/posix/src/windows/fcntl.rs
@@ -183,7 +183,13 @@ pub unsafe fn fcntl_int(fd: int, cmd: int, arg: int) -> int {
     }
 
     let socket_fd = match HandleTranslator::get_instance().get(fd) {
-        Some(FdHandleEntry::Socket(socket)) => socket.fd,
+        Some(FdHandleEntry::Socket(mut socket)) => {
+            if cmd == F_SETFL && (arg & O_NONBLOCK != 0) {
+                socket.recv_timeout = None;
+                HandleTranslator::get_instance().update(FdHandleEntry::Socket(socket));
+            }
+            socket.fd
+        }
         Some(FdHandleEntry::UdsDatagramSocket(mut socket)) => {
             if cmd == F_SETFL && (arg & O_NONBLOCK != 0) {
                 socket.recv_timeout = None;