Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add socket mapping for accept(). Don't know if games use it...

Browse source
This commit is contained in:
Henrik Rydgård 2025-01-08 19:36:01 +01:00
parent d4ad8c9639
commit 0cec39d11f
3 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Core/HLE/SocketManager.cpp
View file

@ -46,6 +46,29 @@ InetSocket *SocketManager::CreateSocket(int *index, int *returned_errno, SocketS
return nullptr; return nullptr;
} }
InetSocket *SocketManager::AdoptSocket(int *index, SOCKET hostSocket, const InetSocket *derive) {
std::lock_guard<std::mutex> guard(g_socketMutex);
for (int i = MIN_VALID_INET_SOCKET; i < ARRAY_SIZE(inetSockets_); i++) {
if (inetSockets_[i].state == SocketState::Unused) {
*index = i;
InetSocket *inetSock = inetSockets_ + i;
inetSock->sock = hostSocket;
inetSock->state = derive->state;
inetSock->domain = derive->domain;
inetSock->type = derive->type;
inetSock->protocol = derive->protocol;
inetSock->nonblocking = derive->nonblocking; // should we inherit blocking state?
return inetSock;
}
}
// No space? Return nullptr and let the caller handle it. Shouldn't ever happen.
*index = 0;
return nullptr;
}
bool SocketManager::Close(InetSocket *inetSocket) { bool SocketManager::Close(InetSocket *inetSocket) {
_dbg_assert_(inetSocket->state != SocketState::Unused); _dbg_assert_(inetSocket->state != SocketState::Unused);
if (closesocket(inetSocket->sock) != 0) { if (closesocket(inetSocket->sock) != 0) {

3
Core/HLE/SocketManager.h
View file

@ -32,6 +32,9 @@ public:
}; };
InetSocket *CreateSocket(int *index, int *returned_errno, SocketState state, int domain, int type, int protocol); InetSocket *CreateSocket(int *index, int *returned_errno, SocketState state, int domain, int type, int protocol);
// for accept()
InetSocket *AdoptSocket(int *index, SOCKET hostSocket, const InetSocket *derive);
bool GetInetSocket(int sock, InetSocket **inetSocket); bool GetInetSocket(int sock, InetSocket **inetSocket);
SOCKET GetHostSocketFromInetSocket(int sock); SOCKET GetHostSocketFromInetSocket(int sock);
bool Close(InetSocket *inetSocket); bool Close(InetSocket *inetSocket);

21
Core/HLE/sceNetInet.cpp
View file

@ -691,14 +691,23 @@ static int sceNetInetAccept(int socket, u32 addrPtr, u32 addrLenPtr) {
SockAddrIN4 saddr{}; SockAddrIN4 saddr{};
if (srclen) if (srclen)
*srclen = std::min((*srclen) > 0 ? *srclen : 0, static_cast<socklen_t>(sizeof(saddr))); *srclen = std::min((*srclen) > 0 ? *srclen : 0, static_cast<socklen_t>(sizeof(saddr)));
int retval = accept(inetSock->sock, (struct sockaddr*)&saddr.addr, srclen);
if (retval < 0) { int newHostSocket = accept(inetSock->sock, (struct sockaddr*)&saddr.addr, srclen);
if (newHostSocket < 0) {
inetLastErrno = socket_errno; inetLastErrno = socket_errno;
if (inetLastErrno == EAGAIN) if (inetLastErrno == EAGAIN)
hleLogDebug(Log::sceNet, retval, "errno = %d", inetLastErrno); hleLogDebug(Log::sceNet, newHostSocket, "errno = %d", inetLastErrno);
else else
hleLogError(Log::sceNet, retval, "errno = %d", inetLastErrno); hleLogError(Log::sceNet, newHostSocket, "errno = %d", inetLastErrno);
return retval; return -1;
}
int newSocketId;
InetSocket *newInetSocket = g_socketManager.AdoptSocket(&newSocketId, newHostSocket, inetSock);
if (!newInetSocket) {
// Ran out of space. Shouldn't really happen.
inetLastErrno = ENOMEM;
return -1;
} }
if (src) { if (src) {
@ -708,7 +717,7 @@ static int sceNetInetAccept(int socket, u32 addrPtr, u32 addrLenPtr) {
} }
DEBUG_LOG(Log::sceNet, "Accept: Address = %s, Port = %d", ip2str(saddr.in.sin_addr).c_str(), ntohs(saddr.in.sin_port)); DEBUG_LOG(Log::sceNet, "Accept: Address = %s, Port = %d", ip2str(saddr.in.sin_addr).c_str(), ntohs(saddr.in.sin_port));
return hleLogSuccessI(Log::sceNet, retval); return hleLogSuccessI(Log::sceNet, newSocketId);
} }
static int sceNetInetShutdown(int socket, int how) { static int sceNetInetShutdown(int socket, int how) {