diff options
| author | comex <comexk@gmail.com> | 2023-06-25 14:57:34 -0700 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2023-06-25 15:06:52 -0700 |
| commit | 4a355699219710d0a9ad620722393b3d9a16d84d (patch) | |
| tree | 69b5d25adffe30e968bdcd47c367e0c1040c4427 /src/core/internal_network/network.cpp | |
| parent | 8905142f4362e06bd8f0a35cf9887d5110c1f308 (diff) | |
Fixes:
- Add missing virtual destructor on `SSLBackend`.
- On Windows, filter out `POLLWRBAND` (one of the new flags added) when
calling `WSAPoll`, because despite the constant being defined on
Windows, passing it calls `WSAPoll` to yield `EINVAL`.
- Reduce OpenSSL version requirement to satisfy CI; I haven't tested
whether it actually builds (or runs) against 1.1.1, but if not, I'll
figure it out.
- Change an instance of memcpy to memmove, even though the arguments
cannot overlap, to avoid a [strange GCC
error](https://github.com/yuzu-emu/yuzu/pull/10912#issuecomment-1606283351).
Diffstat (limited to 'src/core/internal_network/network.cpp')
| -rw-r--r-- | src/core/internal_network/network.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 39381e06e..0164d12eb 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -97,6 +97,8 @@ bool EnableNonBlock(SOCKET fd, bool enable) { Errno TranslateNativeError(int e) { switch (e) { + case 0: + return Errno::SUCCESS; case WSAEBADF: return Errno::BADF; case WSAEINVAL: @@ -421,9 +423,14 @@ short TranslatePollEvents(PollEvents events) { translate(PollEvents::WrBand, POLLWRBAND); #ifdef _WIN32 - if (True(events & PollEvents::Pri)) { - LOG_WARNING(Service, "Winsock doesn't support POLLPRI"); - } + short allowed_events = POLLRDBAND | POLLRDNORM | POLLWRNORM; + // Unlike poll on other OSes, WSAPoll will complain if any other flags are set on input. + if (result & ~allowed_events) { + LOG_DEBUG(Network, + "Removing WSAPoll input events 0x{:x} because Windows doesn't support them", + result & ~allowed_events); + } + result &= allowed_events; #endif UNIMPLEMENTED_IF_MSG((u16)events != 0, "Unhandled guest events=0x{:x}", (u16)events); |
