From 6cccb9cb7220b78709c03e35dd97105b6df4125e Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Sat, 29 Jun 2024 00:29:15 +0700 Subject: [PATCH 1/4] add SD_RECEIVE definition --- Core/HLE/proAdhoc.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h index 49ab5c8e48..ac34ea7fdf 100644 --- a/Core/HLE/proAdhoc.h +++ b/Core/HLE/proAdhoc.h @@ -111,6 +111,10 @@ inline bool isDisconnected(int errcode) { return (errcode == EPIPE || errcode == #define POLLPRI POLL_PRI #endif +#ifndef SD_RECEIVE +#define SD_RECEIVE SHUT_RD //0x00 +#endif + #ifndef SD_BOTH #define SD_BOTH SHUT_RDWR //0x02 #endif From 2222254f3e8461f3d84f91ae2d48f0ef02593727 Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Sat, 29 Jun 2024 00:44:51 +0700 Subject: [PATCH 2/4] Update NetAdhocPdp_Delete --- Core/HLE/sceNetAdhoc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 0441b6f372..a3760fbf1f 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -2212,7 +2212,7 @@ int NetAdhocPdp_Delete(int id, int unknown) { sl.l_onoff = 1; // non-zero value enables linger option in kernel sl.l_linger = 0; // timeout interval in seconds setsockopt(sock->data.pdp.id, SOL_SOCKET, SO_LINGER, (const char*)&sl, sizeof(sl)); - shutdown(sock->data.pdp.id, SD_BOTH); + shutdown(sock->data.pdp.id, SD_RECEIVE); closesocket(sock->data.pdp.id); // Remove Port Forward from Router From 9e8e43f7b70725b779d7f1c168231809fffbcc72 Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Sat, 29 Jun 2024 00:46:44 +0700 Subject: [PATCH 3/4] Update NetAdhocPtp_Close --- Core/HLE/sceNetAdhoc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index a3760fbf1f..a8070d4dd9 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -3922,7 +3922,7 @@ int NetAdhocPtp_Close(int id, int unknown) { sl.l_onoff = 1; // non-zero value enables linger option in kernel sl.l_linger = 0; // timeout interval in seconds setsockopt(socket->data.ptp.id, SOL_SOCKET, SO_LINGER, (const char*)&sl, sizeof(sl)); - shutdown(socket->data.ptp.id, SD_BOTH); + shutdown(socket->data.ptp.id, SD_RECEIVE); closesocket(socket->data.ptp.id); // Remove Port Forward from Router From c389ede09220b303fa8fd30eb31cb4ef2935df83 Mon Sep 17 00:00:00 2001 From: AdamN <7974720+anr2me@users.noreply.github.com> Date: Sat, 29 Jun 2024 00:57:16 +0700 Subject: [PATCH 4/4] Update deleteAllAdhocSockets --- Core/HLE/proAdhoc.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp index e30edb4974..2fc90989d9 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp @@ -429,7 +429,11 @@ void deleteAllAdhocSockets() { if (fd > 0) { // Close Socket - shutdown(fd, SD_BOTH); + struct linger sl {}; + sl.l_onoff = 1; // non-zero value enables linger option in kernel + sl.l_linger = 0; // timeout interval in seconds + setsockopt(fd, SOL_SOCKET, SO_LINGER, (const char*)&sl, sizeof(sl)); + shutdown(fd, SD_RECEIVE); closesocket(fd); } // Free Memory