diff options
| author | bunnei <[email protected]> | 2022-07-21 15:43:55 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-07-21 15:43:55 -0700 |
| commit | 6e36f4d230b4760ac8f8f4cd087e0d909fb97e40 (patch) | |
| tree | 64cf67d3e8210f4ae9227ac5fc698731ca16c81f | |
| parent | bcd0ca6076a915152d041a8fcd565c0804543990 (diff) | |
| parent | 912cae21b070e6f5972ce34a08b25e4ae2182d5c (diff) | |
| download | yuzu-android-6e36f4d230b4760ac8f8f4cd087e0d909fb97e40.tar.gz yuzu-android-6e36f4d230b4760ac8f8f4cd087e0d909fb97e40.zip | |
Merge pull request #8598 from Link4565/recv-dontwait
Enable the use of MSG_DONTWAIT flag on RecvImpl
| -rw-r--r-- | src/core/hle/service/sockets/bsd.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp index 5114b8be2..3e9dc4a13 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/core/hle/service/sockets/bsd.cpp @@ -720,7 +720,25 @@ std::pair<s32, Errno> BSD::RecvImpl(s32 fd, u32 flags, std::vector<u8>& message) if (!IsFileDescriptorValid(fd)) { return {-1, Errno::BADF}; } - return Translate(file_descriptors[fd]->socket->Recv(flags, message)); + + FileDescriptor& descriptor = *file_descriptors[fd]; + + // Apply flags + if ((flags & FLAG_MSG_DONTWAIT) != 0) { + flags &= ~FLAG_MSG_DONTWAIT; + if ((descriptor.flags & FLAG_O_NONBLOCK) == 0) { + descriptor.socket->SetNonBlock(true); + } + } + + const auto [ret, bsd_errno] = Translate(descriptor.socket->Recv(flags, message)); + + // Restore original state + if ((descriptor.flags & FLAG_O_NONBLOCK) == 0) { + descriptor.socket->SetNonBlock(false); + } + + return {ret, bsd_errno}; } std::pair<s32, Errno> BSD::RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& message, |