Skip to content

[Adhoc] Partially fixes multiplayer regression on GTA games. #20245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hrydgard merged 2 commits into from
Apr 13, 2025
Merged

[Adhoc] Partially fixes multiplayer regression on GTA games. #20245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe71a10
Let's not changed the SO_LINGER time, since RST signal can be faster …
anr2me Apr 13, 2025
2a59e75
This too.
anr2me Apr 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Core/HLE/proAdhoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,10 +424,6 @@ void deleteAllAdhocSockets() {

if (fd > 0) {
// Close Socket
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);
}
Expand Down
8 changes: 0 additions & 8 deletions Core/HLE/sceNetAdhoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2175,10 +2175,6 @@ int NetAdhocPdp_Delete(int id, int unknown) {
// Valid Socket
if (sock != NULL && sock->type == SOCK_PDP) {
// Close Connection
struct linger sl {};
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_RECEIVE);
closesocket(sock->data.pdp.id);

Expand Down Expand Up @@ -3873,10 +3869,6 @@ int NetAdhocPtp_Close(int id, int unknown) {
// Valid Socket
if (socket != NULL && socket->type == SOCK_PTP) {
// Close Connection
struct linger sl {};
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_RECEIVE);
closesocket(socket->data.ptp.id);

Expand Down
Loading