Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-03-21 17:49:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14395 from sepalani/tri-connect

Browse Source 
AMMediaboard: Add more connect log messages
This commit is contained in:
Jordan Woyak 2026-02-20 19:25:59 -06:00 committed by GitHub
commit ddedae327f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/HW/DVD/AMMediaboard.cpp
View File

@ -743,9 +743,11 @@ static s32 NetDIMMConnect(GuestSocket guest_socket, const GuestSocketAddress& gu
WSAPOLLFD pfds[1]{{.fd = host_socket, .events = POLLOUT}};
// TODO: Possible race between this socket's SetTimeOuts and others'
const auto timeout =
duration_cast<std::chrono::milliseconds>(std::chrono::microseconds{s_timeouts[0]});
// TODO: Might block if timeout is too big
const int poll_result = PlatformPoll(pfds, timeout);
if (poll_result < 0) [[unlikely]]
@ -757,7 +759,7 @@ static s32 NetDIMMConnect(GuestSocket guest_socket, const GuestSocketAddress& gu
return SOCKET_ERROR;
}
if ((pfds[0].revents & POLLOUT) == 0)
if ((pfds[0].revents & (POLLOUT | POLLERR)) == 0)
{
// Timeout.
s_last_error = SSC_EWOULDBLOCK;
@ -776,10 +778,14 @@ static s32 NetDIMMConnect(GuestSocket guest_socket, const GuestSocketAddress& gu
}
else if (so_error == 0)
{
INFO_LOG_FMT(AMMEDIABOARD_NET, "NetDIMMConnect: connect( {}({}) ) succeeded", host_socket,
u32(guest_socket));
s_last_error = SSC_SUCCESS;
return 0;
}
ERROR_LOG_FMT(AMMEDIABOARD_NET, "NetDIMMConnect: connect( {}({}) ) failed with error {}: {}",
host_socket, u32(guest_socket), so_error, Common::DecodeNetworkError(so_error));
s_last_error = SOCKET_ERROR;
return SOCKET_ERROR;
}