piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

IOS/Network: Handle SO_EMFILE

Browse Source
This commit is contained in:
Sepalani
2017-06-04 02:51:26 +01:00
parent ef20e85661
commit b327fd8b2c
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Source/Core/Core/IOS/Network/Socket.cpp
View File

@ -25,12 +25,15 @@
#else #else
#define ERRORCODE(name) name #define ERRORCODE(name) name
#define EITHER(win32, posix) posix #define EITHER(win32, posix) posix
#define closesocket close
#endif #endif
namespace IOS namespace IOS
{ {
namespace HLE namespace HLE
{ {
constexpr int WII_SOCKET_FD_MAX = 24;
char* WiiSockMan::DecodeError(s32 ErrorCode) char* WiiSockMan::DecodeError(s32 ErrorCode)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -148,11 +151,7 @@ s32 WiiSocket::CloseFd()
s32 ReturnValue = 0; s32 ReturnValue = 0;
if (fd >= 0) if (fd >= 0)
{ {
#ifdef _WIN32
s32 ret = closesocket(fd); s32 ret = closesocket(fd);
#else
s32 ret = close(fd);
#endif
ReturnValue = WiiSockMan::GetNetErrorCode(ret, "CloseFd", false); ReturnValue = WiiSockMan::GetNetErrorCode(ret, "CloseFd", false);
} }
else else
@ -256,8 +255,7 @@ void WiiSocket::Update(bool read, bool write, bool except)
ret = static_cast<s32>(accept(fd, nullptr, nullptr)); ret = static_cast<s32>(accept(fd, nullptr, nullptr));
} }
ret = WiiSockMan::GetInstance().AddSocket(ret); ReturnValue = WiiSockMan::GetInstance().AddSocket(ret, true);
ReturnValue = WiiSockMan::GetNetErrorCode(ret, "SO_ACCEPT", true);
ioctl.Log("IOCTL_SO_ACCEPT", LogTypes::IOS_NET); ioctl.Log("IOCTL_SO_ACCEPT", LogTypes::IOS_NET);
break; break;
@ -604,18 +602,36 @@ void WiiSocket::DoSock(Request request, SSL_IOCTL type)
pending_sockops.push_back(so); pending_sockops.push_back(so);
} }
s32 WiiSockMan::AddSocket(s32 fd) s32 WiiSockMan::AddSocket(s32 fd, bool is_rw)
{ {
if (fd >= 0) const char* caller = is_rw ? "SO_ACCEPT" : "NewSocket";
if (fd < 0)
return GetNetErrorCode(fd, caller, is_rw);
s32 wii_fd;
for (wii_fd = 0; wii_fd < WII_SOCKET_FD_MAX; ++wii_fd)
{
// Find an available socket fd
if (WiiSockets.count(wii_fd) == 0)
break;
}
if (wii_fd == WII_SOCKET_FD_MAX)
{
// Close host socket
closesocket(fd);
wii_fd = -SO_EMFILE;
ERROR_LOG(IOS_NET, "%s failed: Too many open sockets, ret=%d", caller, wii_fd);
}
else
{ {
s32 wii_fd = 0;
while (WiiSockets.count(wii_fd) > 0)
wii_fd += 1;
WiiSocket& sock = WiiSockets[wii_fd]; WiiSocket& sock = WiiSockets[wii_fd];
sock.SetFd(fd); sock.SetFd(fd);
return wii_fd;
} }
return fd;
SetLastNetError(wii_fd);
return wii_fd;
} }
s32 WiiSockMan::NewSocket(s32 af, s32 type, s32 protocol) s32 WiiSockMan::NewSocket(s32 af, s32 type, s32 protocol)
@ -625,9 +641,7 @@ s32 WiiSockMan::NewSocket(s32 af, s32 type, s32 protocol)
if (protocol != 0) // IPPROTO_IP if (protocol != 0) // IPPROTO_IP
return -SO_EPROTONOSUPPORT; return -SO_EPROTONOSUPPORT;
s32 fd = static_cast<s32>(socket(af, type, protocol)); s32 fd = static_cast<s32>(socket(af, type, protocol));
s32 wii_fd = AddSocket(fd); return AddSocket(fd, false);
s32 ret = GetNetErrorCode(wii_fd, "NewSocket", false);
return ret;
} }
s32 WiiSockMan::GetHostSocket(s32 wii_fd) const s32 WiiSockMan::GetHostSocket(s32 wii_fd) const

2
Source/Core/Core/IOS/Network/Socket.h
View File

@ -221,7 +221,7 @@ public:
static void Convert(sockaddr_in const& from, WiiSockAddrIn& to, s32 addrlen = -1); static void Convert(sockaddr_in const& from, WiiSockAddrIn& to, s32 addrlen = -1);
// NON-BLOCKING FUNCTIONS // NON-BLOCKING FUNCTIONS
s32 NewSocket(s32 af, s32 type, s32 protocol); s32 NewSocket(s32 af, s32 type, s32 protocol);
s32 AddSocket(s32 fd); s32 AddSocket(s32 fd, bool is_rw);
s32 GetHostSocket(s32 wii_fd) const; s32 GetHostSocket(s32 wii_fd) const;
s32 DeleteSocket(s32 s); s32 DeleteSocket(s32 s);
s32 GetLastNetError() const { return errno_last; } s32 GetLastNetError() const { return errno_last; }