From bf30de1527407d388726dafc0607a97870a0c83c Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Fri, 9 Jan 2026 22:56:16 +0100 Subject: [PATCH 01/10] initial github.com/kethen/aemu_postoffice integration ported from github.com/kethen/aemu --- CMakeLists.txt | 19 + Core/Config.cpp | 1 + Core/Config.h | 1 + Core/Core.cpp | 5 + Core/Core.vcxproj | 6 +- Core/Core.vcxproj.filters | 14 +- Core/HLE/proAdhoc.h | 1 + Core/HLE/sceKernelThread.h | 1 + Core/HLE/sceNetAdhoc.cpp | 874 ++++++++++++++++-- Core/HLE/sceNetAdhoc.h | 1 + UI/GameSettingsScreen.cpp | 1 + UWP/CoreUWP/CoreUWP.vcxproj | 14 +- UWP/CoreUWP/CoreUWP.vcxproj.filters | 6 +- android/jni/Android.mk | 4 + ext/aemu_postoffice/aemu_postoffice_packets.h | 49 + ext/aemu_postoffice/client/delay_impl_linux.c | 9 + .../client/delay_impl_windows.c | 5 + ext/aemu_postoffice/client/log_linux.h | 11 + ext/aemu_postoffice/client/log_windows.h | 11 + ext/aemu_postoffice/client/mutex_impl_linux.c | 12 + ext/aemu_postoffice/client/mutex_impl_linux.h | 10 + .../client/mutex_impl_windows.c | 23 + .../client/mutex_impl_windows.h | 10 + ext/aemu_postoffice/client/postoffice.c | 827 +++++++++++++++++ .../client/postoffice_client.h | 69 ++ ext/aemu_postoffice/client/sock_impl_linux.c | 128 +++ ext/aemu_postoffice/client/sock_impl_linux.h | 22 + .../client/sock_impl_windows.c | 137 +++ .../client/sock_impl_windows.h | 24 + ext/aemu_postoffice/gpl-3.0.txt | 674 ++++++++++++++ ext/aemu_postoffice/upstream.txt | 1 + libretro/Makefile.common | 16 + 32 files changed, 2887 insertions(+), 99 deletions(-) create mode 100644 ext/aemu_postoffice/aemu_postoffice_packets.h create mode 100644 ext/aemu_postoffice/client/delay_impl_linux.c create mode 100644 ext/aemu_postoffice/client/delay_impl_windows.c create mode 100644 ext/aemu_postoffice/client/log_linux.h create mode 100644 ext/aemu_postoffice/client/log_windows.h create mode 100644 ext/aemu_postoffice/client/mutex_impl_linux.c create mode 100644 ext/aemu_postoffice/client/mutex_impl_linux.h create mode 100644 ext/aemu_postoffice/client/mutex_impl_windows.c create mode 100644 ext/aemu_postoffice/client/mutex_impl_windows.h create mode 100644 ext/aemu_postoffice/client/postoffice.c create mode 100644 ext/aemu_postoffice/client/postoffice_client.h create mode 100644 ext/aemu_postoffice/client/sock_impl_linux.c create mode 100644 ext/aemu_postoffice/client/sock_impl_linux.h create mode 100644 ext/aemu_postoffice/client/sock_impl_windows.c create mode 100644 ext/aemu_postoffice/client/sock_impl_windows.h create mode 100644 ext/aemu_postoffice/gpl-3.0.txt create mode 100644 ext/aemu_postoffice/upstream.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ecab0a13d..f213942057 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2073,6 +2073,24 @@ set(GPU_SOURCES GPU/Software/TransformUnit.h ) +if(WIN32) + set(aemu_postoffice + ext/aemu_postoffice/client/postoffice.c + ext/aemu_postoffice/client/delay_impl_windows.c + ext/aemu_postoffice/client/mutex_impl_windows.c + ext/aemu_postoffice/client/sock_impl_windows.c + ) +endif() + +if(LINUX OR ANDROID OR MACOSX OR IOS) + set(aemu_postoffice + ext/aemu_postoffice/client/postoffice.c + ext/aemu_postoffice/client/delay_impl_linux.c + ext/aemu_postoffice/client/mutex_impl_linux.c + ext/aemu_postoffice/client/sock_impl_linux.c + ) +endif() + # 'ppsspp_jni' on ANDROID, 'Core' everywhere else # SHARED on ANDROID, STATIC everywhere else add_library(${CoreLibName} ${CoreLinkType} @@ -2318,6 +2336,7 @@ add_library(${CoreLibName} ${CoreLinkType} Core/HLE/NetAdhocCommon.h Core/HLE/sceNetAdhoc.cpp Core/HLE/sceNetAdhoc.h + ${aemu_postoffice} Core/HLE/sceNetAdhocMatching.cpp Core/HLE/sceNetAdhocMatching.h Core/HLE/sceNetInet.cpp diff --git a/Core/Config.cpp b/Core/Config.cpp index 480e69c29a..3435281f08 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -1012,6 +1012,7 @@ static const ConfigSetting networkSettings[] = { ConfigSetting("EnableWlan", SETTING(g_Config, bEnableWlan), false, CfgFlag::PER_GAME), ConfigSetting("EnableAdhocServer", SETTING(g_Config, bEnableAdhocServer), false, CfgFlag::PER_GAME), ConfigSetting("proAdhocServer", SETTING(g_Config, proAdhocServer), "socom.cc", CfgFlag::PER_GAME), + ConfigSetting("ServerHasRelay", SETTING(g_Config, bServerHasRelay), false, CfgFlag::PER_GAME), ConfigSetting("proAdhocServerList", SETTING(g_Config, proAdhocServerList), &defaultProAdhocServerList, CfgFlag::DEFAULT), ConfigSetting("PortOffset", SETTING(g_Config, iPortOffset), 10000, CfgFlag::PER_GAME), ConfigSetting("PrimaryDNSServer", SETTING(g_Config, sInfrastructureDNSServer), "67.222.156.250", CfgFlag::PER_GAME), diff --git a/Core/Config.h b/Core/Config.h index df5798194f..76469ef692 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -539,6 +539,7 @@ public: // Networking bool bEnableAdhocServer; std::string proAdhocServer; + bool bServerHasRelay; std::vector proAdhocServerList; std::string sInfrastructureDNSServer; std::string sInfrastructureUsername; // Username used for Infrastructure play. Different restrictions. diff --git a/Core/Core.cpp b/Core/Core.cpp index 639ed65ba1..4ef56724f2 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -45,6 +45,8 @@ #include "GPU/GPU.h" #include "GPU/GPUCommon.h" +#include "ext/aemu_postoffice/client/postoffice_client.h" + // Step command to execute next static std::mutex g_stepMutex; @@ -156,6 +158,9 @@ void Core_NotifyLifecycle(CoreLifecycle stage) { void Core_Stop() { Core_ResetException(); Core_UpdateState(CORE_POWERDOWN); + + // close all active aemu postoffice sessions if exist + aemu_post_office_init(); } void Core_UpdateState(CoreState newState) { diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 56af3f33f4..4cce638c08 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -640,6 +640,10 @@ + + + + @@ -1352,4 +1356,4 @@ - \ No newline at end of file + diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index 6e08989137..aa1b8cc80a 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -529,6 +529,18 @@ HLE\Libraries + + HLE\Libraries + + + HLE\Libraries + + + HLE\Libraries + + + HLE\Libraries + HLE\Libraries @@ -2290,4 +2302,4 @@ Ext - \ No newline at end of file + diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h index f45c213182..e93845ef2a 100644 --- a/Core/HLE/proAdhoc.h +++ b/Core/HLE/proAdhoc.h @@ -328,6 +328,7 @@ typedef struct AdhocSocket { SceNetAdhocPdpStat pdp; SceNetAdhocPtpStat ptp; } data; + void *postoffice_handle; // aemu_postoffice mode handle } PACK AdhocSocket; // Gamemode Optional Peer Buffer Data diff --git a/Core/HLE/sceKernelThread.h b/Core/HLE/sceKernelThread.h index adab093201..aff67f617d 100644 --- a/Core/HLE/sceKernelThread.h +++ b/Core/HLE/sceKernelThread.h @@ -78,6 +78,7 @@ int sceKernelGetThreadExitStatus(SceUID threadID); u32 sceKernelGetThreadmanIdType(u32); u32 sceKernelGetThreadmanIdList(u32 type, u32 readBufPtr, u32 readBufSize, u32 idCountPtr); u32 sceKernelExtendThreadStack(u32 size, u32 entryAddr, u32 entryParameter); +void __KernelScheduleWakeup(SceUID threadID, s64 usFromNow); struct SceKernelSysClock { u32_le lo; diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 0cbacb0381..c3e5c53f02 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -54,6 +54,8 @@ #include "Core/HLE/KernelWaitHelpers.h" #include "Core/HLE/NetAdhocCommon.h" +#include "ext/aemu_postoffice/client/postoffice_client.h" + #ifdef _WIN32 #undef errno #define errno WSAGetLastError() @@ -86,6 +88,9 @@ std::map sendTargetPeers; int gameModeNotifyEvent = -1; +#define AEMU_POSTOFFICE_PORT 27313 +#define AEMU_POSTOFFICE_ID 999 + int AcceptPtpSocket(int ptpId, int newsocket, sockaddr_in& peeraddr, SceNetEtherAddr* addr, u16_le* port); int PollAdhocSocket(SceNetAdhocPollSd* sds, int count, int timeout, int nonblock); int FlushPtpSocket(int socketId); @@ -436,6 +441,84 @@ int StartGameModeScheduler() { return 0; } +static void *pdp_postoffice_recover(int idx){ + AdhocSocket *internal = adhocSockets[idx]; + if (internal->postoffice_handle != NULL){ + return internal->postoffice_handle; + } + + INFO_LOG(Log::sceNet, "%s: recovering pdp socket id %d", __func__, idx + 1); + + struct aemu_post_office_sock_addr addr; + addr.addr = g_adhocServerIP.in.sin_addr.s_addr; + addr.port = htons(AEMU_POSTOFFICE_PORT); + + SceNetEtherAddr local_mac; + getLocalMac(&local_mac); + + int state; + internal->postoffice_handle = pdp_create_v4(&addr, (const char *)&local_mac, internal->data.pdp.lport + portOffset, &state); + if (state != AEMU_POSTOFFICE_CLIENT_OK){ + ERROR_LOG(Log::sceNet, "%s: failed creating pdp socket on aemu postoffice library, %d", __func__, state); + } + + INFO_LOG(Log::sceNet, "%s: pdp recovery for id %d: %p", __func__, idx + 1, internal->postoffice_handle); + return internal->postoffice_handle; +} + +static int pdp_peek_next_size_postoffice(int idx){ + AdhocSocket *internal = adhocSockets[idx]; + void *pdp_sock = pdp_postoffice_recover(idx); + if (pdp_sock == NULL){ + return 0; + } + int peek_status = pdp_peek_next_size(pdp_sock); + if (peek_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD){ + pdp_delete(internal->postoffice_handle); + internal->postoffice_handle = NULL; + return 0; + } + return peek_status; +} + +static int pdp_recv_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *sport, void *data, int *len){ + AdhocSocket *internal = adhocSockets[idx]; + void *pdp_sock = pdp_postoffice_recover(idx); + if (pdp_sock == NULL){ + return SOCKET_ERROR; + } + + int sport_copy; + SceNetEtherAddr saddr_copy; + int len_copy = *len; + + if (len_copy > 2048){ + // trim, library limites pdp packets + len_copy = 2048; + } + + int pdp_recv_status = pdp_recv(pdp_sock, (char *)&saddr_copy, &sport_copy, (char *)data, &len_copy, true); + if (pdp_recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD){ + pdp_delete(internal->postoffice_handle); + internal->postoffice_handle = NULL; + return SOCKET_ERROR; + } + if (pdp_recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + return SOCKET_ERROR; + } + if (pdp_recv_status == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY){ + // this is pretty critical + ERROR_LOG(Log::sceNet, "%s: critical: huge client buf %d what is going on please fix", __func__, *len); + } + + *len = len_copy; + if (saddr != NULL){ + *saddr = saddr_copy; + } + *sport = sport_copy - portOffset; + return 0; +} + int DoBlockingPdpRecv(AdhocSocketRequest& req, s64& result) { auto sock = adhocSockets[req.id - 1]; if (!sock) { @@ -458,9 +541,36 @@ int DoBlockingPdpRecv(AdhocSocketRequest& req, s64& result) { sinlen = sizeof(sin); memset(&sin, 0, sinlen); - // On Windows: MSG_TRUNC are not supported on recvfrom (socket error WSAEOPNOTSUPP), so we use dummy buffer as an alternative - ret = recvfrom(pdpsocket.id, dummyPeekBuf64k, dummyPeekBuf64kSize, MSG_PEEK | MSG_NOSIGNAL, (struct sockaddr*)&sin, &sinlen); - sockerr = socket_errno; + if (g_Config.bServerHasRelay){ + while(1){ + int next_size = pdp_peek_next_size_postoffice(req.id - 1); + if (next_size == 0){ + // no next packet + ret = SOCKET_ERROR; + sockerr = EAGAIN; + break; + } + if (next_size > *req.length){ + // next is larger than current buffer + result = SCE_NET_ADHOC_ERROR_NOT_ENOUGH_SPACE; + return 0; + } + uint16_t recv_port; + ret = pdp_recv_postoffice(req.id - 1, req.remoteMAC, req.remotePort, req.buffer, req.length); + if (ret == 0){ + // we got data into the request + result = 0; + return 0; + } + ret = SOCKET_ERROR; + sockerr = EAGAIN; + break; + } + }else{ + // On Windows: MSG_TRUNC are not supported on recvfrom (socket error WSAEOPNOTSUPP), so we use dummy buffer as an alternative + ret = recvfrom(pdpsocket.id, dummyPeekBuf64k, dummyPeekBuf64kSize, MSG_PEEK | MSG_NOSIGNAL, (struct sockaddr*)&sin, &sinlen); + sockerr = socket_errno; + } // Discard packets from IP that can't be translated into MAC address to prevent confusing the game, since the sender MAC won't be updated and may contains invalid/undefined value. // TODO: In order to discard packets from unresolvable IP (can't be translated into player's MAC) properly, we'll need to manage the socket buffer ourself, @@ -561,6 +671,29 @@ int DoBlockingPdpRecv(AdhocSocketRequest& req, s64& result) { return 0; } +static int pdp_send_postoffice(int idx, const SceNetEtherAddr *daddr, uint16_t dport, const void *data, int len){ + AdhocSocket *internal = adhocSockets[idx]; + void *pdp_sock = pdp_postoffice_recover(idx); + if (pdp_sock == NULL){ + return SOCKET_ERROR; + } + + int pdp_send_status = pdp_send(pdp_sock, (const char *)daddr, dport + portOffset, (char *)data, len, true); + if (pdp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD){ + pdp_delete(internal->postoffice_handle); + internal->postoffice_handle = NULL; + return SOCKET_ERROR; + } + if (pdp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + return SOCKET_ERROR; + } + if (pdp_send_status == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY){ + // this is pretty critical + ERROR_LOG(Log::sceNet, "%s: critical: huge client buf %d what is going on please fix", __func__, len); + } + return 0; +} + int DoBlockingPdpSend(AdhocSocketRequest& req, s64& result, AdhocSendTargets& targetPeers) { auto sock = adhocSockets[req.id - 1]; if (!sock) { @@ -583,8 +716,19 @@ int DoBlockingPdpSend(AdhocSocketRequest& req, s64& result, AdhocSendTargets& ta target.sin_addr.s_addr = peer->ip; target.sin_port = htons(peer->port + peer->portOffset); - int ret = sendto(pdpsocket.id, (const char*)req.buffer, targetPeers.length, MSG_NOSIGNAL, (struct sockaddr*)&target, sizeof(target)); - int sockerr = socket_errno; + int ret = 0; + int sockerr = 0; + if (g_Config.bServerHasRelay){ + ret = pdp_send_postoffice(req.id - 1, &peer->mac, peer->port, req.buffer, targetPeers.length); + if (ret == 0){ + ret == *req.length; + }else{ + sockerr = EAGAIN; + } + }else{ + ret = sendto(pdpsocket.id, (const char*)req.buffer, targetPeers.length, MSG_NOSIGNAL, (struct sockaddr*)&target, sizeof(target)); + sockerr = socket_errno; + } if (ret >= 0) { DEBUG_LOG(Log::sceNet, "sceNetAdhocPdpSend[%i:%u](B): Sent %u bytes to %s:%u\n", req.id, getLocalPort(pdpsocket.id), ret, ip2str(target.sin_addr).c_str(), ntohs(target.sin_port)); @@ -614,6 +758,25 @@ int DoBlockingPdpSend(AdhocSocketRequest& req, s64& result, AdhocSendTargets& ta return 0; } +static int ptp_send_postoffice(int idx, const void *data, int len){ + AdhocSocket *internal = adhocSockets[idx]; + + int ptp_send_status = ptp_send(internal->postoffice_handle, (const char *)data, len, true); + if (ptp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD){ + // the session is dead, need to be reflected to the other side + return SOCKET_ERROR; + } + if (ptp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; + } + if (ptp_send_status == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY){ + // this is pretty critical + ERROR_LOG(Log::sceNet, "%s: critical: huge client buf %d what is going on please fix", __func__, len); + } + + return 0; +} + int DoBlockingPtpSend(AdhocSocketRequest& req, s64& result) { auto sock = adhocSockets[req.id - 1]; if (!sock) { @@ -628,8 +791,27 @@ int DoBlockingPtpSend(AdhocSocketRequest& req, s64& result) { } // Send Data - int ret = send(ptpsocket.id, (const char*)req.buffer, *req.length, MSG_NOSIGNAL); - int sockerr = socket_errno; + int ret = 0; + int sockerr = 0; + if (g_Config.bServerHasRelay){ + ret = ptp_send_postoffice(req.id - 1, req.buffer, *req.length); + if (ret == 0){ + // sent + result = 0; + return 0; + } + if (ret == SOCKET_ERROR){ + ptpsocket.state = ADHOC_PTP_STATE_CLOSED; + result = SCE_NET_ADHOC_ERROR_DISCONNECTED; + return 0; + } + // SCE_NET_ADHOC_ERROR_WOULD_BLOCK + ret = SOCKET_ERROR; + sockerr = EAGAIN; + }else{ + ret = send(ptpsocket.id, (const char*)req.buffer, *req.length, MSG_NOSIGNAL); + sockerr = socket_errno; + } // Success if (ret > 0) { @@ -667,6 +849,34 @@ int DoBlockingPtpSend(AdhocSocketRequest& req, s64& result) { return 0; } +static int ptp_recv_postoffice(int idx, void *data, int *len){ + AdhocSocket *internal = adhocSockets[idx]; + + int len_copy = *len; + if (len_copy > 50 * 1024){ + // trim, library limit + len_copy = 50 * 1024; + } + + int ptp_recv_status = ptp_recv(internal->postoffice_handle, (char *)data, &len_copy, true); + if (ptp_recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD){ + // the session is dead, need to be reflected to the other side + return SOCKET_ERROR; + } + if (ptp_recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; + } + if (ptp_recv_status == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY){ + // this is pretty critical + ERROR_LOG(Log::sceNet, "%s: critical: huge client buf %d what is going on please fix", __func__, *len); + } + + // AEMU_POSTOFFICE_CLIENT_SESSION_DATA_TRUNC is okay, it just means it has data in it's user space buffer + + *len = len_copy; + return 0; +} + int DoBlockingPtpRecv(AdhocSocketRequest& req, s64& result) { auto sock = adhocSockets[req.id - 1]; if (!sock) { @@ -680,8 +890,28 @@ int DoBlockingPtpRecv(AdhocSocketRequest& req, s64& result) { return 0; } - int ret = recv(ptpsocket.id, (char*)req.buffer, std::max(0, *req.length), MSG_NOSIGNAL); - int sockerr = socket_errno; + int ret = 0; + int sockerr = 0; + if (g_Config.bServerHasRelay){ + ret = ptp_recv_postoffice(req.id - 1, req.buffer, req.length); + if (ret == 0){ + // we got data + result = 0; + return 0; + } + if (ret == SOCKET_ERROR){ + // the socket died, let the game know + ptpsocket.state = ADHOC_PTP_STATE_CLOSED; + result = SCE_NET_ADHOC_ERROR_DISCONNECTED; + return 0; + } + // SCE_NET_ADHOC_ERROR_WOULD_BLOCK + ret = SOCKET_ERROR; + sockerr = EAGAIN; + }else{ + ret = recv(ptpsocket.id, (char*)req.buffer, std::max(0, *req.length), MSG_NOSIGNAL); + sockerr = socket_errno; + } // Received Data. POSIX: May received 0 bytes when the remote peer already closed the connection. if (ret > 0) { @@ -723,6 +953,104 @@ int DoBlockingPtpRecv(AdhocSocketRequest& req, s64& result) { return 0; } +static void *ptp_listen_postoffice_recover(int idx){ + AdhocSocket *internal = adhocSockets[idx]; + if (internal->postoffice_handle != NULL){ + return internal->postoffice_handle; + } + + INFO_LOG(Log::sceNet, "%s: recovering ptp listen socket id %d", __func__, idx + 1); + + struct aemu_post_office_sock_addr addr; + addr.addr = g_adhocServerIP.in.sin_addr.s_addr; + addr.port = htons(AEMU_POSTOFFICE_PORT); + + int state; + internal->postoffice_handle = ptp_listen_v4(&addr, (const char*)&internal->data.ptp.laddr, internal->data.ptp.lport + portOffset, &state); + + if (state != AEMU_POSTOFFICE_CLIENT_OK){ + ERROR_LOG(Log::sceNet, "%s: failed recovering ptp listen socket, %d", __func__, state); + } + + INFO_LOG(Log::sceNet, "%s: ptp listen recovery for id %d: %p", __func__, idx + 1, internal->postoffice_handle); + + return internal->postoffice_handle; +} + +static int ptp_accept_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *sport){ + void *ptp_listen_socket = ptp_listen_postoffice_recover(idx); + + if (ptp_listen_socket == NULL){ + return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; + } + + int state; + int port_cpy; + SceNetEtherAddr mac_cpy; + void *new_ptp_socket = ptp_accept(ptp_listen_socket, (char *)&mac_cpy, &port_cpy, true, &state); + if (new_ptp_socket == NULL){ + if (state == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD){ + ptp_listen_close(adhocSockets[idx]->postoffice_handle); + adhocSockets[idx]->postoffice_handle = NULL; + return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; + } + if (state == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY){ + // pretty critical here + ERROR_LOG(Log::sceNet, "%s: aemu_postoffice ran out of memory to accept a new connection", __func__); + } + // AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK + return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; + } + + // we have a new socket + AdhocSocket *internal = (AdhocSocket *)malloc(sizeof(AdhocSocket)); + if (internal == NULL){ + ERROR_LOG(Log::sceNet, "%s: critical: ran out of heap memory while accepting new connection", __func__); + ptp_close(new_ptp_socket); + return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; + } + + internal->type = SOCK_PTP; + internal->postoffice_handle = new_ptp_socket; + internal->data.ptp.laddr = adhocSockets[idx]->data.ptp.laddr; + internal->data.ptp.lport = adhocSockets[idx]->data.ptp.lport; + internal->data.ptp.paddr = mac_cpy; + internal->data.ptp.pport = port_cpy; + internal->data.ptp.state = ADHOC_PTP_STATE_ESTABLISHED; + internal->data.ptp.rcv_sb_cc = adhocSockets[idx]->data.ptp.rcv_sb_cc; + internal->data.ptp.snd_sb_cc = adhocSockets[idx]->data.ptp.snd_sb_cc; + internal->data.ptp.id = AEMU_POSTOFFICE_ID; + internal->flags = 0; + + AdhocSocket **slot = NULL; + int i; + for(i = 0;i < MAX_SOCKET;i++){ + if (adhocSockets[i] == NULL){ + slot = &adhocSockets[i]; + break; + } + } + + if (slot == NULL){ + ptp_close(new_ptp_socket); + free(internal); + ERROR_LOG(Log::sceNet, "%s: critical: cannot find an empty mapper slot", __func__); + return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; + } + + *slot = internal; + + if (saddr != NULL){ + *saddr = mac_cpy; + } + if (sport != NULL){ + *sport = port_cpy - portOffset; + } + + INFO_LOG(Log::sceNet, "%s: accepted ptp socket with id %d %p", __func__, i + 1, internal->postoffice_handle); + return i + 1; +} + int DoBlockingPtpAccept(AdhocSocketRequest& req, s64& result) { auto sock = adhocSockets[req.id - 1]; if (!sock) { @@ -741,12 +1069,23 @@ int DoBlockingPtpAccept(AdhocSocketRequest& req, s64& result) { socklen_t sinlen = sizeof(sin); int ret, sockerr; - // Check if listening socket is ready to accept - ret = IsSocketReady(ptpsocket.id, true, false, &sockerr); - if (ret > 0) { - // Accept Connection - ret = accept(ptpsocket.id, (struct sockaddr*)&sin, &sinlen); - sockerr = socket_errno; + if (g_Config.bServerHasRelay){ + ret = ptp_accept_postoffice(req.id - 1, req.remoteMAC, req.remotePort); + if (ret >= 0){ + result = ret; + return 0; + }else{ + ret = SOCKET_ERROR; + sockerr = EAGAIN; + } + }else{ + // Check if listening socket is ready to accept + ret = IsSocketReady(ptpsocket.id, true, false, &sockerr); + if (ret > 0) { + // Accept Connection + ret = accept(ptpsocket.id, (struct sockaddr*)&sin, &sinlen); + sockerr = socket_errno; + } } // Accepted New Connection @@ -1216,6 +1555,8 @@ u32 sceNetAdhocInit() { // Since we are deleting GameMode Master here, we should probably need to make sure GameMode resources all cleared too. deleteAllGMB(); + aemu_post_office_init(); + // Return Success return hleLogInfo(Log::sceNet, 0, "at %08x", currentMIPS->pc); } @@ -1289,6 +1630,39 @@ int sceNetAdhocctlGetState(u32 ptrToStatus) { return hleLogVerbose(Log::sceNet, 0, "state = %d", state); } +static int pdp_create_postoffice(const SceNetEtherAddr *saddr, int sport, int bufsize){ + AdhocSocket *internal = (AdhocSocket*)malloc(sizeof(AdhocSocket)); + if (internal == NULL){ + return hleLogDebug(Log::sceNet, ERROR_NET_NO_SPACE, "net no space"); + } + + internal->type = SOCK_PDP; + internal->postoffice_handle = NULL; + internal->data.pdp.laddr = *saddr; + internal->data.pdp.lport = sport; + internal->data.pdp.rcv_sb_cc = bufsize; + internal->data.pdp.id = AEMU_POSTOFFICE_ID; + internal->flags = 0; + + AdhocSocket **free_slot = NULL; + int i; + for(i = 0;i < MAX_SOCKET; i++){ + if(adhocSockets[i] == NULL){ + free_slot = &adhocSockets[i]; + break; + } + } + if (free_slot == NULL){ + free(internal); + return ERROR_NET_NO_SPACE; + } + + *free_slot = internal; + pdp_postoffice_recover(i); + INFO_LOG(Log::sceNet, "%s: created pdp socket with id %d %p", __func__, i + 1, internal->postoffice_handle); + return i + 1; +} + /** * Adhoc Emulator PDP Socket Creator * @param saddr Local MAC (Unused) @@ -1330,6 +1704,9 @@ int sceNetAdhocPdpCreate(const char *mac, int port, int bufferSize, u32 flag) { } // Valid MAC supplied. FIXME: MAC only valid after successful attempt to Create/Connect/Join a Group? (ie. adhocctlCurrentMode != ADHOCCTL_MODE_NONE) if ((adhocctlCurrentMode != ADHOCCTL_MODE_NONE) && isLocalMAC(saddr)) { + if (g_Config.bServerHasRelay) + return pdp_create_postoffice(saddr, port, bufferSize); + // Create Internet UDP Socket // Socket is remapped through adhocSockets int usocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); @@ -1561,8 +1938,20 @@ int sceNetAdhocPdpSend(int id, const char *mac, u32 port, void *data, int len, i //_acquireNetworkLock(); // Send Data. UDP are guaranteed to be sent as a whole or nothing(failed if len > SO_MAX_MSG_SIZE), and never be partially sent/recv - int sent = sendto(pdpsocket.id, (const char *)data, len, MSG_NOSIGNAL, (struct sockaddr*)&target, sizeof(target)); - int error = socket_errno; + int sent = 0; + int error = 0; + if (g_Config.bServerHasRelay){ + sent = pdp_send_postoffice(id - 1, daddr, dport, data, len); + if (sent == 0){ + sent = len; + }else{ + sent = SOCKET_ERROR; + error = EAGAIN; + } + }else{ + sent = sendto(pdpsocket.id, (const char *)data, len, MSG_NOSIGNAL, (struct sockaddr*)&target, sizeof(target)); + error = socket_errno; + } if (sent == SOCKET_ERROR) { // Simulate blocking behaviour with non-blocking socket @@ -1574,7 +1963,7 @@ int sceNetAdhocPdpSend(int id, const char *mac, u32 port, void *data, int len, i } AdhocSendTargets dest = { len, {}, false }; - dest.peers.push_back({ target.sin_addr.s_addr, dport, finalPortOffset }); + dest.peers.push_back({ target.sin_addr.s_addr, dport, finalPortOffset, *daddr }); sendTargetPeers[threadSocketId] = dest; return WaitBlockingAdhocSocket(threadSocketId, PDP_SEND, id, data, nullptr, timeout, nullptr, nullptr, "pdp send"); } @@ -1635,7 +2024,7 @@ int sceNetAdhocPdpSend(int id, const char *mac, u32 port, void *data, int len, i if (peer->last_recv == 0) continue; - dest.peers.push_back({ peer->ip_addr, dport, peer->port_offset }); + dest.peers.push_back({ peer->ip_addr, dport, peer->port_offset, peer->mac_addr }); } // Free Peer Lock peerlock.unlock(); @@ -1662,8 +2051,21 @@ int sceNetAdhocPdpSend(int id, const char *mac, u32 port, void *data, int len, i target.sin_addr.s_addr = peer.ip; target.sin_port = htons(dport + peer.portOffset); - int sent = sendto(pdpsocket.id, (const char*)data, len, MSG_NOSIGNAL, (struct sockaddr*)&target, sizeof(target)); - int error = socket_errno; + int sent = 0; + int error = 0; + if (g_Config.bServerHasRelay){ + sent = pdp_send_postoffice(id - 1, &peer.mac, dport, data, len); + if (sent == 0){ + sent = len; + }else{ + sent = SOCKET_ERROR; + error = EAGAIN; + } + }else{ + sent = sendto(pdpsocket.id, (const char *)data, len, MSG_NOSIGNAL, (struct sockaddr*)&target, sizeof(target)); + error = socket_errno; + } + if (sent == SOCKET_ERROR) { DEBUG_LOG(Log::sceNet, "Socket Error (%i) on sceNetAdhocPdpSend[%i:%u->%u](BC) [size=%i]", error, id, getLocalPort(pdpsocket.id), ntohs(target.sin_port), len); } @@ -1788,39 +2190,65 @@ int sceNetAdhocPdpRecv(int id, void *addr, void * port, void *buf, void *dataLen int received = 0; int error; - int disCnt = 16; - while (--disCnt > 0) - { - // Receive Data. PDP always sent in full size or nothing(failed), recvfrom will always receive in full size as requested (blocking) or failed (non-blocking). If available UDP data is larger than buffer, excess data is lost. - // Should peek first for the available data size if it's more than len return SCE_NET_ADHOC_ERROR_NOT_ENOUGH_SPACE along with required size in len to prevent losing excess data - // On Windows: MSG_TRUNC are not supported on recvfrom (socket error WSAEOPNOTSUPP), so we use dummy buffer as an alternative - sinlen = sizeof(sin); - memset(&sin, 0, sinlen); - received = recvfrom(pdpsocket.id, dummyPeekBuf64k, dummyPeekBuf64kSize, MSG_PEEK | MSG_NOSIGNAL, (struct sockaddr*)&sin, &sinlen); - error = socket_errno; - // Discard packets from IP that can't be translated into MAC address to prevent confusing the game, since the sender MAC won't be updated and may contains invalid/undefined value. - // TODO: In order to discard packets from unresolvable IP (can't be translated into player's MAC) properly, we'll need to manage the socket buffer ourself, - // by reading the whole available data, separates each datagram and discard unresolvable one, so we can calculate the correct number of available data to recv on GetPdpStat too. - // We may also need to implement encryption (or a simple checksum will do) in order to validate the packet to findout whether it came from PPSSPP or a different App that may be sending/broadcasting data to the same port being used by a game - // (in case the IP was resolvable but came from a different App, which will need to be discarded too) - // Note: Looping to check too many packets (ie. contiguous) to discard per one non-blocking PdpRecv syscall may cause a slow down - if (received != SOCKET_ERROR && !resolveIP(sin.sin_addr.s_addr, &mac)) { - // Remove the packet from socket buffer + if (g_Config.bServerHasRelay){ + while(1){ + int next_size = pdp_peek_next_size_postoffice(id - 1); + if (next_size == 0){ + // no next packet + received = SOCKET_ERROR; + error = EAGAIN; + break; + } + if (next_size > *len){ + // next is larger than current buffer + return SCE_NET_ADHOC_ERROR_NOT_ENOUGH_SPACE; + } + uint16_t recv_port; + received = pdp_recv_postoffice(id - 1, saddr, sport, buf, len); + if (received == 0){ + // we got data + hleEatMicro(50); + return 0; + } + received = SOCKET_ERROR; + error = EAGAIN; + break; + } + }else{ + int disCnt = 16; + while (--disCnt > 0) + { + // Receive Data. PDP always sent in full size or nothing(failed), recvfrom will always receive in full size as requested (blocking) or failed (non-blocking). If available UDP data is larger than buffer, excess data is lost. + // Should peek first for the available data size if it's more than len return SCE_NET_ADHOC_ERROR_NOT_ENOUGH_SPACE along with required size in len to prevent losing excess data + // On Windows: MSG_TRUNC are not supported on recvfrom (socket error WSAEOPNOTSUPP), so we use dummy buffer as an alternative sinlen = sizeof(sin); memset(&sin, 0, sinlen); - recvfrom(pdpsocket.id, dummyPeekBuf64k, dummyPeekBuf64kSize, MSG_NOSIGNAL, (struct sockaddr*)&sin, &sinlen); - if (flag) { - VERBOSE_LOG(Log::sceNet, "%08x=sceNetAdhocPdpRecv: would block (disc)", SCE_NET_ADHOC_ERROR_WOULD_BLOCK); // Temporary fix to avoid a crash on the Logs due to trying to Logs syscall's argument from another thread (ie. AdhocMatchingInput thread) - return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; // hleLogSuccessVerboseX(Log::sceNet, SCE_NET_ADHOC_ERROR_WOULD_BLOCK, "would block (disc)"); - } - else { - // Simulate blocking behaviour with non-blocking socket, and discard more unresolvable packets until timeout reached - u64 threadSocketId = ((u64)__KernelGetCurThread()) << 32 | pdpsocket.id; - return WaitBlockingAdhocSocket(threadSocketId, PDP_RECV, id, buf, len, timeout, saddr, sport, "pdp recv (disc)"); + received = recvfrom(pdpsocket.id, dummyPeekBuf64k, dummyPeekBuf64kSize, MSG_PEEK | MSG_NOSIGNAL, (struct sockaddr*)&sin, &sinlen); + error = socket_errno; + // Discard packets from IP that can't be translated into MAC address to prevent confusing the game, since the sender MAC won't be updated and may contains invalid/undefined value. + // TODO: In order to discard packets from unresolvable IP (can't be translated into player's MAC) properly, we'll need to manage the socket buffer ourself, + // by reading the whole available data, separates each datagram and discard unresolvable one, so we can calculate the correct number of available data to recv on GetPdpStat too. + // We may also need to implement encryption (or a simple checksum will do) in order to validate the packet to findout whether it came from PPSSPP or a different App that may be sending/broadcasting data to the same port being used by a game + // (in case the IP was resolvable but came from a different App, which will need to be discarded too) + // Note: Looping to check too many packets (ie. contiguous) to discard per one non-blocking PdpRecv syscall may cause a slow down + if (received != SOCKET_ERROR && !resolveIP(sin.sin_addr.s_addr, &mac)) { + // Remove the packet from socket buffer + sinlen = sizeof(sin); + memset(&sin, 0, sinlen); + recvfrom(pdpsocket.id, dummyPeekBuf64k, dummyPeekBuf64kSize, MSG_NOSIGNAL, (struct sockaddr*)&sin, &sinlen); + if (flag) { + VERBOSE_LOG(Log::sceNet, "%08x=sceNetAdhocPdpRecv: would block (disc)", SCE_NET_ADHOC_ERROR_WOULD_BLOCK); // Temporary fix to avoid a crash on the Logs due to trying to Logs syscall's argument from another thread (ie. AdhocMatchingInput thread) + return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; // hleLogSuccessVerboseX(Log::sceNet, SCE_NET_ADHOC_ERROR_WOULD_BLOCK, "would block (disc)"); + } + else { + // Simulate blocking behaviour with non-blocking socket, and discard more unresolvable packets until timeout reached + u64 threadSocketId = ((u64)__KernelGetCurThread()) << 32 | pdpsocket.id; + return WaitBlockingAdhocSocket(threadSocketId, PDP_RECV, id, buf, len, timeout, saddr, sport, "pdp recv (disc)"); + } } + else + break; } - else - break; } // At this point we assumed that the packet is a valid PPSSPP packet @@ -1849,8 +2277,10 @@ int sceNetAdhocPdpRecv(int id, void *addr, void * port, void *buf, void *dataLen sinlen = sizeof(sin); memset(&sin, 0, sinlen); // On Windows: Socket Error 10014 may happen when buffer size is less than the minimum allowed/required (ie. negative number on Vulcanus Seek and Destroy), the address is not a valid part of the user address space (ie. on the stack or when buffer overflow occurred), or the address is not properly aligned (ie. multiple of 4 on 32bit and multiple of 8 on 64bit) https://stackoverflow.com/questions/861154/winsock-error-code-10014 - received = recvfrom(pdpsocket.id, (char*)buf, std::max(0, *len), MSG_NOSIGNAL, (struct sockaddr*)&sin, &sinlen); - error = socket_errno; + if (pdpsocket.id != AEMU_POSTOFFICE_ID){ + received = recvfrom(pdpsocket.id, (char*)buf, std::max(0, *len), MSG_NOSIGNAL, (struct sockaddr*)&sin, &sinlen); + error = socket_errno; + } // On Windows: recvfrom on UDP can get error WSAECONNRESET when previous sendto's destination is unreachable (or destination port is not bound), may need to disable SIO_UDP_CONNRESET if (received == SOCKET_ERROR && (error == EAGAIN || error == EWOULDBLOCK || error == ECONNRESET)) { @@ -1951,6 +2381,29 @@ int sceNetAdhocSetSocketAlert(int id, int flag) { return hleDelayResult(hleLogDebug(Log::sceNet, retval), "set socket alert delay", 1000); } +static int get_postoffice_fd(int idx){ + AdhocSocket *internal = adhocSockets[idx]; + if (internal->type == SOCK_PTP){ + if (internal->data.ptp.state == ADHOC_PTP_STATE_LISTEN){ + void *socket = ptp_listen_postoffice_recover(idx); + if (socket != NULL){ + return ptp_listen_get_native_sock(socket); + } + }else if (internal->data.ptp.state == ADHOC_PTP_STATE_ESTABLISHED){ + void *socket = internal->postoffice_handle; + if (socket != NULL){ + return ptp_get_native_sock(socket); + } + } + }else{ + void *socket = pdp_postoffice_recover(idx); + if (socket != NULL){ + return pdp_get_native_sock(socket); + } + } + return -1; +} + int PollAdhocSocket(SceNetAdhocPollSd* sds, int count, int timeout, int nonblock) { //WSAPoll only available for Vista or newer, so we'll use an alternative way for XP since Windows doesn't have poll function like *NIX fd_set readfds, writefds, exceptfds; @@ -1966,12 +2419,22 @@ int PollAdhocSocket(SceNetAdhocPollSd* sds, int count, int timeout, int nonblock if (!sock) { return SCE_NET_ADHOC_ERROR_SOCKET_DELETED; } - if (sock->type == SOCK_PTP) { - fd = sock->data.ptp.id; - } - else { - fd = sock->data.pdp.id; + + if (g_Config.bServerHasRelay) { + int postoffice_fd = get_postoffice_fd(sds[i].id - 1); + if (postoffice_fd == -1){ + continue; + } + fd = postoffice_fd; + }else{ + if (sock->type == SOCK_PTP) { + fd = sock->data.ptp.id; + } + else { + fd = sock->data.pdp.id; + } } + if (fd > maxfd) maxfd = fd; FD_SET(fd, &readfds); FD_SET(fd, &writefds); @@ -1987,11 +2450,20 @@ int PollAdhocSocket(SceNetAdhocPollSd* sds, int count, int timeout, int nonblock for (int i = 0; i < count; i++) { if (sds[i].id > 0 && sds[i].id <= MAX_SOCKET && adhocSockets[sds[i].id - 1] != NULL) { auto sock = adhocSockets[sds[i].id - 1]; - if (sock->type == SOCK_PTP) { - fd = sock->data.ptp.id; - } - else { - fd = sock->data.pdp.id; + + if (g_Config.bServerHasRelay) { + int postoffice_fd = get_postoffice_fd(sds[i].id - 1); + if (postoffice_fd == -1){ + continue; + } + fd = postoffice_fd; + }else{ + if (sock->type == SOCK_PTP) { + fd = sock->data.ptp.id; + } + else { + fd = sock->data.pdp.id; + } } if ((sds[i].events & ADHOC_EV_RECV) && FD_ISSET(fd, &readfds)) sds[i].revents |= ADHOC_EV_RECV; @@ -2122,6 +2594,17 @@ int sceNetAdhocPollSocket(u32 socketStructAddr, int count, int timeout, int nonb return hleLogDebug(Log::sceNet, SCE_NET_ADHOC_ERROR_NOT_INITIALIZED, "adhoc not initialized"); } +static int pdp_delete_postoffice(int idx){ + AdhocSocket *internal = adhocSockets[idx]; + if (internal->postoffice_handle != NULL){ + pdp_delete(internal->postoffice_handle); + } + adhocSockets[idx] = NULL; + free(internal); + INFO_LOG(Log::sceNet, "%s: closed pdp socket with id %d", __func__, idx + 1); + return 0; +} + int NetAdhocPdp_Delete(int id, int unknown) { // Library is initialized if (netAdhocInited) { @@ -2132,6 +2615,9 @@ int NetAdhocPdp_Delete(int id, int unknown) { // Valid Socket if (sock != NULL && sock->type == SOCK_PDP) { + if (g_Config.bServerHasRelay) + return pdp_delete_postoffice(id - 1); + // Close Connection shutdown(sock->data.pdp.id, SD_RECEIVE); closesocket(sock->data.pdp.id); @@ -3028,18 +3514,25 @@ static int sceNetAdhocGetPdpStat(u32 structSize, u32 structAddr) { // Set available bytes to be received. With FIONREAD There might be ghosting 1 byte in recv buffer when remote peer's socket got closed (ie. Warriors Orochi 2) Attempting to recv this ghost 1 byte will result to socket error 10054 (may need to disable SIO_UDP_CONNRESET error) // It seems real PSP respecting the socket buffer size arg, so we may need to cap the value up to the buffer size arg since we use larger buffer, for PDP/UDP the total size must not contains partial/truncated message to avoid data loss. // TODO: We may need to manage PDP messages ourself by reading each msg 1-by-1 and moving it to our internal buffer(msg array) in order to calculate the correct messages size that can fit into buffer size when there are more than 1 messages in the recv buffer (simulate FIONREAD) - sock->data.pdp.rcv_sb_cc = getAvailToRecv(sock->data.pdp.id, sock->buffer_size); - // There might be a possibility for the data to be taken by the OS, thus FIONREAD returns 0, but can be Received - if (sock->data.pdp.rcv_sb_cc == 0) { - // Let's try to peek the data size - // TODO: May need to filter out packets from an IP that can't be translated to MAC address - struct sockaddr_in sin; - socklen_t sinlen; - sinlen = sizeof(sin); - memset(&sin, 0, sinlen); - int received = recvfrom(sock->data.pdp.id, dummyPeekBuf64k, std::min((u32)dummyPeekBuf64kSize, sock->buffer_size), MSG_PEEK | MSG_NOSIGNAL, (struct sockaddr*)&sin, &sinlen); - if (received > 0) - sock->data.pdp.rcv_sb_cc = received; + if (g_Config.bServerHasRelay) { + void *postoffice_handle = pdp_postoffice_recover(j); + if (postoffice_handle != NULL){ + sock->data.pdp.rcv_sb_cc = pdp_peek_next_size(postoffice_handle); + } + }else{ + sock->data.pdp.rcv_sb_cc = getAvailToRecv(sock->data.pdp.id, sock->buffer_size); + // There might be a possibility for the data to be taken by the OS, thus FIONREAD returns 0, but can be Received + if (sock->data.pdp.rcv_sb_cc == 0) { + // Let's try to peek the data size + // TODO: May need to filter out packets from an IP that can't be translated to MAC address + struct sockaddr_in sin; + socklen_t sinlen; + sinlen = sizeof(sin); + memset(&sin, 0, sinlen); + int received = recvfrom(sock->data.pdp.id, dummyPeekBuf64k, std::min((u32)dummyPeekBuf64kSize, sock->buffer_size), MSG_PEEK | MSG_NOSIGNAL, (struct sockaddr*)&sin, &sinlen); + if (received > 0) + sock->data.pdp.rcv_sb_cc = received; + } } // Copy Socket Data from Internal Memory @@ -3138,16 +3631,24 @@ static int sceNetAdhocGetPtpStat(u32 structSize, u32 structAddr) { } } - // Set available bytes to be received - sock->data.ptp.rcv_sb_cc = getAvailToRecv(sock->data.ptp.id); - // It seems real PSP respecting the socket buffer size arg, so we may need to cap the value to the buffer size arg since we use larger buffer - sock->data.ptp.rcv_sb_cc = std::min(sock->data.ptp.rcv_sb_cc, (u32_le)sock->buffer_size); - // There might be a possibility for the data to be taken by the OS, thus FIONREAD returns 0, but can be Received - if (sock->data.ptp.rcv_sb_cc == 0) { - // Let's try to peek the data size - int received = recv(sock->data.ptp.id, dummyPeekBuf64k, std::min((u32)dummyPeekBuf64kSize, sock->buffer_size), MSG_PEEK | MSG_NOSIGNAL); - if (received > 0) - sock->data.ptp.rcv_sb_cc = received; + if (g_Config.bServerHasRelay) { + if (sock->postoffice_handle != NULL){ + sock->data.ptp.rcv_sb_cc = ptp_peek_next_size(sock->postoffice_handle); + }else{ + sock->data.ptp.rcv_sb_cc = 0; + } + }else{ + // Set available bytes to be received + sock->data.ptp.rcv_sb_cc = getAvailToRecv(sock->data.ptp.id); + // It seems real PSP respecting the socket buffer size arg, so we may need to cap the value to the buffer size arg since we use larger buffer + sock->data.ptp.rcv_sb_cc = std::min(sock->data.ptp.rcv_sb_cc, (u32_le)sock->buffer_size); + // There might be a possibility for the data to be taken by the OS, thus FIONREAD returns 0, but can be Received + if (sock->data.ptp.rcv_sb_cc == 0) { + // Let's try to peek the data size + int received = recv(sock->data.ptp.id, dummyPeekBuf64k, std::min((u32)dummyPeekBuf64kSize, sock->buffer_size), MSG_PEEK | MSG_NOSIGNAL); + if (received > 0) + sock->data.ptp.rcv_sb_cc = received; + } } // Copy Socket Data from internal Memory @@ -3277,6 +3778,45 @@ int RecreatePtpSocket(int ptpId) { return 0; } +static int ptp_open_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, const SceNetEtherAddr *daddr, uint16_t dport, uint32_t bufsize){ + AdhocSocket *internal = (AdhocSocket *)malloc(sizeof(AdhocSocket)); + if (internal == NULL){ + ERROR_LOG(Log::sceNet, "%s: ran out of heap memory trying to open ptp socket", __func__); + return ERROR_NET_NO_SPACE; + } + + internal->type = SOCK_PTP; + internal->postoffice_handle = NULL; + internal->data.ptp.state = ADHOC_PTP_STATE_CLOSED; + internal->data.ptp.laddr = *saddr; + internal->data.ptp.lport = sport; + internal->data.ptp.paddr = *daddr; + internal->data.ptp.pport = dport; + internal->data.ptp.rcv_sb_cc = bufsize; + internal->data.ptp.snd_sb_cc = 0; + internal->data.ptp.id = AEMU_POSTOFFICE_ID; + internal->flags = 0; + + AdhocSocket **slot = NULL; + int i; + for(i = 0;i < MAX_SOCKET;i++){ + if(adhocSockets[i] == NULL){ + slot = &adhocSockets[i]; + break; + } + } + + if (slot == NULL){ + free(internal); + ERROR_LOG(Log::sceNet, "%s: cannot find free socket mapper slot while opening ptp socket", __func__); + return ERROR_NET_NO_SPACE; + } + + *slot = internal; + INFO_LOG(Log::sceNet, "%s: created ptp socket with id %d", __func__, i + 1); + return i + 1; +} + /** * Adhoc Emulator PTP Active Socket Creator * @param saddr Local MAC (Unused) @@ -3320,6 +3860,9 @@ static int sceNetAdhocPtpOpen(const char *srcmac, int sport, const char *dstmac, // Valid Arguments if (bufsize > 0 && rexmt_int > 0 && rexmt_cnt > 0) { + if (g_Config.bServerHasRelay) + return ptp_open_postoffice(saddr, sport, daddr, dport, bufsize); + // Create Infrastructure Socket (?) // Socket is remapped through adhocSockets int tcpsocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -3622,18 +4165,30 @@ static int sceNetAdhocPtpAccept(int id, u32 peerMacAddrPtr, u32 peerPortPtr, int // Listener Socket if (ptpsocket.state == ADHOC_PTP_STATE_LISTEN) { hleEatMicro(50); + // Address Information struct sockaddr_in peeraddr; memset(&peeraddr, 0, sizeof(peeraddr)); socklen_t peeraddrlen = sizeof(peeraddr); int error; - // Check if listening socket is ready to accept - int newsocket = IsSocketReady(ptpsocket.id, true, false, &error); - if (newsocket > 0) { - // Accept Connection - newsocket = accept(ptpsocket.id, (struct sockaddr*)&peeraddr, &peeraddrlen); - error = socket_errno; + int newsocket = 0; + if (g_Config.bServerHasRelay){ + newsocket = ptp_accept_postoffice(id - 1, addr, port); + if (newsocket >= 0){ + return newsocket; + }else{ + newsocket = SOCKET_ERROR; + error = EAGAIN; + } + }else{ + // Check if listening socket is ready to accept + newsocket = IsSocketReady(ptpsocket.id, true, false, &error); + if (newsocket > 0) { + // Accept Connection + newsocket = accept(ptpsocket.id, (struct sockaddr*)&peeraddr, &peeraddrlen); + error = socket_errno; + } } if (newsocket == 0 || (newsocket == SOCKET_ERROR && (error == EAGAIN || error == EWOULDBLOCK))) { @@ -3679,12 +4234,46 @@ static int sceNetAdhocPtpAccept(int id, u32 peerMacAddrPtr, u32 peerPortPtr, int return hleLogVerbose(Log::sceNet, SCE_NET_ADHOC_ERROR_NOT_INITIALIZED, "not initialized"); } +static int ptp_connect_postoffice(int idx, uint32_t timeout, int nonblock){ + AdhocSocket *internal = adhocSockets[idx]; + // Phantasy Star Portable 2 will try to reconnect even when previous connect already success, so we should return success too if it's already connected + if (internal->data.ptp.state == ADHOC_PTP_STATE_ESTABLISHED) + return 0; + + uint64_t begin = CoreTiming::GetGlobalTimeUsScaled(); + uint64_t end = begin + timeout; + + struct aemu_post_office_sock_addr addr; + addr.addr = g_adhocServerIP.in.sin_addr.s_addr; + addr.port = htons(AEMU_POSTOFFICE_PORT); + + void *ptp_socket = NULL; + + // note that postoffice connect was designed to be a blocked operation, if the other side don't accept, or listen session not found, the server will kick us out + int state; + ptp_socket = ptp_connect_v4(&addr, (const char *)&internal->data.ptp.laddr, internal->data.ptp.lport + portOffset, (const char *)&internal->data.ptp.paddr, internal->data.ptp.pport + portOffset, &state); + if (ptp_socket == NULL){ + ERROR_LOG(Log::sceNet, "%s: failed connecting to ptp socket, %d", __func__, state); + return SCE_NET_ADHOC_ERROR_CONNECTION_REFUSED; + } + + // we got a new socket + internal->postoffice_handle = ptp_socket; + internal->data.ptp.state = ADHOC_PTP_STATE_ESTABLISHED; + + INFO_LOG(Log::sceNet, "%s: connected ptp socket with id %d %p", __func__, idx + 1, internal->postoffice_handle); + return 0; +} + int NetAdhocPtp_Connect(int id, int timeout, int flag, bool allowForcedConnect) { // Library is initialized if (netAdhocInited) { // Valid Socket if (id > 0 && id <= MAX_SOCKET && adhocSockets[id - 1] != NULL) { + if (g_Config.bServerHasRelay) + return ptp_connect_postoffice(id - 1, timeout, flag); + // Cast Socket auto socket = adhocSockets[id - 1]; auto& ptpsocket = socket->data.ptp; @@ -3818,6 +4407,22 @@ static int sceNetAdhocPtpConnect(int id, int timeout, int flag) { return NetAdhocPtp_Connect(id, timeout, flag); } +static int ptp_close_postoffice(int idx){ + AdhocSocket *internal = adhocSockets[idx]; + void *socket = internal->postoffice_handle; + if (socket != NULL){ + if (internal->data.ptp.state == ADHOC_PTP_STATE_ESTABLISHED){ + ptp_close(socket); + }else if (internal->data.ptp.state == ADHOC_PTP_STATE_LISTEN){ + ptp_listen_close(socket); + } + } + adhocSockets[idx] = NULL; + free(internal); + INFO_LOG(Log::sceNet, "%s: closed ptp socket with id %d", __func__, idx + 1); + return 0; +} + int NetAdhocPtp_Close(int id, int unknown) { // Library is initialized if (netAdhocInited) { @@ -3828,6 +4433,9 @@ int NetAdhocPtp_Close(int id, int unknown) { // Valid Socket if (socket != NULL && socket->type == SOCK_PTP) { + if (g_Config.bServerHasRelay) + return ptp_close_postoffice(id - 1); + // Close Connection shutdown(socket->data.ptp.id, SD_RECEIVE); closesocket(socket->data.ptp.id); @@ -3872,6 +4480,44 @@ static int sceNetAdhocPtpClose(int id, int unknown) { return NetAdhocPtp_Close(id, unknown); } +static int ptp_listen_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, uint32_t bufsize){ + // server connect delegated to accept + AdhocSocket *internal = (AdhocSocket *)malloc(sizeof(AdhocSocket)); + if (internal == NULL){ + ERROR_LOG(Log::sceNet, "%s: out of heap memory when creating ptp listen socket", __func__); + return ERROR_NET_NO_SPACE; + } + + internal->postoffice_handle = NULL; + internal->type = SOCK_PTP; + internal->data.ptp.laddr = *saddr; + internal->data.ptp.lport = sport; + internal->data.ptp.state = ADHOC_PTP_STATE_LISTEN; + internal->data.ptp.rcv_sb_cc = bufsize; + internal->data.ptp.snd_sb_cc = 0; + internal->data.ptp.id = AEMU_POSTOFFICE_ID; + internal->flags = 0; + + AdhocSocket **slot = NULL; + int i; + for(i = 0;i < MAX_SOCKET;i++){ + if (adhocSockets[i] == NULL){ + slot = &adhocSockets[i]; + break; + } + } + + if (slot == NULL){ + ERROR_LOG(Log::sceNet, "%s: out of socket slots when creating adhoc ptp listen socket", __func__); + free(internal); + return ERROR_NET_NO_SPACE; + } + + *slot = internal; + ptp_listen_postoffice_recover(i); + INFO_LOG(Log::sceNet, "%s: created ptp listen socket with id %d %p", __func__, i + 1, internal->postoffice_handle); + return i + 1; +} /** * Adhoc Emulator PTP Passive Socket Creator @@ -3915,6 +4561,9 @@ static int sceNetAdhocPtpListen(const char *srcmac, int sport, int bufsize, int // Valid Arguments if (bufsize > 0 && rexmt_int > 0 && rexmt_cnt > 0 && backlog > 0) { + if (g_Config.bServerHasRelay) + return ptp_listen_postoffice(saddr, sport, bufsize); + // Create Infrastructure Socket (?) // Socket is remapped through adhocSockets int tcpsocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -4102,8 +4751,26 @@ static int sceNetAdhocPtpSend(int id, u32 dataAddr, u32 dataSizeAddr, int timeou // _acquireNetworkLock(); // Send Data - int sent = send(ptpsocket.id, data, *len, MSG_NOSIGNAL); - int error = socket_errno; + int sent = 0; + int error = 0; + if (g_Config.bServerHasRelay){ + sent = ptp_send_postoffice(id - 1, data, *len); + if (sent == 0){ + // sent + hleEatMicro(50); + return 0; + } + if (sent == SOCKET_ERROR){ + ptpsocket.state = ADHOC_PTP_STATE_CLOSED; + return SCE_NET_ADHOC_ERROR_DISCONNECTED; + } + // SCE_NET_ADHOC_ERROR_WOULD_BLOCK + sent = SOCKET_ERROR; + error = EAGAIN; + }else{ + sent = send(ptpsocket.id, data, *len, MSG_NOSIGNAL); + error = socket_errno; + } // Free Network Lock // _freeNetworkLock(); @@ -4206,9 +4873,26 @@ static int sceNetAdhocPtpRecv(int id, u32 dataAddr, u32 dataSizeAddr, int timeou int received = 0; int error = 0; - // Receive Data. POSIX: May received 0 bytes when the remote peer already closed the connection. - received = recv(ptpsocket.id, (char*)buf, std::max(0, *len), MSG_NOSIGNAL); - error = socket_errno; + if (g_Config.bServerHasRelay){ + received = ptp_recv_postoffice(id - 1, buf, len); + if (received == 0){ + // we got data + hleEatMicro(50); + return 0; + } + if (received == SOCKET_ERROR){ + // the socket died, let the game know + ptpsocket.state = ADHOC_PTP_STATE_CLOSED; + return SCE_NET_ADHOC_ERROR_DISCONNECTED; + } + // SCE_NET_ADHOC_ERROR_WOULD_BLOCK + received = SOCKET_ERROR; + error = EAGAIN; + }else{ + // Receive Data. POSIX: May received 0 bytes when the remote peer already closed the connection. + received = recv(ptpsocket.id, (char*)buf, std::max(0, *len), MSG_NOSIGNAL); + error = socket_errno; + } if (received == SOCKET_ERROR && (error == EAGAIN || error == EWOULDBLOCK || (ptpsocket.state == ADHOC_PTP_STATE_SYN_SENT && (error == ENOTCONN || connectInProgress(error))))) { if (flag == 0) { diff --git a/Core/HLE/sceNetAdhoc.h b/Core/HLE/sceNetAdhoc.h index 76793fe61c..17bc5c5f0e 100644 --- a/Core/HLE/sceNetAdhoc.h +++ b/Core/HLE/sceNetAdhoc.h @@ -42,6 +42,7 @@ struct AdhocSendTarget { u32 ip; u16 port; // original port u16 portOffset; // port offset specific for this target IP + SceNetEtherAddr mac; }; struct AdhocSendTargets { diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index f32a656ce4..71b216ca03 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1019,6 +1019,7 @@ void GameSettingsScreen::CreateNetworkingSettings(UI::ViewGroup *networkingSetti screenManager()->push(new HostnameSelectScreen(&g_Config.proAdhocServer, &g_Config.proAdhocServerList, n->T("proAdhocServer Address:"))); }); networkingSettings->Add(new SettingHint(n->T("Change proAdhocServer address hint"))); + networkingSettings->Add(new CheckBox(&g_Config.bServerHasRelay, n->T("PRO Adhoc Server provides packet relay", "PRO Adhoc Server provides packet relay")))->SetEnabled(!PSP_IsInited()); networkingSettings->Add(new ItemHeader(n->T("UPnP (port-forwarding)"))); networkingSettings->Add(new CheckBox(&g_Config.bEnableUPnP, n->T("Enable UPnP", "Enable UPnP (need a few seconds to detect)"))); auto useOriPort = networkingSettings->Add(new CheckBox(&g_Config.bUPnPUseOriginalPort, n->T("UPnP use original port", "UPnP use original port (Enabled = PSP compatibility)"))); diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj index 4d243f5ce9..7e3f7db365 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj +++ b/UWP/CoreUWP/CoreUWP.vcxproj @@ -486,6 +486,18 @@ + + NotUsing + + + NotUsing + + + NotUsing + + + NotUsing + @@ -1036,4 +1048,4 @@ - \ No newline at end of file + diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters index 5a476d27ab..47191cd3b0 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj.filters +++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters @@ -129,6 +129,10 @@ + + + + @@ -689,4 +693,4 @@ - \ No newline at end of file + diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 10b64d6717..3643aaee1b 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -714,6 +714,10 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Core/HLE/proAdhocServer.cpp \ $(SRC)/Core/HLE/NetAdhocCommon.cpp \ $(SRC)/Core/HLE/sceNetAdhoc.cpp \ + $(SRC)/ext/aemu_postoffice/client/postoffice.c \ + $(SRC)/ext/aemu_postoffice/client/sock_impl_linux.c \ + $(SRC)/ext/aemu_postoffice/client/mutex_impl_linux.c \ + $(SRC)/ext/aemu_postoffice/client/delay_impl_linux.c \ $(SRC)/Core/HLE/sceNetAdhocMatching.cpp \ $(SRC)/Core/HLE/sceNetApctl.cpp \ $(SRC)/Core/HLE/sceNetInet.cpp \ diff --git a/ext/aemu_postoffice/aemu_postoffice_packets.h b/ext/aemu_postoffice/aemu_postoffice_packets.h new file mode 100644 index 0000000000..0b5a607fa8 --- /dev/null +++ b/ext/aemu_postoffice/aemu_postoffice_packets.h @@ -0,0 +1,49 @@ +#ifndef __AEMU_POSTOFFICE_PACKETS_H +#define __AEMU_POSTOFFICE_PACKETS_H + +#include + +// structs here are gcc little endian + +typedef enum{ + AEMU_POSTOFFICE_INIT_PDP, + AEMU_POSTOFFICE_INIT_PTP_LISTEN, + AEMU_POSTOFFICE_INIT_PTP_CONNECT, + AEMU_POSTOFFICE_INIT_PTP_ACCEPT +} aemu_postoffice_init_type; + +#pragma pack(push, 1) + +// client -> server +typedef struct aemu_postoffice_init{ + int32_t init_type; + // 2 bytes on padding on the end, only 6 bytes are used + char src_addr[8]; + uint16_t sport; + // 2 bytes on padding on the end + char dst_addr[8]; + uint16_t dport; +} aemu_postoffice_init; + +// client <-> server +typedef struct aemu_postoffice_pdp{ + // 2 bytes on padding on the end + char addr[8]; + uint16_t port; + uint32_t size; +} aemu_postoffice_pdp; + +// server -> client +typedef struct aemu_postoffice_ptp_connect{ + // 2 bytes on padding on the end + char addr[8]; + uint16_t port; +} aemu_postoffice_ptp_connect; + +typedef struct aemu_postoffice_ptp_data{ + uint32_t size; +} aemu_postoffice_ptp_data; + +#pragma pack(pop) + +#endif diff --git a/ext/aemu_postoffice/client/delay_impl_linux.c b/ext/aemu_postoffice/client/delay_impl_linux.c new file mode 100644 index 0000000000..98705b6ed1 --- /dev/null +++ b/ext/aemu_postoffice/client/delay_impl_linux.c @@ -0,0 +1,9 @@ +#include + +void delay(int ms){ + const struct timespec duration = { + .tv_sec = 0, + .tv_nsec = ms * 1000000, + }; + nanosleep(&duration, NULL); +} diff --git a/ext/aemu_postoffice/client/delay_impl_windows.c b/ext/aemu_postoffice/client/delay_impl_windows.c new file mode 100644 index 0000000000..39d0239fdb --- /dev/null +++ b/ext/aemu_postoffice/client/delay_impl_windows.c @@ -0,0 +1,5 @@ +#include + +void delay(int ms){ + Sleep(ms); +} diff --git a/ext/aemu_postoffice/client/log_linux.h b/ext/aemu_postoffice/client/log_linux.h new file mode 100644 index 0000000000..293e305f90 --- /dev/null +++ b/ext/aemu_postoffice/client/log_linux.h @@ -0,0 +1,11 @@ +#ifndef __LOG_LINUX_H +#define __LOG_LINUX_H + +#include + +#define LOG(...) { \ + fprintf(stderr, __VA_ARGS__); \ + fflush(stderr); \ +} + +#endif diff --git a/ext/aemu_postoffice/client/log_windows.h b/ext/aemu_postoffice/client/log_windows.h new file mode 100644 index 0000000000..09f75bcbbe --- /dev/null +++ b/ext/aemu_postoffice/client/log_windows.h @@ -0,0 +1,11 @@ +#ifndef __LOG_WINDOWS_H +#define __LOG_WINDOWS_H + +#include + +#define LOG(...) { \ + fprintf(stderr, __VA_ARGS__); \ + fflush(stderr); \ +} + +#endif diff --git a/ext/aemu_postoffice/client/mutex_impl_linux.c b/ext/aemu_postoffice/client/mutex_impl_linux.c new file mode 100644 index 0000000000..49cc164a59 --- /dev/null +++ b/ext/aemu_postoffice/client/mutex_impl_linux.c @@ -0,0 +1,12 @@ +#include + +static pthread_mutex_t sock_alloc_mutex; +void init_sock_alloc_mutex(){ + pthread_mutex_init(&sock_alloc_mutex, NULL); +} +void lock_sock_alloc_mutex(){ + pthread_mutex_lock(&sock_alloc_mutex); +} +void unlock_sock_alloc_mutex(){ + pthread_mutex_unlock(&sock_alloc_mutex); +} diff --git a/ext/aemu_postoffice/client/mutex_impl_linux.h b/ext/aemu_postoffice/client/mutex_impl_linux.h new file mode 100644 index 0000000000..d21ebd73f5 --- /dev/null +++ b/ext/aemu_postoffice/client/mutex_impl_linux.h @@ -0,0 +1,10 @@ +#ifndef __MUTEX_IMPL_LINUX_H +#define __MUTEX_IMPL_LINUX_H + +void init_sock_alloc_mutex(); +void lock_sock_alloc_mutex(); +void unlock_sock_alloc_mutex(); + +void delay(int ms); + +#endif diff --git a/ext/aemu_postoffice/client/mutex_impl_windows.c b/ext/aemu_postoffice/client/mutex_impl_windows.c new file mode 100644 index 0000000000..9f231c0cd7 --- /dev/null +++ b/ext/aemu_postoffice/client/mutex_impl_windows.c @@ -0,0 +1,23 @@ +#include +#include "log_windows.h" + +static HANDLE sock_alloc_mutex = NULL; + +void init_sock_alloc_mutex(){ + sock_alloc_mutex = CreateMutex(NULL, FALSE, NULL); + if (sock_alloc_mutex == NULL){ + LOG("%s: failed creating mutex, 0x%x\n", __func__, GetLastError()); + } +} + +void lock_sock_alloc_mutex(){ + if (sock_alloc_mutex != NULL){ + WaitForSingleObject(sock_alloc_mutex, INFINITE); + } +} + +void unlock_sock_alloc_mutex(){ + if (sock_alloc_mutex != NULL){ + ReleaseMutex(sock_alloc_mutex); + } +} diff --git a/ext/aemu_postoffice/client/mutex_impl_windows.h b/ext/aemu_postoffice/client/mutex_impl_windows.h new file mode 100644 index 0000000000..bf7632ce6e --- /dev/null +++ b/ext/aemu_postoffice/client/mutex_impl_windows.h @@ -0,0 +1,10 @@ +#ifndef __MUTEX_IMPL_WINDOWS_H +#define __MUTEX_IMPL_WINDOWS_H + +void init_sock_alloc_mutex(); +void lock_sock_alloc_mutex(); +void unlock_sock_alloc_mutex(); + +void delay(int ms); + +#endif diff --git a/ext/aemu_postoffice/client/postoffice.c b/ext/aemu_postoffice/client/postoffice.c new file mode 100644 index 0000000000..eeec52b97b --- /dev/null +++ b/ext/aemu_postoffice/client/postoffice.c @@ -0,0 +1,827 @@ +#include +#include +#include + +#include "postoffice_client.h" + +#if defined(__unix) || defined(__APPLE__) +#include "log_linux.h" +#include "sock_impl_linux.h" +#include "mutex_impl_linux.h" +#endif + +#ifdef __PSP__ +#include "log_psp.h" +#include "sock_impl_psp.h" +#include "mutex_impl_psp.h" +#endif + +#ifdef _WIN32 +#include "log_windows.h" +#include "sock_impl_windows.h" +#include "mutex_impl_windows.h" +#endif + +#include "../aemu_postoffice_packets.h" + +struct pdp_session{ + char *pdp_mac[6]; + int16_t pdp_port; + int sock; + bool dead; + bool abort; + char recv_buf[2048]; + bool recving; + bool sending; +}; + +struct ptp_listen_session{ + char *ptp_mac[6]; + int16_t ptp_port; + int sock; + bool dead; + bool abort; + char addr[sizeof(native_sock6_addr) > sizeof(native_sock_addr) ? sizeof(native_sock6_addr) : sizeof(native_sock_addr)]; + int addrlen; + bool accepting; +}; + +struct ptp_session{ + int sock; + bool dead; + bool abort; + char recv_buf[50 * 1024]; + int outstanding_data_size; + int outstanding_data_offset; + bool recving; + bool sending; +}; + +// wonder if games will actually use more than this +// we pre-allocate so that we don't have to use heap, it's kinda big, TODO test if it's too big on a psp, in theory we have plenty on slims +struct pdp_session pdp_sessions[32]; +struct ptp_listen_session ptp_listen_sessions[sizeof(pdp_sessions) / sizeof(pdp_sessions[0])]; +struct ptp_session ptp_sessions[sizeof(pdp_sessions) / sizeof(pdp_sessions[0])]; + +int aemu_post_office_init(){ + static bool first_run = true; + if (first_run){ + first_run = false; + for (int i = 0;i < sizeof(pdp_sessions) / sizeof(pdp_sessions[0]);i++){ + pdp_sessions[i].sock = -1; + ptp_listen_sessions[i].sock = -1; + ptp_sessions[i].sock = -1; + } + init_sock_alloc_mutex(); + }else{ + // re-run, close all opened sessions + for (int i = 0;i < sizeof(pdp_sessions) / sizeof(pdp_sessions[0]);i++){ + if (pdp_sessions[i].sock != -1){ + pdp_delete(&pdp_sessions[i]); + } + if (ptp_listen_sessions[i].sock != -1){ + ptp_listen_close(&ptp_listen_sessions[i]); + } + if (ptp_sessions[i].sock != -1){ + ptp_close(&ptp_sessions[i]); + } + } + } + return 0; +} + +static int create_and_init_socket(void *addr, int addrlen, const char *init_packet, int init_packet_len, const char *caller_name){ + int sock = native_connect_tcp_sock(addr, addrlen); + if (sock < 0){ + LOG("%s: tcp connection failed\n", caller_name); + return sock; + } + + bool abort = false; + int write_status = native_send_till_done(sock, (char *)init_packet, init_packet_len, false, &abort); + if (write_status == -1){ + LOG("%s: failed sending init packet\n", caller_name); + native_close_tcp_sock(sock); + return AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; + } + + return sock; +} + +static void *pdp_create(void *addr, int addrlen, const char *pdp_mac, int pdp_port, int *state){ + struct pdp_session* session = NULL; + lock_sock_alloc_mutex(); + for(int i = 0;i < sizeof(pdp_sessions) / sizeof(pdp_sessions[0]);i++){ + if (pdp_sessions[i].sock == -1){ + session = &pdp_sessions[i]; + session->sock = 0; + break; + } + } + unlock_sock_alloc_mutex(); + if (session == NULL){ + LOG("%s: failed allocating memory for pdp session\n", __func__); + *state = AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; + return NULL; + } + + // Prepare init packet + struct aemu_postoffice_init init_packet = {0}; + init_packet.init_type = AEMU_POSTOFFICE_INIT_PDP; + memcpy(init_packet.src_addr, pdp_mac, 6); + init_packet.sport = pdp_port; + + int sock = create_and_init_socket(addr, addrlen, (char *)&init_packet, sizeof(init_packet), __func__); + + if (sock < 0){ + *state = sock; + session->sock = -1; + return NULL; + } + + memcpy(session->pdp_mac, pdp_mac, 6); + session->pdp_port = pdp_port; + session->sock = sock; + session->dead = false; + session->abort = false; + session->recving = false; + session->sending = false; + + *state = AEMU_POSTOFFICE_CLIENT_OK; + return session; +} + +void *pdp_create_v6(const struct aemu_post_office_sock6_addr *addr, const char *pdp_mac, int pdp_port, int *state){ + native_sock6_addr native_addr; + to_native_sock6_addr(&native_addr, addr); + + return pdp_create(&native_addr, sizeof(native_addr), pdp_mac, pdp_port, state); +} + +void *pdp_create_v4(const struct aemu_post_office_sock_addr *addr, const char *pdp_mac, int pdp_port, int *state){ + native_sock_addr native_addr; + to_native_sock_addr(&native_addr, addr); + + return pdp_create(&native_addr, sizeof(native_addr), pdp_mac, pdp_port, state); +} + +int pdp_send(void *pdp_handle, const char *pdp_mac, int pdp_port, const char *buf, int len, bool non_block){ + if (pdp_handle == NULL){ + return -1; + } + struct pdp_session *session = (struct pdp_session *)pdp_handle; + if (session->dead || session->abort){ + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (len > sizeof(session->recv_buf)){ + LOG("%s: failed sending data, data too big, %d\n", __func__, len); + return AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; + } + + // Write header + struct aemu_postoffice_pdp pdp_header = { + .port = pdp_port, + .size = len + }; + memcpy(pdp_header.addr, pdp_mac, 6); + + session->sending = true; + int send_status = native_send_till_done(session->sock, (char *)&pdp_header, sizeof(pdp_header), non_block, &session->abort); + session->sending = false; + if (send_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; + } + if (send_status == NATIVE_SOCK_ABORTED){ + // getting aborted + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (send_status < 0){ + // Error + LOG("%s: failed sending header\n", __func__); + session->dead = true; + native_close_tcp_sock(session->sock); + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + session->sending = true; + send_status = native_send_till_done(session->sock, buf, len, false, &session->abort); + session->sending = false; + if (send_status == NATIVE_SOCK_ABORTED){ + // getting aborted + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (send_status < 0){ + // Error + LOG("%s: failed sending data\n", __func__); + session->dead = true; + native_close_tcp_sock(session->sock); + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + return AEMU_POSTOFFICE_CLIENT_OK; +} + +int pdp_recv(void *pdp_handle, char *pdp_mac, int *pdp_port, char *buf, int *len, bool non_block){ + if (pdp_handle == NULL){ + return -1; + } + struct pdp_session *session = (struct pdp_session *)pdp_handle; + if (session->dead || session->abort){ + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (*len > 2048){ + return AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; + } + + struct aemu_postoffice_pdp pdp_header; + session->recving = true; + int recv_status = native_recv_till_done(session->sock, (char *)&pdp_header, sizeof(pdp_header), non_block, &session->abort); + session->recving = false; + if (recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; + } + if (recv_status == NATIVE_SOCK_ABORTED){ + // getting aborted + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (recv_status == 0){ + LOG("%s: remote closed the socket\n", __func__); + native_close_tcp_sock(session->sock); + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (recv_status == -1){ + LOG("%s: failed receiving data\n", __func__); + native_close_tcp_sock(session->sock); + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + // We have a header + if (pdp_header.size > sizeof(session->recv_buf)){ + // The other side is sending packets that are too big + LOG("%s: failed receiving data, data too big %d\n", __func__, pdp_header.size); + native_close_tcp_sock(session->sock); + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (pdp_mac != NULL) + memcpy(pdp_mac, pdp_header.addr, 6); + if (pdp_port != NULL) + *pdp_port = pdp_header.port; + + session->recving = true; + recv_status = native_recv_till_done(session->sock, session->recv_buf, pdp_header.size, false, &session->abort); + session->recving = false; + if (recv_status == NATIVE_SOCK_ABORTED){ + // getting aborted + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (recv_status == 0){ + LOG("%s: remote closed the socket\n", __func__); + native_close_tcp_sock(session->sock); + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (recv_status == -1){ + LOG("%s: failed receiving data\n", __func__); + native_close_tcp_sock(session->sock); + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + // We have data + memcpy(buf, session->recv_buf, *len); + if (pdp_header.size > *len){ + return AEMU_POSTOFFICE_CLIENT_SESSION_DATA_TRUNC; + } + *len = pdp_header.size; + return AEMU_POSTOFFICE_CLIENT_OK; +} + +void pdp_delete(void *pdp_handle){ + if (pdp_handle == NULL){ + return; + } + struct pdp_session *session = (struct pdp_session *)pdp_handle; + + // abort on-going ops + session->abort = true; + + // make sure we are clear of send/recv operations + do{ + delay(50); + }while(session->sending || session->recving); + + if (!session->dead) + native_close_tcp_sock(session->sock); + session->sock = -1; +} + +int pdp_peek_next_size(void *pdp_handle){ + struct pdp_session *session = pdp_handle; + + if (session->dead || session->abort){ + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + aemu_postoffice_pdp header = {0}; + session->recving = true; + int peek_result = native_peek(session->sock, (char *)&header, sizeof(header)); + session->recving = false; + if (peek_result == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + return 0; + } + if (session->abort){ + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (peek_result <= 0){ + session->dead = true; + native_close_tcp_sock(session->sock); + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (peek_result != sizeof(header)){ + return 0; + } + + return header.size; +} + +static void *ptp_listen(void *addr, int addrlen, const char *ptp_mac, int ptp_port, int *state){ + struct ptp_listen_session* session = NULL; + lock_sock_alloc_mutex(); + for(int i = 0;i < sizeof(ptp_listen_sessions) / sizeof(ptp_listen_sessions[0]);i++){ + if (ptp_listen_sessions[i].sock == -1){ + session = &ptp_listen_sessions[i]; + session->sock = 0; + break; + } + } + unlock_sock_alloc_mutex(); + if (session == NULL){ + LOG("%s: failed allocating memory for ptp listen session\n", __func__); + *state = AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; + return NULL; + } + + // Prepare init packet + struct aemu_postoffice_init init_packet = {0}; + init_packet.init_type = AEMU_POSTOFFICE_INIT_PTP_LISTEN; + memcpy(init_packet.src_addr, ptp_mac, 6); + init_packet.sport = ptp_port; + + int sock = create_and_init_socket(addr, addrlen, (char *)&init_packet, sizeof(init_packet), __func__); + + if (sock < 0){ + *state = sock; + session->sock = -1; + return NULL; + } + + memcpy(session->ptp_mac, ptp_mac, 6); + session->ptp_port = ptp_port; + session->sock = sock; + memcpy(session->addr, addr, addrlen); + session->addrlen = addrlen; + session->dead = false; + session->abort = false; + session->accepting = false; + + *state = AEMU_POSTOFFICE_CLIENT_OK; + return session; +} + +void *ptp_listen_v6(const struct aemu_post_office_sock6_addr *addr, const char *ptp_mac, int ptp_port, int *state){ + native_sock6_addr native_addr; + to_native_sock6_addr(&native_addr, addr); + + return ptp_listen(&native_addr, sizeof(native_addr), ptp_mac, ptp_port, state); +} + +void *ptp_listen_v4(const struct aemu_post_office_sock_addr *addr, const char *ptp_mac, int ptp_port, int *state){ + native_sock_addr native_addr; + to_native_sock_addr(&native_addr, addr); + + return ptp_listen(&native_addr, sizeof(native_addr), ptp_mac, ptp_port, state); +} + +void *ptp_accept(void *ptp_listen_handle, char *ptp_mac, int *ptp_port, bool nonblock, int *state){ + if (ptp_listen_handle == NULL){ + *state = AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + return NULL; + } + + struct ptp_listen_session *session = (struct ptp_listen_session *)ptp_listen_handle; + if (session->dead){ + *state = AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + return NULL; + } + + struct aemu_postoffice_ptp_connect connect_packet; + session->accepting = true; + int recv_status = native_recv_till_done(session->sock, (char *)&connect_packet, sizeof(connect_packet), nonblock, &session->abort); + session->accepting = false; + if (recv_status == NATIVE_SOCK_ABORTED){ + // getting aborted + *state = AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + return NULL; + } + if (recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + *state = AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; + return NULL; + } + if (recv_status == 0){ + LOG("%s: the other side closed the listen socket\n", __func__); + session->dead = true; + native_close_tcp_sock(session->sock); + *state = AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + return NULL; + } + if (recv_status <= 0){ + LOG("%s: socket error, %d\n", __func__, recv_status); + session->dead = true; + native_close_tcp_sock(session->sock); + *state = AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + return NULL; + } + + // Allocate memory + struct ptp_session *new_session = NULL; + lock_sock_alloc_mutex(); + for(int i = 0;i < sizeof(ptp_sessions) / sizeof(ptp_sessions[0]);i++){ + if (ptp_sessions[i].sock == -1){ + new_session = &ptp_sessions[i]; + new_session->sock = 0; + break; + } + } + unlock_sock_alloc_mutex(); + if (new_session == NULL){ + *state = AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; + return NULL; + } + + // Prepare init packet + struct aemu_postoffice_init init_packet; + init_packet.init_type = AEMU_POSTOFFICE_INIT_PTP_ACCEPT; + memcpy(init_packet.src_addr, session->ptp_mac, 6); + init_packet.sport = session->ptp_port; + memcpy(init_packet.dst_addr, connect_packet.addr, 6); + init_packet.dport = connect_packet.port; + + int sock = create_and_init_socket(session->addr, session->addrlen, (char *)&init_packet, sizeof(init_packet), __func__); + + if (sock < 0){ + *state = sock; + new_session->sock = -1; + return NULL; + } + + // Consume the ack packet + bool abort = false; + int read_status = native_recv_till_done(sock, (char *)&connect_packet, sizeof(connect_packet), false, &abort); + if (read_status == 0){ + LOG("%s: remove closed the socket during initial recv\n", __func__); + *state = AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; + native_close_tcp_sock(sock); + new_session->sock = -1; + return NULL; + } + if (read_status == -1){ + LOG("%s: socket error receiving initial packet\n", __func__); + *state = AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; + native_close_tcp_sock(sock); + new_session->sock = -1; + return NULL; + } + + // Now the session is ready + new_session->sock = sock; + new_session->dead = false; + new_session->abort = false; + new_session->sending = false; + new_session->recving = false; + new_session->outstanding_data_size = 0; + *state = AEMU_POSTOFFICE_CLIENT_OK; + *ptp_port = connect_packet.port; + memcpy(ptp_mac, connect_packet.addr, 6); + return new_session; +} + +static void *ptp_connect(void *addr, int addrlen, const char *src_ptp_mac, int ptp_sport, const char *dst_ptp_mac, int ptp_dport, int *state){ + // Allocate memory + struct ptp_session *new_session = NULL; + lock_sock_alloc_mutex(); + for(int i = 0;i < sizeof(ptp_sessions) / sizeof(ptp_sessions[0]);i++){ + if (ptp_sessions[i].sock == -1){ + new_session = &ptp_sessions[i]; + new_session->sock = 0; + break; + } + } + unlock_sock_alloc_mutex(); + if (new_session == NULL){ + *state = AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; + return NULL; + } + + // Prepare init packet + struct aemu_postoffice_init init_packet; + init_packet.init_type = AEMU_POSTOFFICE_INIT_PTP_CONNECT; + memcpy(init_packet.src_addr, src_ptp_mac, 6); + init_packet.sport = ptp_sport; + memcpy(init_packet.dst_addr, dst_ptp_mac, 6); + init_packet.dport = ptp_dport; + + int sock = create_and_init_socket(addr, addrlen, (char *)&init_packet, sizeof(init_packet), __func__); + + if (sock < 0){ + *state = sock; + new_session->sock = -1; + return NULL; + } + + // Consume the ack packet + struct aemu_postoffice_ptp_connect connect_packet; + bool abort = false; + int read_status = native_recv_till_done(sock, (char *)&connect_packet, sizeof(connect_packet), false, &abort); + if (read_status == 0){ + LOG("%s: remove closed the socket during initial recv\n", __func__); + *state = AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; + native_close_tcp_sock(sock); + new_session->sock = -1; + return NULL; + } + if (read_status == -1){ + LOG("%s: socket error receiving initial packet\n", __func__); + *state = AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; + native_close_tcp_sock(sock); + new_session->sock = -1; + return NULL; + } + + // Now the session is ready + new_session->sock = sock; + new_session->dead = false; + new_session->abort = false; + new_session->sending = false; + new_session->recving = false; + new_session->outstanding_data_size = 0; + *state = AEMU_POSTOFFICE_CLIENT_OK; + return new_session; +} + +void *ptp_connect_v6(const struct aemu_post_office_sock6_addr *addr, const char *src_ptp_mac, int ptp_sport, const char *dst_ptp_mac, int ptp_dport, int *state){ + native_sock6_addr native_addr; + to_native_sock6_addr(&native_addr, addr); + + return ptp_connect(&native_addr, sizeof(native_addr), src_ptp_mac, ptp_sport, dst_ptp_mac, ptp_dport, state); +} + +void *ptp_connect_v4(const struct aemu_post_office_sock_addr *addr, const char *src_ptp_mac, int ptp_sport, const char *dst_ptp_mac, int ptp_dport, int *state){ + native_sock_addr native_addr; + to_native_sock_addr(&native_addr, addr); + + return ptp_connect(&native_addr, sizeof(native_addr), src_ptp_mac, ptp_sport, dst_ptp_mac, ptp_dport, state); +} + +int ptp_send(void *ptp_handle, const char *buf, int len, bool non_block){ + if (ptp_handle == NULL){ + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + struct ptp_session *session = (struct ptp_session *)ptp_handle; + if (session->dead || session->abort){ + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (len > sizeof(session->recv_buf)){ + LOG("%s: failed sending data, data too big, %d\n", __func__, len); + return AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; + } + + struct aemu_postoffice_ptp_data header = { + .size = len + }; + + session->sending = true; + int send_status = native_send_till_done(session->sock, (char *)&header, sizeof(header), non_block, &session->abort); + session->sending = false; + if (send_status == NATIVE_SOCK_ABORTED){ + // getting aborted + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + if (send_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; + } + + if (send_status < 0){ + LOG("%s: failed sending header\n", __func__); + native_close_tcp_sock(session->sock); + session->dead = true; + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + session->sending = true; + send_status = native_send_till_done(session->sock, buf, len, false, &session->abort); + session->sending = false; + if (send_status == NATIVE_SOCK_ABORTED){ + // getting aborted + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + if (send_status < 0){ + LOG("%s: failed sending data\n", __func__); + native_close_tcp_sock(session->sock); + session->dead = true; + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + return AEMU_POSTOFFICE_CLIENT_OK; +} + +int ptp_recv(void *ptp_handle, char *buf, int *len, bool non_block){ + if (ptp_handle == NULL){ + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + struct ptp_session *session = (struct ptp_session *)ptp_handle; + if (session->dead || session->abort){ + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (*len > sizeof(session->recv_buf)){ + LOG("%s: failed receiving data, data too big, %d\n", __func__, *len); + return AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; + } + + // check if we have outstanding transfer + if (session->outstanding_data_size != 0){ + memcpy(buf, &session->recv_buf[session->outstanding_data_offset], *len); + if (session->outstanding_data_size > *len){ + session->outstanding_data_size -= *len; + session->outstanding_data_offset += *len; + return AEMU_POSTOFFICE_CLIENT_SESSION_DATA_TRUNC; + } + + *len = session->outstanding_data_size; + session->outstanding_data_size = 0; + return AEMU_POSTOFFICE_CLIENT_OK; + } + + struct aemu_postoffice_ptp_data header = {0}; + + session->recving = true; + int recv_status = native_recv_till_done(session->sock, (char *)&header, sizeof(header), non_block, &session->abort); + session->recving = false; + if (recv_status == NATIVE_SOCK_ABORTED){ + // getting aborted + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + if (recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; + } + + if (recv_status == 0){ + LOG("%s: remote closed the socket\n", __func__); + native_close_tcp_sock(session->sock); + session->dead = true; + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (recv_status < 0){ + LOG("%s: failed receiving header\n", __func__); + native_close_tcp_sock(session->sock); + session->dead = true; + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (header.size > sizeof(session->recv_buf)){ + LOG("%s: incoming data too big\n", __func__); + native_close_tcp_sock(session->sock); + session->dead = true; + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + session->recving = true; + recv_status = native_recv_till_done(session->sock, session->recv_buf, header.size, false, &session->abort); + session->recving = false; + if (recv_status == NATIVE_SOCK_ABORTED){ + // getting aborted + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (recv_status == 0){ + LOG("%s: remote closed the socket\n", __func__); + native_close_tcp_sock(session->sock); + session->dead = true; + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (recv_status < 0){ + LOG("%s: failed receiving data\n", __func__); + native_close_tcp_sock(session->sock); + session->dead = true; + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + memcpy(buf, session->recv_buf, *len); + if (*len < header.size){ + session->outstanding_data_offset = *len; + session->outstanding_data_size = header.size - *len; + return AEMU_POSTOFFICE_CLIENT_SESSION_DATA_TRUNC; + } + *len = header.size; + return AEMU_POSTOFFICE_CLIENT_OK; +} + +void ptp_close(void *ptp_handle){ + if (ptp_handle == NULL){ + return; + } + + struct ptp_session *session = (struct ptp_session *)ptp_handle; + + // abort on-going ops + session->abort = true; + + // make sure we are clear of send/recv operations + do{ + delay(50); + }while(session->sending || session->recving); + + if (!session->dead) + native_close_tcp_sock(session->sock); + session->sock = -1; +} + +void ptp_listen_close(void *ptp_listen_handle){ + if (ptp_listen_handle == NULL){ + return; + } + + struct ptp_listen_session *session = (struct ptp_listen_session *)ptp_listen_handle; + + // abort on-going ops + session->abort = true; + + // make sure we are clear of send/recv operations + do{ + delay(50); + }while(session->accepting); + + if (!session->dead) + native_close_tcp_sock(session->sock); + session->sock = -1; +} + +int pdp_get_native_sock(void *pdp_handle){ + struct pdp_session *session = pdp_handle; + return session->sock; +} + +int ptp_get_native_sock(void *ptp_handle){ + struct ptp_session *session = ptp_handle; + return session->sock; +} + +int ptp_listen_get_native_sock(void *ptp_listen_handle){ + struct ptp_listen_session *session = ptp_listen_handle; + return session->sock; +} + +int ptp_peek_next_size(void *ptp_handle){ + struct ptp_session *session = ptp_handle; + + if (session->dead || session->abort){ + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + aemu_postoffice_ptp_data header = {0}; + session->recving = true; + int peek_result = native_peek(session->sock, (char *)&header, sizeof(header)); + session->recving = false; + if (peek_result == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + return 0; + } + if (session->abort){ + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (peek_result <= 0){ + session->dead = true; + native_close_tcp_sock(session->sock); + return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; + } + + if (peek_result != sizeof(header)){ + return 0; + } + + return header.size; +} diff --git a/ext/aemu_postoffice/client/postoffice_client.h b/ext/aemu_postoffice/client/postoffice_client.h new file mode 100644 index 0000000000..e60dc37fc9 --- /dev/null +++ b/ext/aemu_postoffice/client/postoffice_client.h @@ -0,0 +1,69 @@ +#ifndef __POSTOFFICE_CLIENT_H +#define __POSTOFFICE_CLIENT_H + +#include +#include + +enum aemu_postoffice_client_errors { + AEMU_POSTOFFICE_CLIENT_OK = 0, + AEMU_POSTOFFICE_CLIENT_UNKNOWN = -1, + AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY = -2, + AEMU_POSTOFFICE_CLIENT_SESSION_DEAD = -3, + AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK = -4, + AEMU_POSTOFFICE_CLIENT_SESSION_DATA_TRUNC = -5, + AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK = -6 +}; + +struct aemu_post_office_sock_addr{ + uint32_t addr; // network order + uint16_t port; // network order +}; + +struct aemu_post_office_sock6_addr{ + uint8_t addr[16]; // network order + uint16_t port; // network order +}; + +#ifdef __cplusplus +extern "C" { +#endif + +int aemu_post_office_init(); + +/* + * Thread safety: + * multiple threads can perform create/listen/connect + * only one thread at a time can accept on a created socket + * only one thread at a time can send on a created socket + * only one thread at a time can recv/peek on a created socket + * only one thread at a time can close a created socket + * + * violating the above yields undefined results + */ + +void *pdp_create_v6(const struct aemu_post_office_sock6_addr *addr, const char *pdp_mac, int pdp_port, int *state); +void *pdp_create_v4(const struct aemu_post_office_sock_addr *addr, const char *pdp_mac, int pdp_port, int *state); +void pdp_delete(void *pdp_handle); +int pdp_send(void *pdp_handle, const char *pdp_mac, int pdp_port, const char *buf, int len, bool non_block); +int pdp_recv(void *pdp_handle, char *pdp_mac, int *pdp_port, char *buf, int *len, bool non_block); +int pdp_peek_next_size(void *pdp_handle); +void *ptp_listen_v6(const struct aemu_post_office_sock6_addr *addr, const char *ptp_mac, int ptp_port, int *state); +void *ptp_listen_v4(const struct aemu_post_office_sock_addr *addr, const char *ptp_mac, int ptp_port, int *state); +void *ptp_accept(void *ptp_listen_handle, char *ptp_mac, int *ptp_port, bool nonblock, int *state); +void *ptp_connect_v6(const struct aemu_post_office_sock6_addr *addr, const char *src_ptp_mac, int ptp_sport, const char *dst_ptp_mac, int ptp_dport, int *state); +void *ptp_connect_v4(const struct aemu_post_office_sock_addr *addr, const char *src_ptp_mac, int ptp_sport, const char *dst_ptp_mac, int ptp_dport, int *state); +int ptp_send(void *ptp_handle, const char *buf, int len, bool non_block); +int ptp_recv(void *ptp_handle, char *buf, int *len, bool non_block); +void ptp_close(void *ptp_handle); +void ptp_listen_close(void *ptp_listen_handle); +int ptp_peek_next_size(void *ptp_handle); + +int pdp_get_native_sock(void *pdp_handle); +int ptp_get_native_sock(void *ptp_handle); +int ptp_listen_get_native_sock(void *ptp_listen_handle); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/ext/aemu_postoffice/client/sock_impl_linux.c b/ext/aemu_postoffice/client/sock_impl_linux.c new file mode 100644 index 0000000000..948a71a1a5 --- /dev/null +++ b/ext/aemu_postoffice/client/sock_impl_linux.c @@ -0,0 +1,128 @@ +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "postoffice_client.h" +#include "sock_impl_linux.h" +#include "log_linux.h" + +void to_native_sock_addr(native_sock_addr *dst, const struct aemu_post_office_sock_addr *src){ + dst->sin_family = AF_INET; + dst->sin_addr.s_addr = src->addr; + dst->sin_port = src->port; +} + +void to_native_sock6_addr(native_sock6_addr *dst, const struct aemu_post_office_sock6_addr *src){ + dst->sin6_family = AF_INET6; + dst->sin6_port = src->port; + dst->sin6_flowinfo = 0; + memcpy(dst->sin6_addr.s6_addr, src->addr, 16); + dst->sin6_scope_id = 0; +} + +int native_connect_tcp_sock(void *addr, int addrlen){ + native_sock_addr *native_addr = addr; + int sock = socket(native_addr->sin_family, SOCK_STREAM, 0); + if (sock == -1){ + LOG("%s: failed creating socket, %s\n", __func__, strerror(errno)); + return AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; + } + + // Connect + int connect_status = connect(sock, addr, addrlen); + if (connect_status == -1){ + LOG("%s: failed connecting, %s\n", __func__, strerror(errno)); + close(sock); + return AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; + } + + // Set socket options + int sockopt = 1; + setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &sockopt, sizeof(sockopt)); + int flags = fcntl(sock, F_GETFL, 0); + flags |= O_NONBLOCK; + fcntl(sock, F_SETFL, flags); + + return sock; +} + +int native_send_till_done(int fd, const char *buf, int len, bool non_block, bool *abort){ + int write_offset = 0; + while(write_offset != len){ + if (*abort){ + return NATIVE_SOCK_ABORTED; + } + int write_status = send(fd, &buf[write_offset], len - write_offset, 0); + if (write_status == -1){ + int err = errno; + if (err == EAGAIN || err == EWOULDBLOCK){ + if (non_block && write_offset == 0){ + return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; + } + // Continue block sending, either in block mode or we already received part of the message + sleep(0); + continue; + } + // Other errors + LOG("%s: failed sending, %s\n", __func__, strerror(errno)); + return write_status; + } + write_offset += write_status; + } + return write_offset; +} + +int native_recv_till_done(int fd, char *buf, int len, bool non_block, bool *abort){ + int read_offset = 0; + while(read_offset != len){ + if (*abort){ + return NATIVE_SOCK_ABORTED; + } + int recv_status = recv(fd, &buf[read_offset], len - read_offset, 0); + if (recv_status == 0){ + return recv_status; + } + if (recv_status < 0){ + int err = errno; + if (err == EAGAIN || err == EWOULDBLOCK){ + if (non_block && read_offset == 0){ + return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; + } + // Continue block receving, either in block mode or we already sent part of the message + sleep(0); + continue; + } + // Other errors + LOG("%s: failed receving, %s\n", __func__, strerror(errno)); + return recv_status; + } + read_offset += recv_status; + } + return read_offset; +} + +int native_close_tcp_sock(int sock){ + return close(sock); +} + +int native_peek(int fd, char *buf, int len){ + int read_result = recv(fd, buf, len, MSG_PEEK); + if (read_result == 0){ + return 0; + } + if (read_result == -1){ + int err = errno; + if (err == EAGAIN || err == EWOULDBLOCK){ + return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; + } + LOG("%s: failed peeking, %s\n", __func__, strerror(errno)); + return -1; + } + return read_result; +} diff --git a/ext/aemu_postoffice/client/sock_impl_linux.h b/ext/aemu_postoffice/client/sock_impl_linux.h new file mode 100644 index 0000000000..f3aabf5bd2 --- /dev/null +++ b/ext/aemu_postoffice/client/sock_impl_linux.h @@ -0,0 +1,22 @@ +#ifndef __SOCK_IMPL_LINUX_H +#define __SOCK_IMPL_LINUX_H + +#include + +#include "postoffice_client.h" + +#define NATIVE_SOCK_ABORTED -100 + +typedef struct sockaddr_in native_sock_addr; +typedef struct sockaddr_in6 native_sock6_addr; + +void to_native_sock_addr(native_sock_addr *dst, const struct aemu_post_office_sock_addr *src); +void to_native_sock6_addr(native_sock6_addr *dst, const struct aemu_post_office_sock6_addr *src); + +int native_connect_tcp_sock(void *addr, int addrlen); +int native_close_tcp_sock(int sock); +int native_send_till_done(int fd, const char *buf, int len, bool non_block, bool *abort); +int native_recv_till_done(int fd, char *buf, int len, bool non_block, bool *abort); +int native_peek(int fd, char *buf, int len); + +#endif diff --git a/ext/aemu_postoffice/client/sock_impl_windows.c b/ext/aemu_postoffice/client/sock_impl_windows.c new file mode 100644 index 0000000000..3bd159bc07 --- /dev/null +++ b/ext/aemu_postoffice/client/sock_impl_windows.c @@ -0,0 +1,137 @@ +#include +#include + +#include +#include + +#include "postoffice_client.h" +#include "sock_impl_windows.h" +#include "log_windows.h" + +void to_native_sock_addr(native_sock_addr *dst, const struct aemu_post_office_sock_addr *src){ + dst->sin_family = AF_INET; + dst->sin_addr.s_addr = src->addr; + dst->sin_port = src->port; +} + +void to_native_sock6_addr(native_sock6_addr *dst, const struct aemu_post_office_sock6_addr *src){ + dst->sin6_family = AF_INET6; + dst->sin6_port = src->port; + dst->sin6_flowinfo = 0; + memcpy(dst->sin6_addr.s6_addr, src->addr, 16); + dst->sin6_scope_id = 0; +} + +static void init_winsock2(){ + static bool initialized = false; + if (!initialized){ + initialized = true; + WSADATA data; + int init_result = WSAStartup(MAKEWORD(2,2), &data); + if (init_result != 0){ + printf("%s: warning: WSAStartup seems to have failed, %d\n", __func__, init_result); + } + } +} + +int native_connect_tcp_sock(void *addr, int addrlen){ + init_winsock2(); + + native_sock_addr *native_addr = addr; + int sock = socket(native_addr->sin_family, SOCK_STREAM, 0); + if (sock == -1){ + LOG("%s: failed creating socket, %d\n", __func__, WSAGetLastError()); + return AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; + } + + // Connect + int connect_status = connect(sock, addr, addrlen); + if (connect_status == -1){ + LOG("%s: failed connecting, %d\n", __func__, WSAGetLastError()); + closesocket(sock); + return AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; + } + + // Set socket options + int sockopt = 1; + setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &sockopt, sizeof(sockopt)); + u_long ioctlopt = 1; + ioctlsocket(sock, FIONBIO, &ioctlopt); + + return sock; +} + +int native_send_till_done(int fd, const char *buf, int len, bool non_block, bool *abort){ + int write_offset = 0; + while(write_offset != len){ + if (*abort){ + return NATIVE_SOCK_ABORTED; + } + int write_status = send(fd, &buf[write_offset], len - write_offset, 0); + if (write_status == -1){ + int err = WSAGetLastError(); + if (err == WSAEWOULDBLOCK || err == WSAEINPROGRESS){ + if (non_block && write_offset == 0){ + return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; + } + // Continue block sending, either in block mode or we already received part of the message + Sleep(0); + continue; + } + // Other errors + LOG("%s: failed sending, %d\n", __func__, err); + return write_status; + } + write_offset += write_status; + } + return write_offset; +} + +int native_recv_till_done(int fd, char *buf, int len, bool non_block, bool *abort){ + int read_offset = 0; + while(read_offset != len){ + if (*abort){ + return NATIVE_SOCK_ABORTED; + } + int recv_status = recv(fd, &buf[read_offset], len - read_offset, 0); + if (recv_status == 0){ + return recv_status; + } + if (recv_status < 0){ + int err = WSAGetLastError(); + if (err == WSAEWOULDBLOCK || err == WSAEINPROGRESS){ + if (non_block && read_offset == 0){ + return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; + } + // Continue block receving, either in block mode or we already sent part of the message + Sleep(0); + continue; + } + // Other errors + LOG("%s: failed receving, %d\n", __func__, err); + return recv_status; + } + read_offset += recv_status; + } + return read_offset; +} + +int native_close_tcp_sock(int sock){ + return closesocket(sock); +} + +int native_peek(int fd, char *buf, int len){ + int read_result = recv(fd, buf, len, MSG_PEEK); + if (read_result == 0){ + return 0; + } + if (read_result == -1){ + int err = WSAGetLastError(); + if (err == WSAEWOULDBLOCK || err == WSAEINPROGRESS){ + return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; + } + LOG("%s: failed peeking, %d\n", __func__, WSAGetLastError()); + return -1; + } + return read_result; +} diff --git a/ext/aemu_postoffice/client/sock_impl_windows.h b/ext/aemu_postoffice/client/sock_impl_windows.h new file mode 100644 index 0000000000..33d1606e7c --- /dev/null +++ b/ext/aemu_postoffice/client/sock_impl_windows.h @@ -0,0 +1,24 @@ +#ifndef __SOCK_IMPL_WINDOWS_H +#define __SOCK_IMPL_WINDOWS_H + +#include +#include +#include + +#include "postoffice_client.h" + +#define NATIVE_SOCK_ABORTED -100 + +typedef struct sockaddr_in native_sock_addr; +typedef struct sockaddr_in6 native_sock6_addr; + +void to_native_sock_addr(native_sock_addr *dst, const struct aemu_post_office_sock_addr *src); +void to_native_sock6_addr(native_sock6_addr *dst, const struct aemu_post_office_sock6_addr *src); + +int native_connect_tcp_sock(void *addr, int addrlen); +int native_close_tcp_sock(int sock); +int native_send_till_done(int fd, const char *buf, int len, bool non_block, bool *abort); +int native_recv_till_done(int fd, char *buf, int len, bool non_block, bool *abort); +int native_peek(int fd, char *buf, int len); + +#endif diff --git a/ext/aemu_postoffice/gpl-3.0.txt b/ext/aemu_postoffice/gpl-3.0.txt new file mode 100644 index 0000000000..94a9ed024d --- /dev/null +++ b/ext/aemu_postoffice/gpl-3.0.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/ext/aemu_postoffice/upstream.txt b/ext/aemu_postoffice/upstream.txt new file mode 100644 index 0000000000..300f3b8e24 --- /dev/null +++ b/ext/aemu_postoffice/upstream.txt @@ -0,0 +1 @@ +https://github.com/kethen/aemu_postoffice diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 9f07d883ad..f0489482fc 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -692,6 +692,22 @@ SOURCES_CXX += \ $(EXTDIR)/libadrenotools/lib/linkernsbypass/elf_soname_patcher.cpp endif +SOURCES_C += \ + $(EXTDIR)/aemu_postoffice/client/postoffice.c + +ifeq ($(PLATFORM_EXT), win32) +SOURCES_C += \ + $(EXTDIR)/aemu_postoffice/client/delay_impl_windows.c \ + $(EXTDIR)/aemu_postoffice/client/sock_impl_windows.c \ + $(EXTDIR)/aemu_postoffice/client/mutex_impl_windows.c +else +SOURCES_C += \ + $(EXTDIR)/aemu_postoffice/client/delay_impl_linux.c \ + $(EXTDIR)/aemu_postoffice/client/sock_impl_linux.c \ + $(EXTDIR)/aemu_postoffice/client/mutex_impl_linux.c +endif + + SOURCES_CXX += \ $(COMMONDIR)/Render/Text/draw_text.cpp \ $(EXTDIR)/jpge/jpgd.cpp \ From c76226cd0d94b859a436f0965bb886eb39299c58 Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Sun, 11 Jan 2026 20:58:30 +0100 Subject: [PATCH 02/10] fix adhoc gamemode in relay mode --- Core/HLE/sceNetAdhoc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index c3e5c53f02..259ffec16a 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -177,7 +177,7 @@ static void __GameModeNotify(u64 userdata, int cyclesLate) { if (masterGameModeArea.dataUpdated) { int sentcount = 0; for (auto& gma : replicaGameModeAreas) { - if (!gma.dataSent && IsSocketReady(sock->data.pdp.id, false, true) > 0) { + if (!gma.dataSent && (g_Config.bServerHasRelay || IsSocketReady(sock->data.pdp.id, false, true) > 0)) { u16_le port = ADHOC_GAMEMODE_PORT; auto it = gameModePeerPorts.find(gma.mac); if (it != gameModePeerPorts.end()) @@ -241,7 +241,7 @@ static void __GameModeNotify(u64 userdata, int cyclesLate) { } // Recv new Replica data when available - if (IsSocketReady(sock->data.pdp.id, true, false) > 0) { + if (g_Config.bServerHasRelay || IsSocketReady(sock->data.pdp.id, true, false) > 0) { SceNetEtherAddr sendermac; s32_le senderport = ADHOC_GAMEMODE_PORT; s32_le bufsz = gameModeBuffSize; From 97a3f1df91c46fba3f7b70945f9b2defff9919ac Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Tue, 13 Jan 2026 02:13:18 +0100 Subject: [PATCH 03/10] implement nonblock ptp connect --- Core/Core.cpp | 5 --- Core/HLE/proAdhoc.cpp | 45 ++++++++++++++++----- Core/HLE/proAdhoc.h | 1 + Core/HLE/sceNetAdhoc.cpp | 85 ++++++++++++++++++++++++++++++++++------ 4 files changed, 111 insertions(+), 25 deletions(-) diff --git a/Core/Core.cpp b/Core/Core.cpp index 4ef56724f2..639ed65ba1 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -45,8 +45,6 @@ #include "GPU/GPU.h" #include "GPU/GPUCommon.h" -#include "ext/aemu_postoffice/client/postoffice_client.h" - // Step command to execute next static std::mutex g_stepMutex; @@ -158,9 +156,6 @@ void Core_NotifyLifecycle(CoreLifecycle stage) { void Core_Stop() { Core_ResetException(); Core_UpdateState(CORE_POWERDOWN); - - // close all active aemu postoffice sessions if exist - aemu_post_office_init(); } void Core_UpdateState(CoreState newState) { diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp index ae384fd0a6..4076885d31 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp @@ -57,6 +57,8 @@ #include "Core/HLE/NetAdhocCommon.h" +#include "ext/aemu_postoffice/client/postoffice_client.h" + #ifdef _WIN32 #undef errno #define errno WSAGetLastError() @@ -418,17 +420,42 @@ void deleteAllAdhocSockets() { // Active Socket if (adhocSockets[i] != NULL) { auto sock = adhocSockets[i]; - int fd = -1; - if (sock->type == SOCK_PTP) - fd = sock->data.ptp.id; - else if (sock->type == SOCK_PDP) - fd = sock->data.pdp.id; + if (g_Config.bServerHasRelay){ + if (sock->type == SOCK_PTP){ + // sync + if (sock->connect_threads != NULL){ + while(sock->connect_threads->size() != 0){ + sock->connect_threads->at(sock->connect_threads->size() - 1).join(); + sock->connect_threads->pop_back(); + } + delete sock->connect_threads; + } + void *socket = sock->postoffice_handle; + if (socket != NULL){ + if (sock->data.ptp.state == ADHOC_PTP_STATE_LISTEN){ + ptp_listen_close(socket); + }else{ + ptp_close(socket); + } + } + }else{ + if (sock->postoffice_handle != NULL){ + pdp_delete(sock->postoffice_handle); + } + } + }else{ + int fd = -1; + if (sock->type == SOCK_PTP) + fd = sock->data.ptp.id; + else if (sock->type == SOCK_PDP) + fd = sock->data.pdp.id; - if (fd > 0) { - // Close Socket - shutdown(fd, SD_RECEIVE); - closesocket(fd); + if (fd > 0) { + // Close Socket + shutdown(fd, SD_RECEIVE); + closesocket(fd); + } } // Free Memory free(adhocSockets[i]); diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h index e93845ef2a..7bbf127c3f 100644 --- a/Core/HLE/proAdhoc.h +++ b/Core/HLE/proAdhoc.h @@ -329,6 +329,7 @@ typedef struct AdhocSocket { SceNetAdhocPtpStat ptp; } data; void *postoffice_handle; // aemu_postoffice mode handle + std::vector *connect_threads; } PACK AdhocSocket; // Gamemode Optional Peer Buffer Data diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 259ffec16a..17627f8754 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -1021,6 +1021,7 @@ static int ptp_accept_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *spor internal->data.ptp.snd_sb_cc = adhocSockets[idx]->data.ptp.snd_sb_cc; internal->data.ptp.id = AEMU_POSTOFFICE_ID; internal->flags = 0; + internal->connect_threads = NULL; AdhocSocket **slot = NULL; int i; @@ -3778,6 +3779,27 @@ int RecreatePtpSocket(int ptpId) { return 0; } +static uint16_t get_random_unused_ptp_port(){ + uint16_t test_port = rand() % 65534 + 1; + auto port_in_use = [&test_port] { + for (int i = 0; i < MAX_SOCKET; i++){ + if (adhocSockets[i] != NULL && + adhocSockets[i]->type == SOCK_PTP && + test_port == adhocSockets[i]->data.ptp.lport) + { + return true; + } + } + return false; + }; + + while(port_in_use()){ + test_port = rand() % 65534 + 1; + } + + return test_port; +} + static int ptp_open_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, const SceNetEtherAddr *daddr, uint16_t dport, uint32_t bufsize){ AdhocSocket *internal = (AdhocSocket *)malloc(sizeof(AdhocSocket)); if (internal == NULL){ @@ -3789,13 +3811,14 @@ static int ptp_open_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, con internal->postoffice_handle = NULL; internal->data.ptp.state = ADHOC_PTP_STATE_CLOSED; internal->data.ptp.laddr = *saddr; - internal->data.ptp.lport = sport; + internal->data.ptp.lport = sport == 0 ? get_random_unused_ptp_port() : sport; internal->data.ptp.paddr = *daddr; internal->data.ptp.pport = dport; internal->data.ptp.rcv_sb_cc = bufsize; internal->data.ptp.snd_sb_cc = 0; internal->data.ptp.id = AEMU_POSTOFFICE_ID; internal->flags = 0; + internal->connect_threads = new std::vector(); AdhocSocket **slot = NULL; int i; @@ -3852,7 +3875,7 @@ static int sceNetAdhocPtpOpen(const char *srcmac, int sport, const char *dstmac, } // Random Port required - if (sport == 0) { + if (sport == 0 && !g_Config.bServerHasRelay) { isClient = true; //sport 0 should be shifted back to 0 when using offset Phantasy Star Portable 2 use this sport = -static_cast(portOffset); @@ -4235,23 +4258,51 @@ static int sceNetAdhocPtpAccept(int id, u32 peerMacAddrPtr, u32 peerPortPtr, int } static int ptp_connect_postoffice(int idx, uint32_t timeout, int nonblock){ + INFO_LOG(Log::sceNet, "%s: id %d timeout %u nonblock %d", __func__, idx + 1, timeout, nonblock); AdhocSocket *internal = adhocSockets[idx]; + // Phantasy Star Portable 2 will try to reconnect even when previous connect already success, so we should return success too if it's already connected if (internal->data.ptp.state == ADHOC_PTP_STATE_ESTABLISHED) return 0; - uint64_t begin = CoreTiming::GetGlobalTimeUsScaled(); - uint64_t end = begin + timeout; - struct aemu_post_office_sock_addr addr; addr.addr = g_adhocServerIP.in.sin_addr.s_addr; addr.port = htons(AEMU_POSTOFFICE_PORT); - void *ptp_socket = NULL; + if (nonblock || timeout != 0){ + // TODO actual notify based timeout + int timeout_return = nonblock ? SCE_NET_ADHOC_ERROR_WOULD_BLOCK : SCE_NET_ADHOC_ERROR_TIMEOUT; + + if (internal->data.ptp.state == ADHOC_PTP_STATE_CLOSED){ + while(internal->connect_threads->size() != 0){ + internal->connect_threads->at(internal->connect_threads->size() - 1).join(); + internal->connect_threads->pop_back(); + } + + internal->data.ptp.state = ADHOC_PTP_STATE_SYN_SENT; + + internal->connect_threads->push_back(std::thread([internal, addr, idx] { + int state; + void *ptp_socket = ptp_connect_v4(&addr, (const char *)&internal->data.ptp.laddr, internal->data.ptp.lport + portOffset, (const char *)&internal->data.ptp.paddr, internal->data.ptp.pport + portOffset, &state); + if (ptp_socket == NULL){ + ERROR_LOG(Log::sceNet, "%s: failed connecting to ptp socket, %d", __func__, state); + internal->data.ptp.state = ADHOC_PTP_STATE_CLOSED; + return; + } + internal->postoffice_handle = ptp_socket; + INFO_LOG(Log::sceNet, "%s: connected ptp socket with id %d %p", __func__, idx + 1, internal->postoffice_handle); + internal->data.ptp.state = ADHOC_PTP_STATE_ESTABLISHED; + return; + })); + + return timeout_return; + } + // ADHOC_PTP_STATE_SYN_SENT + return timeout_return; + } - // note that postoffice connect was designed to be a blocked operation, if the other side don't accept, or listen session not found, the server will kick us out int state; - ptp_socket = ptp_connect_v4(&addr, (const char *)&internal->data.ptp.laddr, internal->data.ptp.lport + portOffset, (const char *)&internal->data.ptp.paddr, internal->data.ptp.pport + portOffset, &state); + void *ptp_socket = ptp_connect_v4(&addr, (const char *)&internal->data.ptp.laddr, internal->data.ptp.lport + portOffset, (const char *)&internal->data.ptp.paddr, internal->data.ptp.pport + portOffset, &state); if (ptp_socket == NULL){ ERROR_LOG(Log::sceNet, "%s: failed connecting to ptp socket, %d", __func__, state); return SCE_NET_ADHOC_ERROR_CONNECTION_REFUSED; @@ -4409,12 +4460,23 @@ static int sceNetAdhocPtpConnect(int id, int timeout, int flag) { static int ptp_close_postoffice(int idx){ AdhocSocket *internal = adhocSockets[idx]; + + // sync + if (internal->connect_threads != NULL){ + while(internal->connect_threads->size() != 0){ + internal->connect_threads->at(internal->connect_threads->size() - 1).join(); + internal->connect_threads->pop_back(); + } + + delete internal->connect_threads; + } + void *socket = internal->postoffice_handle; if (socket != NULL){ - if (internal->data.ptp.state == ADHOC_PTP_STATE_ESTABLISHED){ - ptp_close(socket); - }else if (internal->data.ptp.state == ADHOC_PTP_STATE_LISTEN){ + if (internal->data.ptp.state == ADHOC_PTP_STATE_LISTEN){ ptp_listen_close(socket); + }else{ + ptp_close(socket); } } adhocSockets[idx] = NULL; @@ -4497,6 +4559,7 @@ static int ptp_listen_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, u internal->data.ptp.snd_sb_cc = 0; internal->data.ptp.id = AEMU_POSTOFFICE_ID; internal->flags = 0; + internal->connect_threads = NULL; AdhocSocket **slot = NULL; int i; From 3c38b5cfe17a540144b388483b0d8fd355b867d3 Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Wed, 14 Jan 2026 00:53:29 +0100 Subject: [PATCH 04/10] rework ptp connect in relay mode, logic cleanup --- Core/HLE/proAdhoc.cpp | 9 +- Core/HLE/proAdhoc.h | 4 +- Core/HLE/sceNetAdhoc.cpp | 196 +++++++++++++++++++++------------------ 3 files changed, 111 insertions(+), 98 deletions(-) diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp index 4076885d31..132813289f 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp @@ -424,12 +424,9 @@ void deleteAllAdhocSockets() { if (g_Config.bServerHasRelay){ if (sock->type == SOCK_PTP){ // sync - if (sock->connect_threads != NULL){ - while(sock->connect_threads->size() != 0){ - sock->connect_threads->at(sock->connect_threads->size() - 1).join(); - sock->connect_threads->pop_back(); - } - delete sock->connect_threads; + if (sock->connect_thread != NULL){ + sock->connect_thread->join(); + delete sock->connect_thread; } void *socket = sock->postoffice_handle; if (socket != NULL){ diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h index 7bbf127c3f..129e1a595b 100644 --- a/Core/HLE/proAdhoc.h +++ b/Core/HLE/proAdhoc.h @@ -329,7 +329,9 @@ typedef struct AdhocSocket { SceNetAdhocPtpStat ptp; } data; void *postoffice_handle; // aemu_postoffice mode handle - std::vector *connect_threads; + std::thread *connect_thread; + bool connect_thread_done; + int connect_thread_result; } PACK AdhocSocket; // Gamemode Optional Peer Buffer Data diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 17627f8754..e2823e0b3b 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -89,7 +89,7 @@ std::map sendTargetPeers; int gameModeNotifyEvent = -1; #define AEMU_POSTOFFICE_PORT 27313 -#define AEMU_POSTOFFICE_ID 999 +#define AEMU_POSTOFFICE_ID_BASE 2048 int AcceptPtpSocket(int ptpId, int newsocket, sockaddr_in& peeraddr, SceNetEtherAddr* addr, u16_le* port); int PollAdhocSocket(SceNetAdhocPollSd* sds, int count, int timeout, int nonblock); @@ -1019,9 +1019,9 @@ static int ptp_accept_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *spor internal->data.ptp.state = ADHOC_PTP_STATE_ESTABLISHED; internal->data.ptp.rcv_sb_cc = adhocSockets[idx]->data.ptp.rcv_sb_cc; internal->data.ptp.snd_sb_cc = adhocSockets[idx]->data.ptp.snd_sb_cc; - internal->data.ptp.id = AEMU_POSTOFFICE_ID; + internal->data.ptp.id = AEMU_POSTOFFICE_ID_BASE + idx; internal->flags = 0; - internal->connect_threads = NULL; + internal->connect_thread = NULL; AdhocSocket **slot = NULL; int i; @@ -1113,6 +1113,51 @@ int DoBlockingPtpAccept(AdhocSocketRequest& req, s64& result) { return 0; } +static int ptp_connect_postoffice(int idx, const char *caller){ + AdhocSocket *internal = adhocSockets[idx]; + + struct aemu_post_office_sock_addr addr; + addr.addr = g_adhocServerIP.in.sin_addr.s_addr; + addr.port = htons(AEMU_POSTOFFICE_PORT); + + if (internal->postoffice_handle != NULL){ + return 0; + } + + if (internal->connect_thread_done){ + if (internal->connect_thread != NULL){ + internal->connect_thread->join(); + delete internal->connect_thread; + internal->connect_thread = NULL; + } + + internal->connect_thread_done = false; + internal->connect_thread_result = 0; + + internal->connect_thread = new std::thread([internal, addr, idx] { + int state; + void *ptp_socket = ptp_connect_v4(&addr, (const char *)&internal->data.ptp.laddr, internal->data.ptp.lport + portOffset, (const char *)&internal->data.ptp.paddr, internal->data.ptp.pport + portOffset, &state); + if (ptp_socket == NULL){ + internal->connect_thread_result = SCE_NET_ADHOC_ERROR_CONNECTION_REFUSED; + ERROR_LOG(Log::sceNet, "%s: failed connecting to ptp socket, %d", __func__, state); + internal->connect_thread_done = true; + return; + } + internal->postoffice_handle = ptp_socket; + internal->connect_thread_result = 0; + INFO_LOG(Log::sceNet, "%s: connected ptp socket with id %d %p", __func__, idx + 1, internal->postoffice_handle); + internal->connect_thread_done = true; + return; + });; + + DEBUG_LOG(Log::sceNet, "%s: started connect thread on id %d", __func__, idx + 1); + return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; + } + + DEBUG_LOG(Log::sceNet, "%s: id %d is connecting", __func__, idx + 1); + return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; +} + int DoBlockingPtpConnect(AdhocSocketRequest& req, s64& result, AdhocSendTargets& targetPeer) { auto sock = adhocSockets[req.id - 1]; if (!sock) { @@ -1135,8 +1180,16 @@ int DoBlockingPtpConnect(AdhocSocketRequest& req, s64& result, AdhocSendTargets& sin.sin_addr.s_addr = targetPeer.peers[0].ip; sin.sin_port = htons(ptpsocket.pport + targetPeer.peers[0].portOffset); - ret = connect(ptpsocket.id, (struct sockaddr*)&sin, sizeof(sin)); - sockerr = socket_errno; + if (g_Config.bServerHasRelay){ + ret = ptp_connect_postoffice(req.id - 1, __func__); + if (ret != 0){ + ret = SOCKET_ERROR; + sockerr = EAGAIN; + } + }else{ + ret = connect(ptpsocket.id, (struct sockaddr*)&sin, sizeof(sin)); + sockerr = socket_errno; + } if (sockerr != 0) DEBUG_LOG(Log::sceNet, "sceNetAdhocPtpConnect[%i:%u]: connect(%i) error = %i", req.id, ptpsocket.lport, ptpsocket.id, sockerr); else @@ -1145,7 +1198,22 @@ int DoBlockingPtpConnect(AdhocSocketRequest& req, s64& result, AdhocSendTargets& // Check the connection state (assuming "connect" has been called before and is in-progress) // Note: On Linux "select" can return > 0 (with SO_ERROR = 0) even when the connection is not accepted yet, thus need "getpeername" to ensure else { - ret = IsSocketReady(ptpsocket.id, false, true, &sockerr); + if (g_Config.bServerHasRelay){ + if (sock->postoffice_handle == NULL){ + ret = SOCKET_ERROR; + if (sock->connect_thread_done && sock->connect_thread_result == SCE_NET_ADHOC_ERROR_CONNECTION_REFUSED){ + sockerr = ECONNREFUSED; + }else{ + sockerr = EAGAIN; + } + }else{ + // the handle is there, we're ready to go + ret = 1; + sockerr = 0; + } + }else{ + ret = IsSocketReady(ptpsocket.id, false, true, &sockerr); + } DEBUG_LOG(Log::sceNet, "sceNetAdhocPtpConnect[%i:%u]: Select(%i) = %i, error = %i", req.id, ptpsocket.lport, ptpsocket.id, ret, sockerr); if (sockerr != 0) { DEBUG_LOG(Log::sceNet, "sceNetAdhocPtpConnect[%i:%u]: SelectError(%i) = %i", req.id, ptpsocket.lport, ptpsocket.id, sockerr); @@ -1160,7 +1228,7 @@ int DoBlockingPtpConnect(AdhocSocketRequest& req, s64& result, AdhocSendTargets& } // Check whether the connection has been established or not - if (ret != SOCKET_ERROR) { + if (!g_Config.bServerHasRelay && ret != SOCKET_ERROR) { socklen_t sinlen = sizeof(sin); memset(&sin, 0, sinlen); // Note: "getpeername" shouldn't failed if the connection has been established, but on Windows it may succeed even when "connect" is still in-progress and not accepted yet (ie. "Tales of VS" on Windows) @@ -1642,7 +1710,6 @@ static int pdp_create_postoffice(const SceNetEtherAddr *saddr, int sport, int bu internal->data.pdp.laddr = *saddr; internal->data.pdp.lport = sport; internal->data.pdp.rcv_sb_cc = bufsize; - internal->data.pdp.id = AEMU_POSTOFFICE_ID; internal->flags = 0; AdhocSocket **free_slot = NULL; @@ -1658,6 +1725,8 @@ static int pdp_create_postoffice(const SceNetEtherAddr *saddr, int sport, int bu return ERROR_NET_NO_SPACE; } + internal->data.pdp.id = AEMU_POSTOFFICE_ID_BASE + i; + *free_slot = internal; pdp_postoffice_recover(i); INFO_LOG(Log::sceNet, "%s: created pdp socket with id %d %p", __func__, i + 1, internal->postoffice_handle); @@ -2275,10 +2344,10 @@ int sceNetAdhocPdpRecv(int id, void *addr, void * port, void *buf, void *dataLen return hleLogVerbose(Log::sceNet, SCE_NET_ADHOC_ERROR_NOT_ENOUGH_SPACE, "not enough space"); } - sinlen = sizeof(sin); - memset(&sin, 0, sinlen); - // On Windows: Socket Error 10014 may happen when buffer size is less than the minimum allowed/required (ie. negative number on Vulcanus Seek and Destroy), the address is not a valid part of the user address space (ie. on the stack or when buffer overflow occurred), or the address is not properly aligned (ie. multiple of 4 on 32bit and multiple of 8 on 64bit) https://stackoverflow.com/questions/861154/winsock-error-code-10014 - if (pdpsocket.id != AEMU_POSTOFFICE_ID){ + if (!g_Config.bServerHasRelay){ + sinlen = sizeof(sin); + memset(&sin, 0, sinlen); + // On Windows: Socket Error 10014 may happen when buffer size is less than the minimum allowed/required (ie. negative number on Vulcanus Seek and Destroy), the address is not a valid part of the user address space (ie. on the stack or when buffer overflow occurred), or the address is not properly aligned (ie. multiple of 4 on 32bit and multiple of 8 on 64bit) https://stackoverflow.com/questions/861154/winsock-error-code-10014 received = recvfrom(pdpsocket.id, (char*)buf, std::max(0, *len), MSG_NOSIGNAL, (struct sockaddr*)&sin, &sinlen); error = socket_errno; } @@ -3816,9 +3885,9 @@ static int ptp_open_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, con internal->data.ptp.pport = dport; internal->data.ptp.rcv_sb_cc = bufsize; internal->data.ptp.snd_sb_cc = 0; - internal->data.ptp.id = AEMU_POSTOFFICE_ID; internal->flags = 0; - internal->connect_threads = new std::vector(); + internal->connect_thread = NULL; + internal->connect_thread_done = true; AdhocSocket **slot = NULL; int i; @@ -3835,6 +3904,8 @@ static int ptp_open_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, con return ERROR_NET_NO_SPACE; } + internal->data.ptp.id = AEMU_POSTOFFICE_ID_BASE + i; + *slot = internal; INFO_LOG(Log::sceNet, "%s: created ptp socket with id %d", __func__, i + 1); return i + 1; @@ -4257,74 +4328,12 @@ static int sceNetAdhocPtpAccept(int id, u32 peerMacAddrPtr, u32 peerPortPtr, int return hleLogVerbose(Log::sceNet, SCE_NET_ADHOC_ERROR_NOT_INITIALIZED, "not initialized"); } -static int ptp_connect_postoffice(int idx, uint32_t timeout, int nonblock){ - INFO_LOG(Log::sceNet, "%s: id %d timeout %u nonblock %d", __func__, idx + 1, timeout, nonblock); - AdhocSocket *internal = adhocSockets[idx]; - - // Phantasy Star Portable 2 will try to reconnect even when previous connect already success, so we should return success too if it's already connected - if (internal->data.ptp.state == ADHOC_PTP_STATE_ESTABLISHED) - return 0; - - struct aemu_post_office_sock_addr addr; - addr.addr = g_adhocServerIP.in.sin_addr.s_addr; - addr.port = htons(AEMU_POSTOFFICE_PORT); - - if (nonblock || timeout != 0){ - // TODO actual notify based timeout - int timeout_return = nonblock ? SCE_NET_ADHOC_ERROR_WOULD_BLOCK : SCE_NET_ADHOC_ERROR_TIMEOUT; - - if (internal->data.ptp.state == ADHOC_PTP_STATE_CLOSED){ - while(internal->connect_threads->size() != 0){ - internal->connect_threads->at(internal->connect_threads->size() - 1).join(); - internal->connect_threads->pop_back(); - } - - internal->data.ptp.state = ADHOC_PTP_STATE_SYN_SENT; - - internal->connect_threads->push_back(std::thread([internal, addr, idx] { - int state; - void *ptp_socket = ptp_connect_v4(&addr, (const char *)&internal->data.ptp.laddr, internal->data.ptp.lport + portOffset, (const char *)&internal->data.ptp.paddr, internal->data.ptp.pport + portOffset, &state); - if (ptp_socket == NULL){ - ERROR_LOG(Log::sceNet, "%s: failed connecting to ptp socket, %d", __func__, state); - internal->data.ptp.state = ADHOC_PTP_STATE_CLOSED; - return; - } - internal->postoffice_handle = ptp_socket; - INFO_LOG(Log::sceNet, "%s: connected ptp socket with id %d %p", __func__, idx + 1, internal->postoffice_handle); - internal->data.ptp.state = ADHOC_PTP_STATE_ESTABLISHED; - return; - })); - - return timeout_return; - } - // ADHOC_PTP_STATE_SYN_SENT - return timeout_return; - } - - int state; - void *ptp_socket = ptp_connect_v4(&addr, (const char *)&internal->data.ptp.laddr, internal->data.ptp.lport + portOffset, (const char *)&internal->data.ptp.paddr, internal->data.ptp.pport + portOffset, &state); - if (ptp_socket == NULL){ - ERROR_LOG(Log::sceNet, "%s: failed connecting to ptp socket, %d", __func__, state); - return SCE_NET_ADHOC_ERROR_CONNECTION_REFUSED; - } - - // we got a new socket - internal->postoffice_handle = ptp_socket; - internal->data.ptp.state = ADHOC_PTP_STATE_ESTABLISHED; - - INFO_LOG(Log::sceNet, "%s: connected ptp socket with id %d %p", __func__, idx + 1, internal->postoffice_handle); - return 0; -} - int NetAdhocPtp_Connect(int id, int timeout, int flag, bool allowForcedConnect) { // Library is initialized if (netAdhocInited) { // Valid Socket if (id > 0 && id <= MAX_SOCKET && adhocSockets[id - 1] != NULL) { - if (g_Config.bServerHasRelay) - return ptp_connect_postoffice(id - 1, timeout, flag); - // Cast Socket auto socket = adhocSockets[id - 1]; auto& ptpsocket = socket->data.ptp; @@ -4360,10 +4369,18 @@ int NetAdhocPtp_Connect(int id, int timeout, int flag, bool allowForcedConnect) // Connect Socket to Peer // NOTE: Based on what i read at stackoverflow, The First Non-blocking POSIX connect will always returns EAGAIN/EWOULDBLOCK because it returns without waiting for ACK/handshake, But GvG Next Plus is treating non-blocking PtpConnect just like blocking connect, May be on a real PSP the first non-blocking sceNetAdhocPtpConnect can be successfull? - int connectresult = connect(ptpsocket.id, (struct sockaddr*)&sin, sizeof(sin)); - - // Grab Error Code - int errorcode = socket_errno; + int connectresult = 0; + int errorcode = 0; + if (g_Config.bServerHasRelay){ + connectresult = ptp_connect_postoffice(id - 1, __func__); + if (connectresult != 0){ + connectresult = SOCKET_ERROR; + errorcode = EAGAIN; + } + }else{ + connectresult = connect(ptpsocket.id, (struct sockaddr*)&sin, sizeof(sin)); + errorcode = socket_errno; + } if (connectresult == SOCKET_ERROR) { if (errorcode == EAGAIN || errorcode == EWOULDBLOCK || errorcode == EALREADY || errorcode == EISCONN) @@ -4387,8 +4404,8 @@ int NetAdhocPtp_Connect(int id, int timeout, int flag, bool allowForcedConnect) else if (connectresult == SOCKET_ERROR) { // Connection in Progress, or // ECONNREFUSED = No connection could be made because the target device actively refused it (on Windows/Linux/Android), or no one listening on the remote address (on Linux/Android) thus should try to connect again later (treated similarly to ETIMEDOUT/ENETUNREACH). - if (connectInProgress(errorcode) || errorcode == ECONNREFUSED) { - if (connectInProgress(errorcode)) + if (g_Config.bServerHasRelay || connectInProgress(errorcode) || errorcode == ECONNREFUSED) { + if (g_Config.bServerHasRelay || connectInProgress(errorcode)) { ptpsocket.state = ADHOC_PTP_STATE_SYN_SENT; } @@ -4462,13 +4479,9 @@ static int ptp_close_postoffice(int idx){ AdhocSocket *internal = adhocSockets[idx]; // sync - if (internal->connect_threads != NULL){ - while(internal->connect_threads->size() != 0){ - internal->connect_threads->at(internal->connect_threads->size() - 1).join(); - internal->connect_threads->pop_back(); - } - - delete internal->connect_threads; + if (internal->connect_thread != NULL){ + internal->connect_thread->join(); + delete internal->connect_thread; } void *socket = internal->postoffice_handle; @@ -4557,9 +4570,8 @@ static int ptp_listen_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, u internal->data.ptp.state = ADHOC_PTP_STATE_LISTEN; internal->data.ptp.rcv_sb_cc = bufsize; internal->data.ptp.snd_sb_cc = 0; - internal->data.ptp.id = AEMU_POSTOFFICE_ID; internal->flags = 0; - internal->connect_threads = NULL; + internal->connect_thread = NULL; AdhocSocket **slot = NULL; int i; @@ -4576,6 +4588,8 @@ static int ptp_listen_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, u return ERROR_NET_NO_SPACE; } + internal->data.ptp.id = AEMU_POSTOFFICE_ID_BASE + i; + *slot = internal; ptp_listen_postoffice_recover(i); INFO_LOG(Log::sceNet, "%s: created ptp listen socket with id %d %p", __func__, i + 1, internal->postoffice_handle); From f03b6d76b20c60ad3d668c47dac161f5df4c97ae Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Thu, 15 Jan 2026 20:37:29 +0100 Subject: [PATCH 05/10] code formatting cleanup --- Core/HLE/proAdhoc.cpp | 26 +-- Core/HLE/proAdhoc.h | 8 +- Core/HLE/sceNetAdhoc.cpp | 407 ++++++++++++++++++++------------------- 3 files changed, 227 insertions(+), 214 deletions(-) diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp index 132813289f..97479bf316 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp @@ -421,27 +421,27 @@ void deleteAllAdhocSockets() { if (adhocSockets[i] != NULL) { auto sock = adhocSockets[i]; - if (g_Config.bServerHasRelay){ - if (sock->type == SOCK_PTP){ + if (g_Config.bServerHasRelay) { + if (sock->type == SOCK_PTP) { // sync - if (sock->connect_thread != NULL){ - sock->connect_thread->join(); - delete sock->connect_thread; + if (sock->connectThread != NULL) { + sock->connectThread->join(); + delete sock->connectThread; } - void *socket = sock->postoffice_handle; - if (socket != NULL){ - if (sock->data.ptp.state == ADHOC_PTP_STATE_LISTEN){ + void *socket = sock->postofficeHandle; + if (socket != NULL) { + if (sock->data.ptp.state == ADHOC_PTP_STATE_LISTEN) { ptp_listen_close(socket); - }else{ + } else { ptp_close(socket); } } - }else{ - if (sock->postoffice_handle != NULL){ - pdp_delete(sock->postoffice_handle); + } else { + if (sock->postofficeHandle != NULL) { + pdp_delete(sock->postofficeHandle); } } - }else{ + } else { int fd = -1; if (sock->type == SOCK_PTP) fd = sock->data.ptp.id; diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h index 129e1a595b..0bee8b83d1 100644 --- a/Core/HLE/proAdhoc.h +++ b/Core/HLE/proAdhoc.h @@ -328,10 +328,10 @@ typedef struct AdhocSocket { SceNetAdhocPdpStat pdp; SceNetAdhocPtpStat ptp; } data; - void *postoffice_handle; // aemu_postoffice mode handle - std::thread *connect_thread; - bool connect_thread_done; - int connect_thread_result; + void *postofficeHandle; // aemu_postoffice mode handle + std::thread *connectThread; + bool connectThreadDone; + int connectThreadResult; } PACK AdhocSocket; // Gamemode Optional Peer Buffer Data diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index e2823e0b3b..858917b995 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -441,10 +441,10 @@ int StartGameModeScheduler() { return 0; } -static void *pdp_postoffice_recover(int idx){ +static void *pdp_postoffice_recover(int idx) { AdhocSocket *internal = adhocSockets[idx]; - if (internal->postoffice_handle != NULL){ - return internal->postoffice_handle; + if (internal->postofficeHandle != NULL) { + return internal->postofficeHandle; } INFO_LOG(Log::sceNet, "%s: recovering pdp socket id %d", __func__, idx + 1); @@ -457,34 +457,34 @@ static void *pdp_postoffice_recover(int idx){ getLocalMac(&local_mac); int state; - internal->postoffice_handle = pdp_create_v4(&addr, (const char *)&local_mac, internal->data.pdp.lport + portOffset, &state); - if (state != AEMU_POSTOFFICE_CLIENT_OK){ + internal->postofficeHandle = pdp_create_v4(&addr, (const char *)&local_mac, internal->data.pdp.lport + portOffset, &state); + if (state != AEMU_POSTOFFICE_CLIENT_OK) { ERROR_LOG(Log::sceNet, "%s: failed creating pdp socket on aemu postoffice library, %d", __func__, state); } - INFO_LOG(Log::sceNet, "%s: pdp recovery for id %d: %p", __func__, idx + 1, internal->postoffice_handle); - return internal->postoffice_handle; + INFO_LOG(Log::sceNet, "%s: pdp recovery for id %d: %p", __func__, idx + 1, internal->postofficeHandle); + return internal->postofficeHandle; } -static int pdp_peek_next_size_postoffice(int idx){ +static int pdp_peek_next_size_postoffice(int idx) { AdhocSocket *internal = adhocSockets[idx]; void *pdp_sock = pdp_postoffice_recover(idx); - if (pdp_sock == NULL){ + if (pdp_sock == NULL) { return 0; } int peek_status = pdp_peek_next_size(pdp_sock); - if (peek_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD){ - pdp_delete(internal->postoffice_handle); - internal->postoffice_handle = NULL; + if (peek_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD) { + pdp_delete(internal->postofficeHandle); + internal->postofficeHandle = NULL; return 0; } return peek_status; } -static int pdp_recv_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *sport, void *data, int *len){ - AdhocSocket *internal = adhocSockets[idx]; +static int pdp_recv_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *sport, void *data, int *len) { + AdhocSocket *internal = adhocSockets[idx]; void *pdp_sock = pdp_postoffice_recover(idx); - if (pdp_sock == NULL){ + if (pdp_sock == NULL) { return SOCKET_ERROR; } @@ -492,27 +492,27 @@ static int pdp_recv_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *sport, SceNetEtherAddr saddr_copy; int len_copy = *len; - if (len_copy > 2048){ + if (len_copy > 2048) { // trim, library limites pdp packets len_copy = 2048; } int pdp_recv_status = pdp_recv(pdp_sock, (char *)&saddr_copy, &sport_copy, (char *)data, &len_copy, true); - if (pdp_recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD){ - pdp_delete(internal->postoffice_handle); - internal->postoffice_handle = NULL; + if (pdp_recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD) { + pdp_delete(internal->postofficeHandle); + internal->postofficeHandle = NULL; return SOCKET_ERROR; } - if (pdp_recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + if (pdp_recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK) { return SOCKET_ERROR; } - if (pdp_recv_status == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY){ + if (pdp_recv_status == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY) { // this is pretty critical ERROR_LOG(Log::sceNet, "%s: critical: huge client buf %d what is going on please fix", __func__, *len); } *len = len_copy; - if (saddr != NULL){ + if (saddr != NULL) { *saddr = saddr_copy; } *sport = sport_copy - portOffset; @@ -541,23 +541,23 @@ int DoBlockingPdpRecv(AdhocSocketRequest& req, s64& result) { sinlen = sizeof(sin); memset(&sin, 0, sinlen); - if (g_Config.bServerHasRelay){ - while(1){ + if (g_Config.bServerHasRelay) { + while(1) { int next_size = pdp_peek_next_size_postoffice(req.id - 1); - if (next_size == 0){ + if (next_size == 0) { // no next packet ret = SOCKET_ERROR; sockerr = EAGAIN; break; } - if (next_size > *req.length){ + if (next_size > *req.length) { // next is larger than current buffer result = SCE_NET_ADHOC_ERROR_NOT_ENOUGH_SPACE; return 0; } uint16_t recv_port; ret = pdp_recv_postoffice(req.id - 1, req.remoteMAC, req.remotePort, req.buffer, req.length); - if (ret == 0){ + if (ret == 0) { // we got data into the request result = 0; return 0; @@ -566,7 +566,7 @@ int DoBlockingPdpRecv(AdhocSocketRequest& req, s64& result) { sockerr = EAGAIN; break; } - }else{ + } else { // On Windows: MSG_TRUNC are not supported on recvfrom (socket error WSAEOPNOTSUPP), so we use dummy buffer as an alternative ret = recvfrom(pdpsocket.id, dummyPeekBuf64k, dummyPeekBuf64kSize, MSG_PEEK | MSG_NOSIGNAL, (struct sockaddr*)&sin, &sinlen); sockerr = socket_errno; @@ -671,23 +671,23 @@ int DoBlockingPdpRecv(AdhocSocketRequest& req, s64& result) { return 0; } -static int pdp_send_postoffice(int idx, const SceNetEtherAddr *daddr, uint16_t dport, const void *data, int len){ - AdhocSocket *internal = adhocSockets[idx]; +static int pdp_send_postoffice(int idx, const SceNetEtherAddr *daddr, uint16_t dport, const void *data, int len) { + AdhocSocket *internal = adhocSockets[idx]; void *pdp_sock = pdp_postoffice_recover(idx); - if (pdp_sock == NULL){ + if (pdp_sock == NULL) { return SOCKET_ERROR; } int pdp_send_status = pdp_send(pdp_sock, (const char *)daddr, dport + portOffset, (char *)data, len, true); - if (pdp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD){ - pdp_delete(internal->postoffice_handle); - internal->postoffice_handle = NULL; + if (pdp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD) { + pdp_delete(internal->postofficeHandle); + internal->postofficeHandle = NULL; return SOCKET_ERROR; } - if (pdp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + if (pdp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK) { return SOCKET_ERROR; } - if (pdp_send_status == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY){ + if (pdp_send_status == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY) { // this is pretty critical ERROR_LOG(Log::sceNet, "%s: critical: huge client buf %d what is going on please fix", __func__, len); } @@ -718,14 +718,14 @@ int DoBlockingPdpSend(AdhocSocketRequest& req, s64& result, AdhocSendTargets& ta int ret = 0; int sockerr = 0; - if (g_Config.bServerHasRelay){ + if (g_Config.bServerHasRelay) { ret = pdp_send_postoffice(req.id - 1, &peer->mac, peer->port, req.buffer, targetPeers.length); if (ret == 0){ ret == *req.length; }else{ sockerr = EAGAIN; } - }else{ + } else { ret = sendto(pdpsocket.id, (const char*)req.buffer, targetPeers.length, MSG_NOSIGNAL, (struct sockaddr*)&target, sizeof(target)); sockerr = socket_errno; } @@ -758,18 +758,18 @@ int DoBlockingPdpSend(AdhocSocketRequest& req, s64& result, AdhocSendTargets& ta return 0; } -static int ptp_send_postoffice(int idx, const void *data, int len){ +static int ptp_send_postoffice(int idx, const void *data, int len) { AdhocSocket *internal = adhocSockets[idx]; - int ptp_send_status = ptp_send(internal->postoffice_handle, (const char *)data, len, true); - if (ptp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD){ + int ptp_send_status = ptp_send(internal->postofficeHandle, (const char *)data, len, true); + if (ptp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD) { // the session is dead, need to be reflected to the other side return SOCKET_ERROR; } - if (ptp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + if (ptp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK) { return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; } - if (ptp_send_status == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY){ + if (ptp_send_status == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY) { // this is pretty critical ERROR_LOG(Log::sceNet, "%s: critical: huge client buf %d what is going on please fix", __func__, len); } @@ -793,14 +793,14 @@ int DoBlockingPtpSend(AdhocSocketRequest& req, s64& result) { // Send Data int ret = 0; int sockerr = 0; - if (g_Config.bServerHasRelay){ + if (g_Config.bServerHasRelay) { ret = ptp_send_postoffice(req.id - 1, req.buffer, *req.length); - if (ret == 0){ + if (ret == 0) { // sent result = 0; return 0; } - if (ret == SOCKET_ERROR){ + if (ret == SOCKET_ERROR) { ptpsocket.state = ADHOC_PTP_STATE_CLOSED; result = SCE_NET_ADHOC_ERROR_DISCONNECTED; return 0; @@ -849,24 +849,24 @@ int DoBlockingPtpSend(AdhocSocketRequest& req, s64& result) { return 0; } -static int ptp_recv_postoffice(int idx, void *data, int *len){ +static int ptp_recv_postoffice(int idx, void *data, int *len) { AdhocSocket *internal = adhocSockets[idx]; int len_copy = *len; - if (len_copy > 50 * 1024){ + if (len_copy > 50 * 1024) { // trim, library limit len_copy = 50 * 1024; } - int ptp_recv_status = ptp_recv(internal->postoffice_handle, (char *)data, &len_copy, true); - if (ptp_recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD){ + int ptp_recv_status = ptp_recv(internal->postofficeHandle, (char *)data, &len_copy, true); + if (ptp_recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD) { // the session is dead, need to be reflected to the other side return SOCKET_ERROR; } - if (ptp_recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ + if (ptp_recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK) { return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; } - if (ptp_recv_status == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY){ + if (ptp_recv_status == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY) { // this is pretty critical ERROR_LOG(Log::sceNet, "%s: critical: huge client buf %d what is going on please fix", __func__, *len); } @@ -892,14 +892,14 @@ int DoBlockingPtpRecv(AdhocSocketRequest& req, s64& result) { int ret = 0; int sockerr = 0; - if (g_Config.bServerHasRelay){ + if (g_Config.bServerHasRelay) { ret = ptp_recv_postoffice(req.id - 1, req.buffer, req.length); if (ret == 0){ // we got data result = 0; return 0; } - if (ret == SOCKET_ERROR){ + if (ret == SOCKET_ERROR) { // the socket died, let the game know ptpsocket.state = ADHOC_PTP_STATE_CLOSED; result = SCE_NET_ADHOC_ERROR_DISCONNECTED; @@ -908,7 +908,7 @@ int DoBlockingPtpRecv(AdhocSocketRequest& req, s64& result) { // SCE_NET_ADHOC_ERROR_WOULD_BLOCK ret = SOCKET_ERROR; sockerr = EAGAIN; - }else{ + } else { ret = recv(ptpsocket.id, (char*)req.buffer, std::max(0, *req.length), MSG_NOSIGNAL); sockerr = socket_errno; } @@ -953,10 +953,10 @@ int DoBlockingPtpRecv(AdhocSocketRequest& req, s64& result) { return 0; } -static void *ptp_listen_postoffice_recover(int idx){ +static void *ptp_listen_postoffice_recover(int idx) { AdhocSocket *internal = adhocSockets[idx]; - if (internal->postoffice_handle != NULL){ - return internal->postoffice_handle; + if (internal->postofficeHandle != NULL) { + return internal->postofficeHandle; } INFO_LOG(Log::sceNet, "%s: recovering ptp listen socket id %d", __func__, idx + 1); @@ -966,21 +966,21 @@ static void *ptp_listen_postoffice_recover(int idx){ addr.port = htons(AEMU_POSTOFFICE_PORT); int state; - internal->postoffice_handle = ptp_listen_v4(&addr, (const char*)&internal->data.ptp.laddr, internal->data.ptp.lport + portOffset, &state); + internal->postofficeHandle = ptp_listen_v4(&addr, (const char*)&internal->data.ptp.laddr, internal->data.ptp.lport + portOffset, &state); - if (state != AEMU_POSTOFFICE_CLIENT_OK){ + if (state != AEMU_POSTOFFICE_CLIENT_OK) { ERROR_LOG(Log::sceNet, "%s: failed recovering ptp listen socket, %d", __func__, state); } - INFO_LOG(Log::sceNet, "%s: ptp listen recovery for id %d: %p", __func__, idx + 1, internal->postoffice_handle); + INFO_LOG(Log::sceNet, "%s: ptp listen recovery for id %d: %p", __func__, idx + 1, internal->postofficeHandle); - return internal->postoffice_handle; + return internal->postofficeHandle; } -static int ptp_accept_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *sport){ +static int ptp_accept_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *sport) { void *ptp_listen_socket = ptp_listen_postoffice_recover(idx); - if (ptp_listen_socket == NULL){ + if (ptp_listen_socket == NULL) { return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; } @@ -988,13 +988,13 @@ static int ptp_accept_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *spor int port_cpy; SceNetEtherAddr mac_cpy; void *new_ptp_socket = ptp_accept(ptp_listen_socket, (char *)&mac_cpy, &port_cpy, true, &state); - if (new_ptp_socket == NULL){ - if (state == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD){ - ptp_listen_close(adhocSockets[idx]->postoffice_handle); - adhocSockets[idx]->postoffice_handle = NULL; + if (new_ptp_socket == NULL) { + if (state == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD) { + ptp_listen_close(adhocSockets[idx]->postofficeHandle); + adhocSockets[idx]->postofficeHandle = NULL; return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; } - if (state == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY){ + if (state == AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY) { // pretty critical here ERROR_LOG(Log::sceNet, "%s: aemu_postoffice ran out of memory to accept a new connection", __func__); } @@ -1004,14 +1004,14 @@ static int ptp_accept_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *spor // we have a new socket AdhocSocket *internal = (AdhocSocket *)malloc(sizeof(AdhocSocket)); - if (internal == NULL){ + if (internal == NULL) { ERROR_LOG(Log::sceNet, "%s: critical: ran out of heap memory while accepting new connection", __func__); ptp_close(new_ptp_socket); return SCE_NET_ADHOC_ERROR_WOULD_BLOCK; } internal->type = SOCK_PTP; - internal->postoffice_handle = new_ptp_socket; + internal->postofficeHandle = new_ptp_socket; internal->data.ptp.laddr = adhocSockets[idx]->data.ptp.laddr; internal->data.ptp.lport = adhocSockets[idx]->data.ptp.lport; internal->data.ptp.paddr = mac_cpy; @@ -1021,18 +1021,18 @@ static int ptp_accept_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *spor internal->data.ptp.snd_sb_cc = adhocSockets[idx]->data.ptp.snd_sb_cc; internal->data.ptp.id = AEMU_POSTOFFICE_ID_BASE + idx; internal->flags = 0; - internal->connect_thread = NULL; + internal->connectThread = NULL; AdhocSocket **slot = NULL; int i; - for(i = 0;i < MAX_SOCKET;i++){ - if (adhocSockets[i] == NULL){ + for (i = 0; i < MAX_SOCKET; i++) { + if (adhocSockets[i] == NULL) { slot = &adhocSockets[i]; break; } } - if (slot == NULL){ + if (slot == NULL) { ptp_close(new_ptp_socket); free(internal); ERROR_LOG(Log::sceNet, "%s: critical: cannot find an empty mapper slot", __func__); @@ -1041,14 +1041,14 @@ static int ptp_accept_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *spor *slot = internal; - if (saddr != NULL){ + if (saddr != NULL) { *saddr = mac_cpy; } - if (sport != NULL){ + if (sport != NULL) { *sport = port_cpy - portOffset; } - INFO_LOG(Log::sceNet, "%s: accepted ptp socket with id %d %p", __func__, i + 1, internal->postoffice_handle); + INFO_LOG(Log::sceNet, "%s: accepted ptp socket with id %d %p", __func__, i + 1, internal->postofficeHandle); return i + 1; } @@ -1070,16 +1070,16 @@ int DoBlockingPtpAccept(AdhocSocketRequest& req, s64& result) { socklen_t sinlen = sizeof(sin); int ret, sockerr; - if (g_Config.bServerHasRelay){ + if (g_Config.bServerHasRelay) { ret = ptp_accept_postoffice(req.id - 1, req.remoteMAC, req.remotePort); - if (ret >= 0){ + if (ret >= 0) { result = ret; return 0; - }else{ + } else { ret = SOCKET_ERROR; sockerr = EAGAIN; } - }else{ + } else { // Check if listening socket is ready to accept ret = IsSocketReady(ptpsocket.id, true, false, &sockerr); if (ret > 0) { @@ -1113,40 +1113,40 @@ int DoBlockingPtpAccept(AdhocSocketRequest& req, s64& result) { return 0; } -static int ptp_connect_postoffice(int idx, const char *caller){ +static int ptp_connect_postoffice(int idx, const char *caller) { AdhocSocket *internal = adhocSockets[idx]; struct aemu_post_office_sock_addr addr; addr.addr = g_adhocServerIP.in.sin_addr.s_addr; addr.port = htons(AEMU_POSTOFFICE_PORT); - if (internal->postoffice_handle != NULL){ + if (internal->postofficeHandle != NULL) { return 0; } - if (internal->connect_thread_done){ - if (internal->connect_thread != NULL){ - internal->connect_thread->join(); - delete internal->connect_thread; - internal->connect_thread = NULL; + if (internal->connectThreadDone) { + if (internal->connectThread != NULL) { + internal->connectThread->join(); + delete internal->connectThread; + internal->connectThread = NULL; } - internal->connect_thread_done = false; - internal->connect_thread_result = 0; + internal->connectThreadDone = false; + internal->connectThreadResult = 0; - internal->connect_thread = new std::thread([internal, addr, idx] { + internal->connectThread = new std::thread([internal, addr, idx] { int state; void *ptp_socket = ptp_connect_v4(&addr, (const char *)&internal->data.ptp.laddr, internal->data.ptp.lport + portOffset, (const char *)&internal->data.ptp.paddr, internal->data.ptp.pport + portOffset, &state); - if (ptp_socket == NULL){ - internal->connect_thread_result = SCE_NET_ADHOC_ERROR_CONNECTION_REFUSED; + if (ptp_socket == NULL) { + internal->connectThreadResult = SCE_NET_ADHOC_ERROR_CONNECTION_REFUSED; ERROR_LOG(Log::sceNet, "%s: failed connecting to ptp socket, %d", __func__, state); - internal->connect_thread_done = true; + internal->connectThreadDone = true; return; } - internal->postoffice_handle = ptp_socket; - internal->connect_thread_result = 0; - INFO_LOG(Log::sceNet, "%s: connected ptp socket with id %d %p", __func__, idx + 1, internal->postoffice_handle); - internal->connect_thread_done = true; + internal->postofficeHandle = ptp_socket; + internal->connectThreadResult = 0; + INFO_LOG(Log::sceNet, "%s: connected ptp socket with id %d %p", __func__, idx + 1, internal->postofficeHandle); + internal->connectThreadDone = true; return; });; @@ -1180,13 +1180,13 @@ int DoBlockingPtpConnect(AdhocSocketRequest& req, s64& result, AdhocSendTargets& sin.sin_addr.s_addr = targetPeer.peers[0].ip; sin.sin_port = htons(ptpsocket.pport + targetPeer.peers[0].portOffset); - if (g_Config.bServerHasRelay){ + if (g_Config.bServerHasRelay) { ret = ptp_connect_postoffice(req.id - 1, __func__); - if (ret != 0){ + if (ret != 0) { ret = SOCKET_ERROR; sockerr = EAGAIN; } - }else{ + } else { ret = connect(ptpsocket.id, (struct sockaddr*)&sin, sizeof(sin)); sockerr = socket_errno; } @@ -1198,20 +1198,20 @@ int DoBlockingPtpConnect(AdhocSocketRequest& req, s64& result, AdhocSendTargets& // Check the connection state (assuming "connect" has been called before and is in-progress) // Note: On Linux "select" can return > 0 (with SO_ERROR = 0) even when the connection is not accepted yet, thus need "getpeername" to ensure else { - if (g_Config.bServerHasRelay){ - if (sock->postoffice_handle == NULL){ + if (g_Config.bServerHasRelay) { + if (sock->postofficeHandle == NULL) { ret = SOCKET_ERROR; - if (sock->connect_thread_done && sock->connect_thread_result == SCE_NET_ADHOC_ERROR_CONNECTION_REFUSED){ + if (sock->connectThreadDone && sock->connectThreadResult == SCE_NET_ADHOC_ERROR_CONNECTION_REFUSED){ sockerr = ECONNREFUSED; - }else{ + } else { sockerr = EAGAIN; } - }else{ + } else { // the handle is there, we're ready to go ret = 1; sockerr = 0; } - }else{ + } else { ret = IsSocketReady(ptpsocket.id, false, true, &sockerr); } DEBUG_LOG(Log::sceNet, "sceNetAdhocPtpConnect[%i:%u]: Select(%i) = %i, error = %i", req.id, ptpsocket.lport, ptpsocket.id, ret, sockerr); @@ -1699,28 +1699,30 @@ int sceNetAdhocctlGetState(u32 ptrToStatus) { return hleLogVerbose(Log::sceNet, 0, "state = %d", state); } -static int pdp_create_postoffice(const SceNetEtherAddr *saddr, int sport, int bufsize){ +static int pdp_create_postoffice(const SceNetEtherAddr *saddr, int sport, int bufsize) { AdhocSocket *internal = (AdhocSocket*)malloc(sizeof(AdhocSocket)); - if (internal == NULL){ + if (internal == NULL) { return hleLogDebug(Log::sceNet, ERROR_NET_NO_SPACE, "net no space"); } internal->type = SOCK_PDP; - internal->postoffice_handle = NULL; + internal->postofficeHandle = NULL; internal->data.pdp.laddr = *saddr; internal->data.pdp.lport = sport; internal->data.pdp.rcv_sb_cc = bufsize; internal->flags = 0; + internal->lastAttempt = 0; + internal->internalLastAttempt = 0; AdhocSocket **free_slot = NULL; int i; - for(i = 0;i < MAX_SOCKET; i++){ - if(adhocSockets[i] == NULL){ + for (i = 0; i < MAX_SOCKET; i++) { + if (adhocSockets[i] == NULL) { free_slot = &adhocSockets[i]; break; } } - if (free_slot == NULL){ + if (free_slot == NULL) { free(internal); return ERROR_NET_NO_SPACE; } @@ -1729,7 +1731,7 @@ static int pdp_create_postoffice(const SceNetEtherAddr *saddr, int sport, int bu *free_slot = internal; pdp_postoffice_recover(i); - INFO_LOG(Log::sceNet, "%s: created pdp socket with id %d %p", __func__, i + 1, internal->postoffice_handle); + INFO_LOG(Log::sceNet, "%s: created pdp socket with id %d %p", __func__, i + 1, internal->postofficeHandle); return i + 1; } @@ -2010,15 +2012,15 @@ int sceNetAdhocPdpSend(int id, const char *mac, u32 port, void *data, int len, i // Send Data. UDP are guaranteed to be sent as a whole or nothing(failed if len > SO_MAX_MSG_SIZE), and never be partially sent/recv int sent = 0; int error = 0; - if (g_Config.bServerHasRelay){ + if (g_Config.bServerHasRelay) { sent = pdp_send_postoffice(id - 1, daddr, dport, data, len); - if (sent == 0){ + if (sent == 0) { sent = len; - }else{ + } else { sent = SOCKET_ERROR; error = EAGAIN; } - }else{ + } else { sent = sendto(pdpsocket.id, (const char *)data, len, MSG_NOSIGNAL, (struct sockaddr*)&target, sizeof(target)); error = socket_errno; } @@ -2123,15 +2125,15 @@ int sceNetAdhocPdpSend(int id, const char *mac, u32 port, void *data, int len, i int sent = 0; int error = 0; - if (g_Config.bServerHasRelay){ + if (g_Config.bServerHasRelay) { sent = pdp_send_postoffice(id - 1, &peer.mac, dport, data, len); if (sent == 0){ sent = len; - }else{ + } else { sent = SOCKET_ERROR; error = EAGAIN; } - }else{ + } else { sent = sendto(pdpsocket.id, (const char *)data, len, MSG_NOSIGNAL, (struct sockaddr*)&target, sizeof(target)); error = socket_errno; } @@ -2260,22 +2262,22 @@ int sceNetAdhocPdpRecv(int id, void *addr, void * port, void *buf, void *dataLen int received = 0; int error; - if (g_Config.bServerHasRelay){ - while(1){ + if (g_Config.bServerHasRelay) { + while(1) { int next_size = pdp_peek_next_size_postoffice(id - 1); - if (next_size == 0){ + if (next_size == 0) { // no next packet received = SOCKET_ERROR; error = EAGAIN; break; } - if (next_size > *len){ + if (next_size > *len) { // next is larger than current buffer return SCE_NET_ADHOC_ERROR_NOT_ENOUGH_SPACE; } uint16_t recv_port; received = pdp_recv_postoffice(id - 1, saddr, sport, buf, len); - if (received == 0){ + if (received == 0) { // we got data hleEatMicro(50); return 0; @@ -2284,7 +2286,7 @@ int sceNetAdhocPdpRecv(int id, void *addr, void * port, void *buf, void *dataLen error = EAGAIN; break; } - }else{ + } else { int disCnt = 16; while (--disCnt > 0) { @@ -2344,7 +2346,7 @@ int sceNetAdhocPdpRecv(int id, void *addr, void * port, void *buf, void *dataLen return hleLogVerbose(Log::sceNet, SCE_NET_ADHOC_ERROR_NOT_ENOUGH_SPACE, "not enough space"); } - if (!g_Config.bServerHasRelay){ + if (!g_Config.bServerHasRelay) { sinlen = sizeof(sin); memset(&sin, 0, sinlen); // On Windows: Socket Error 10014 may happen when buffer size is less than the minimum allowed/required (ie. negative number on Vulcanus Seek and Destroy), the address is not a valid part of the user address space (ie. on the stack or when buffer overflow occurred), or the address is not properly aligned (ie. multiple of 4 on 32bit and multiple of 8 on 64bit) https://stackoverflow.com/questions/861154/winsock-error-code-10014 @@ -2451,21 +2453,21 @@ int sceNetAdhocSetSocketAlert(int id, int flag) { return hleDelayResult(hleLogDebug(Log::sceNet, retval), "set socket alert delay", 1000); } -static int get_postoffice_fd(int idx){ +static int get_postoffice_fd(int idx) { AdhocSocket *internal = adhocSockets[idx]; - if (internal->type == SOCK_PTP){ - if (internal->data.ptp.state == ADHOC_PTP_STATE_LISTEN){ + if (internal->type == SOCK_PTP) { + if (internal->data.ptp.state == ADHOC_PTP_STATE_LISTEN) { void *socket = ptp_listen_postoffice_recover(idx); - if (socket != NULL){ + if (socket != NULL) { return ptp_listen_get_native_sock(socket); } - }else if (internal->data.ptp.state == ADHOC_PTP_STATE_ESTABLISHED){ - void *socket = internal->postoffice_handle; - if (socket != NULL){ + } else { + void *socket = internal->postofficeHandle; + if (socket != NULL) { return ptp_get_native_sock(socket); } } - }else{ + } else { void *socket = pdp_postoffice_recover(idx); if (socket != NULL){ return pdp_get_native_sock(socket); @@ -2492,11 +2494,11 @@ int PollAdhocSocket(SceNetAdhocPollSd* sds, int count, int timeout, int nonblock if (g_Config.bServerHasRelay) { int postoffice_fd = get_postoffice_fd(sds[i].id - 1); - if (postoffice_fd == -1){ + if (postoffice_fd == -1) { continue; } fd = postoffice_fd; - }else{ + } else { if (sock->type == SOCK_PTP) { fd = sock->data.ptp.id; } @@ -2523,11 +2525,11 @@ int PollAdhocSocket(SceNetAdhocPollSd* sds, int count, int timeout, int nonblock if (g_Config.bServerHasRelay) { int postoffice_fd = get_postoffice_fd(sds[i].id - 1); - if (postoffice_fd == -1){ + if (postoffice_fd == -1) { continue; } fd = postoffice_fd; - }else{ + } else { if (sock->type == SOCK_PTP) { fd = sock->data.ptp.id; } @@ -2664,10 +2666,10 @@ int sceNetAdhocPollSocket(u32 socketStructAddr, int count, int timeout, int nonb return hleLogDebug(Log::sceNet, SCE_NET_ADHOC_ERROR_NOT_INITIALIZED, "adhoc not initialized"); } -static int pdp_delete_postoffice(int idx){ +static int pdp_delete_postoffice(int idx) { AdhocSocket *internal = adhocSockets[idx]; - if (internal->postoffice_handle != NULL){ - pdp_delete(internal->postoffice_handle); + if (internal->postofficeHandle != NULL) { + pdp_delete(internal->postofficeHandle); } adhocSockets[idx] = NULL; free(internal); @@ -3585,11 +3587,11 @@ static int sceNetAdhocGetPdpStat(u32 structSize, u32 structAddr) { // It seems real PSP respecting the socket buffer size arg, so we may need to cap the value up to the buffer size arg since we use larger buffer, for PDP/UDP the total size must not contains partial/truncated message to avoid data loss. // TODO: We may need to manage PDP messages ourself by reading each msg 1-by-1 and moving it to our internal buffer(msg array) in order to calculate the correct messages size that can fit into buffer size when there are more than 1 messages in the recv buffer (simulate FIONREAD) if (g_Config.bServerHasRelay) { - void *postoffice_handle = pdp_postoffice_recover(j); - if (postoffice_handle != NULL){ - sock->data.pdp.rcv_sb_cc = pdp_peek_next_size(postoffice_handle); + void *postofficeHandle = pdp_postoffice_recover(j); + if (postofficeHandle != NULL) { + sock->data.pdp.rcv_sb_cc = pdp_peek_next_size(postofficeHandle); } - }else{ + } else { sock->data.pdp.rcv_sb_cc = getAvailToRecv(sock->data.pdp.id, sock->buffer_size); // There might be a possibility for the data to be taken by the OS, thus FIONREAD returns 0, but can be Received if (sock->data.pdp.rcv_sb_cc == 0) { @@ -3690,21 +3692,28 @@ static int sceNetAdhocGetPtpStat(u32 structSize, u32 structAddr) { // GvG Next Plus relies on GetPtpStat to determine if Connection has been Established or not, but should not be updated too long for GvG to work, and should not be updated too fast(need to be 1 frame after PollSocket checking for ADHOC_EV_CONNECT) for Bleach Heat the Soul 7 to work properly. if ((sock->data.ptp.state == ADHOC_PTP_STATE_SYN_SENT || sock->data.ptp.state == ADHOC_PTP_STATE_SYN_RCVD) && (static_cast(CoreTiming::GetGlobalTimeUsScaled() - sock->lastAttempt) > 33333/*sock->retry_interval*/)) { // FIXME: May be we should poll all of them together on a single poll call instead of each socket separately? - if (IsSocketReady(sock->data.ptp.id, true, true) > 0) { - struct sockaddr_in sin; - socklen_t sinlen = sizeof(sin); - memset(&sin, 0, sinlen); - // Ensure that the connection really established or not, since "select" alone can't accurately detects it - if (getpeername(sock->data.ptp.id, (struct sockaddr*)&sin, &sinlen) != SOCKET_ERROR) { + if (g_Config.bServerHasRelay) { + if (sock->postofficeHandle != NULL){ + // good to go sock->data.ptp.state = ADHOC_PTP_STATE_ESTABLISHED; } + } else { + if (IsSocketReady(sock->data.ptp.id, true, true) > 0) { + struct sockaddr_in sin; + socklen_t sinlen = sizeof(sin); + memset(&sin, 0, sinlen); + // Ensure that the connection really established or not, since "select" alone can't accurately detects it + if (getpeername(sock->data.ptp.id, (struct sockaddr*)&sin, &sinlen) != SOCKET_ERROR) { + sock->data.ptp.state = ADHOC_PTP_STATE_ESTABLISHED; + } + } } } if (g_Config.bServerHasRelay) { - if (sock->postoffice_handle != NULL){ - sock->data.ptp.rcv_sb_cc = ptp_peek_next_size(sock->postoffice_handle); - }else{ + if (sock->postofficeHandle != NULL) { + sock->data.ptp.rcv_sb_cc = ptp_peek_next_size(sock->postofficeHandle); + } else { sock->data.ptp.rcv_sb_cc = 0; } }else{ @@ -3848,10 +3857,10 @@ int RecreatePtpSocket(int ptpId) { return 0; } -static uint16_t get_random_unused_ptp_port(){ +static uint16_t get_random_unused_ptp_port() { uint16_t test_port = rand() % 65534 + 1; auto port_in_use = [&test_port] { - for (int i = 0; i < MAX_SOCKET; i++){ + for (int i = 0; i < MAX_SOCKET; i++) { if (adhocSockets[i] != NULL && adhocSockets[i]->type == SOCK_PTP && test_port == adhocSockets[i]->data.ptp.lport) @@ -3862,22 +3871,22 @@ static uint16_t get_random_unused_ptp_port(){ return false; }; - while(port_in_use()){ + while(port_in_use()) { test_port = rand() % 65534 + 1; } return test_port; } -static int ptp_open_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, const SceNetEtherAddr *daddr, uint16_t dport, uint32_t bufsize){ +static int ptp_open_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, const SceNetEtherAddr *daddr, uint16_t dport, uint32_t bufsize) { AdhocSocket *internal = (AdhocSocket *)malloc(sizeof(AdhocSocket)); - if (internal == NULL){ + if (internal == NULL) { ERROR_LOG(Log::sceNet, "%s: ran out of heap memory trying to open ptp socket", __func__); return ERROR_NET_NO_SPACE; } internal->type = SOCK_PTP; - internal->postoffice_handle = NULL; + internal->postofficeHandle = NULL; internal->data.ptp.state = ADHOC_PTP_STATE_CLOSED; internal->data.ptp.laddr = *saddr; internal->data.ptp.lport = sport == 0 ? get_random_unused_ptp_port() : sport; @@ -3886,19 +3895,21 @@ static int ptp_open_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, con internal->data.ptp.rcv_sb_cc = bufsize; internal->data.ptp.snd_sb_cc = 0; internal->flags = 0; - internal->connect_thread = NULL; - internal->connect_thread_done = true; + internal->connectThread = NULL; + internal->connectThreadDone = true; + internal->lastAttempt = 0; + internal->internalLastAttempt = 0; AdhocSocket **slot = NULL; int i; - for(i = 0;i < MAX_SOCKET;i++){ - if(adhocSockets[i] == NULL){ + for (i = 0; i < MAX_SOCKET; i++) { + if (adhocSockets[i] == NULL) { slot = &adhocSockets[i]; break; } } - if (slot == NULL){ + if (slot == NULL) { free(internal); ERROR_LOG(Log::sceNet, "%s: cannot find free socket mapper slot while opening ptp socket", __func__); return ERROR_NET_NO_SPACE; @@ -4267,15 +4278,15 @@ static int sceNetAdhocPtpAccept(int id, u32 peerMacAddrPtr, u32 peerPortPtr, int int error; int newsocket = 0; - if (g_Config.bServerHasRelay){ + if (g_Config.bServerHasRelay) { newsocket = ptp_accept_postoffice(id - 1, addr, port); - if (newsocket >= 0){ + if (newsocket >= 0) { return newsocket; - }else{ + } else { newsocket = SOCKET_ERROR; error = EAGAIN; } - }else{ + } else { // Check if listening socket is ready to accept newsocket = IsSocketReady(ptpsocket.id, true, false, &error); if (newsocket > 0) { @@ -4371,13 +4382,13 @@ int NetAdhocPtp_Connect(int id, int timeout, int flag, bool allowForcedConnect) // NOTE: Based on what i read at stackoverflow, The First Non-blocking POSIX connect will always returns EAGAIN/EWOULDBLOCK because it returns without waiting for ACK/handshake, But GvG Next Plus is treating non-blocking PtpConnect just like blocking connect, May be on a real PSP the first non-blocking sceNetAdhocPtpConnect can be successfull? int connectresult = 0; int errorcode = 0; - if (g_Config.bServerHasRelay){ + if (g_Config.bServerHasRelay) { connectresult = ptp_connect_postoffice(id - 1, __func__); - if (connectresult != 0){ + if (connectresult != 0) { connectresult = SOCKET_ERROR; errorcode = EAGAIN; } - }else{ + } else { connectresult = connect(ptpsocket.id, (struct sockaddr*)&sin, sizeof(sin)); errorcode = socket_errno; } @@ -4479,16 +4490,16 @@ static int ptp_close_postoffice(int idx){ AdhocSocket *internal = adhocSockets[idx]; // sync - if (internal->connect_thread != NULL){ - internal->connect_thread->join(); - delete internal->connect_thread; + if (internal->connectThread != NULL) { + internal->connectThread->join(); + delete internal->connectThread; } - void *socket = internal->postoffice_handle; - if (socket != NULL){ - if (internal->data.ptp.state == ADHOC_PTP_STATE_LISTEN){ + void *socket = internal->postofficeHandle; + if (socket != NULL) { + if (internal->data.ptp.state == ADHOC_PTP_STATE_LISTEN) { ptp_listen_close(socket); - }else{ + } else { ptp_close(socket); } } @@ -4555,15 +4566,15 @@ static int sceNetAdhocPtpClose(int id, int unknown) { return NetAdhocPtp_Close(id, unknown); } -static int ptp_listen_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, uint32_t bufsize){ +static int ptp_listen_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, uint32_t bufsize) { // server connect delegated to accept AdhocSocket *internal = (AdhocSocket *)malloc(sizeof(AdhocSocket)); - if (internal == NULL){ + if (internal == NULL) { ERROR_LOG(Log::sceNet, "%s: out of heap memory when creating ptp listen socket", __func__); return ERROR_NET_NO_SPACE; } - internal->postoffice_handle = NULL; + internal->postofficeHandle = NULL; internal->type = SOCK_PTP; internal->data.ptp.laddr = *saddr; internal->data.ptp.lport = sport; @@ -4571,18 +4582,20 @@ static int ptp_listen_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, u internal->data.ptp.rcv_sb_cc = bufsize; internal->data.ptp.snd_sb_cc = 0; internal->flags = 0; - internal->connect_thread = NULL; + internal->connectThread = NULL; + internal->lastAttempt = 0; + internal->internalLastAttempt = 0; AdhocSocket **slot = NULL; int i; - for(i = 0;i < MAX_SOCKET;i++){ - if (adhocSockets[i] == NULL){ + for (i = 0; i < MAX_SOCKET; i++) { + if (adhocSockets[i] == NULL) { slot = &adhocSockets[i]; break; } } - if (slot == NULL){ + if (slot == NULL) { ERROR_LOG(Log::sceNet, "%s: out of socket slots when creating adhoc ptp listen socket", __func__); free(internal); return ERROR_NET_NO_SPACE; @@ -4592,7 +4605,7 @@ static int ptp_listen_postoffice(const SceNetEtherAddr *saddr, uint16_t sport, u *slot = internal; ptp_listen_postoffice_recover(i); - INFO_LOG(Log::sceNet, "%s: created ptp listen socket with id %d %p", __func__, i + 1, internal->postoffice_handle); + INFO_LOG(Log::sceNet, "%s: created ptp listen socket with id %d %p", __func__, i + 1, internal->postofficeHandle); return i + 1; } @@ -4830,14 +4843,14 @@ static int sceNetAdhocPtpSend(int id, u32 dataAddr, u32 dataSizeAddr, int timeou // Send Data int sent = 0; int error = 0; - if (g_Config.bServerHasRelay){ + if (g_Config.bServerHasRelay) { sent = ptp_send_postoffice(id - 1, data, *len); - if (sent == 0){ + if (sent == 0) { // sent hleEatMicro(50); return 0; } - if (sent == SOCKET_ERROR){ + if (sent == SOCKET_ERROR) { ptpsocket.state = ADHOC_PTP_STATE_CLOSED; return SCE_NET_ADHOC_ERROR_DISCONNECTED; } @@ -4950,14 +4963,14 @@ static int sceNetAdhocPtpRecv(int id, u32 dataAddr, u32 dataSizeAddr, int timeou int received = 0; int error = 0; - if (g_Config.bServerHasRelay){ + if (g_Config.bServerHasRelay) { received = ptp_recv_postoffice(id - 1, buf, len); - if (received == 0){ + if (received == 0) { // we got data hleEatMicro(50); return 0; } - if (received == SOCKET_ERROR){ + if (received == SOCKET_ERROR) { // the socket died, let the game know ptpsocket.state = ADHOC_PTP_STATE_CLOSED; return SCE_NET_ADHOC_ERROR_DISCONNECTED; @@ -4965,7 +4978,7 @@ static int sceNetAdhocPtpRecv(int id, u32 dataAddr, u32 dataSizeAddr, int timeou // SCE_NET_ADHOC_ERROR_WOULD_BLOCK received = SOCKET_ERROR; error = EAGAIN; - }else{ + } else { // Receive Data. POSIX: May received 0 bytes when the remote peer already closed the connection. received = recv(ptpsocket.id, (char*)buf, std::max(0, *len), MSG_NOSIGNAL); error = socket_errno; From 748786e80cf97a903fb764093a26d7bb4fdd6ad0 Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Thu, 15 Jan 2026 21:40:16 +0100 Subject: [PATCH 06/10] update packet relay setting wording, enable relay by default --- Core/Config.cpp | 2 +- UI/GameSettingsScreen.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 3435281f08..88fc023b3d 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -1012,7 +1012,7 @@ static const ConfigSetting networkSettings[] = { ConfigSetting("EnableWlan", SETTING(g_Config, bEnableWlan), false, CfgFlag::PER_GAME), ConfigSetting("EnableAdhocServer", SETTING(g_Config, bEnableAdhocServer), false, CfgFlag::PER_GAME), ConfigSetting("proAdhocServer", SETTING(g_Config, proAdhocServer), "socom.cc", CfgFlag::PER_GAME), - ConfigSetting("ServerHasRelay", SETTING(g_Config, bServerHasRelay), false, CfgFlag::PER_GAME), + ConfigSetting("ServerHasRelay", SETTING(g_Config, bServerHasRelay), true, CfgFlag::PER_GAME), ConfigSetting("proAdhocServerList", SETTING(g_Config, proAdhocServerList), &defaultProAdhocServerList, CfgFlag::DEFAULT), ConfigSetting("PortOffset", SETTING(g_Config, iPortOffset), 10000, CfgFlag::PER_GAME), ConfigSetting("PrimaryDNSServer", SETTING(g_Config, sInfrastructureDNSServer), "67.222.156.250", CfgFlag::PER_GAME), diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 71b216ca03..8293a738f7 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1019,7 +1019,9 @@ void GameSettingsScreen::CreateNetworkingSettings(UI::ViewGroup *networkingSetti screenManager()->push(new HostnameSelectScreen(&g_Config.proAdhocServer, &g_Config.proAdhocServerList, n->T("proAdhocServer Address:"))); }); networkingSettings->Add(new SettingHint(n->T("Change proAdhocServer address hint"))); - networkingSettings->Add(new CheckBox(&g_Config.bServerHasRelay, n->T("PRO Adhoc Server provides packet relay", "PRO Adhoc Server provides packet relay")))->SetEnabled(!PSP_IsInited()); + networkingSettings->Add(new CheckBox(&g_Config.bServerHasRelay, n->T("PRO Adhoc packet relay available", "PRO Adhoc packet relay available")))->SetEnabled(!PSP_IsInited()); + networkingSettings->Add(new SettingHint(n->T("Available when PRO Adhoc server provides aemu_postoffice packet relay, such as socom.cc."))); + networkingSettings->Add(new SettingHint(n->T("Disable this if playing on LAN/VPN, see wiki for how you can setup your own packet relay."))); networkingSettings->Add(new ItemHeader(n->T("UPnP (port-forwarding)"))); networkingSettings->Add(new CheckBox(&g_Config.bEnableUPnP, n->T("Enable UPnP", "Enable UPnP (need a few seconds to detect)"))); auto useOriPort = networkingSettings->Add(new CheckBox(&g_Config.bUPnPUseOriginalPort, n->T("UPnP use original port", "UPnP use original port (Enabled = PSP compatibility)"))); From da1a843377b370c48e75dbb85738f6ca873936b1 Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Fri, 16 Jan 2026 11:35:51 +0100 Subject: [PATCH 07/10] cleanup port offet logic in relay mode --- Core/HLE/sceNetAdhoc.cpp | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 858917b995..9ed426e001 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -441,6 +441,21 @@ int StartGameModeScheduler() { return 0; } +static uint16_t offset_port_simple(uint16_t port) { + if (port == 0) { + return 0; + } + port += portOffset; + if (port == 0) { + return 65535; + } + return port; +} + +static uint16_t reverse_port_simple(uint16_t port) { + return port - portOffset; +} + static void *pdp_postoffice_recover(int idx) { AdhocSocket *internal = adhocSockets[idx]; if (internal->postofficeHandle != NULL) { @@ -457,7 +472,7 @@ static void *pdp_postoffice_recover(int idx) { getLocalMac(&local_mac); int state; - internal->postofficeHandle = pdp_create_v4(&addr, (const char *)&local_mac, internal->data.pdp.lport + portOffset, &state); + internal->postofficeHandle = pdp_create_v4(&addr, (const char *)&local_mac, offset_port_simple(internal->data.pdp.lport), &state); if (state != AEMU_POSTOFFICE_CLIENT_OK) { ERROR_LOG(Log::sceNet, "%s: failed creating pdp socket on aemu postoffice library, %d", __func__, state); } @@ -515,7 +530,7 @@ static int pdp_recv_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *sport, if (saddr != NULL) { *saddr = saddr_copy; } - *sport = sport_copy - portOffset; + *sport = reverse_port_simple(sport_copy); return 0; } @@ -678,7 +693,7 @@ static int pdp_send_postoffice(int idx, const SceNetEtherAddr *daddr, uint16_t d return SOCKET_ERROR; } - int pdp_send_status = pdp_send(pdp_sock, (const char *)daddr, dport + portOffset, (char *)data, len, true); + int pdp_send_status = pdp_send(pdp_sock, (const char *)daddr, offset_port_simple(dport), (char *)data, len, true); if (pdp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD) { pdp_delete(internal->postofficeHandle); internal->postofficeHandle = NULL; @@ -1045,7 +1060,7 @@ static int ptp_accept_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *spor *saddr = mac_cpy; } if (sport != NULL) { - *sport = port_cpy - portOffset; + *sport = reverse_port_simple(port_cpy); } INFO_LOG(Log::sceNet, "%s: accepted ptp socket with id %d %p", __func__, i + 1, internal->postofficeHandle); @@ -1136,7 +1151,7 @@ static int ptp_connect_postoffice(int idx, const char *caller) { internal->connectThread = new std::thread([internal, addr, idx] { int state; - void *ptp_socket = ptp_connect_v4(&addr, (const char *)&internal->data.ptp.laddr, internal->data.ptp.lport + portOffset, (const char *)&internal->data.ptp.paddr, internal->data.ptp.pport + portOffset, &state); + void *ptp_socket = ptp_connect_v4(&addr, (const char *)&internal->data.ptp.laddr, offset_port_simple(internal->data.ptp.lport), (const char *)&internal->data.ptp.paddr, offset_port_simple(internal->data.ptp.pport), &state); if (ptp_socket == NULL) { internal->connectThreadResult = SCE_NET_ADHOC_ERROR_CONNECTION_REFUSED; ERROR_LOG(Log::sceNet, "%s: failed connecting to ptp socket, %d", __func__, state); From 6684f032db4e9df75125a78beec3a380d3f60e8a Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Fri, 16 Jan 2026 11:48:25 +0100 Subject: [PATCH 08/10] null check sport in pdp_recv_postoffice --- Core/HLE/sceNetAdhoc.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 9ed426e001..9c92a249e4 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -530,7 +530,9 @@ static int pdp_recv_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *sport, if (saddr != NULL) { *saddr = saddr_copy; } - *sport = reverse_port_simple(sport_copy); + if (sport != NULL) { + *sport = reverse_port_simple(sport_copy); + } return 0; } From 5aa266934b5f99dfe47dda2229d1998fd37e82f3 Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Mon, 19 Jan 2026 20:49:57 +0100 Subject: [PATCH 09/10] import aemu_postoffice as a submodule instead --- .gitmodules | 4 + CMakeLists.txt | 15 +- Core/Core.vcxproj | 5 +- Core/Core.vcxproj.filters | 7 +- UWP/CoreUWP/CoreUWP.vcxproj | 9 +- UWP/CoreUWP/CoreUWP.vcxproj.filters | 5 +- android/jni/Android.mk | 5 +- ext/aemu_postoffice | 1 + ext/aemu_postoffice/aemu_postoffice_packets.h | 49 -- ext/aemu_postoffice/client/delay_impl_linux.c | 9 - .../client/delay_impl_windows.c | 5 - ext/aemu_postoffice/client/log_linux.h | 11 - ext/aemu_postoffice/client/log_windows.h | 11 - ext/aemu_postoffice/client/mutex_impl_linux.c | 12 - ext/aemu_postoffice/client/mutex_impl_linux.h | 10 - .../client/mutex_impl_windows.c | 23 - .../client/mutex_impl_windows.h | 10 - ext/aemu_postoffice/client/postoffice.c | 827 ------------------ .../client/postoffice_client.h | 69 -- ext/aemu_postoffice/client/sock_impl_linux.c | 128 --- ext/aemu_postoffice/client/sock_impl_linux.h | 22 - .../client/sock_impl_windows.c | 137 --- .../client/sock_impl_windows.h | 24 - ext/aemu_postoffice/gpl-3.0.txt | 674 -------------- ext/aemu_postoffice/upstream.txt | 1 - libretro/Makefile.common | 14 +- 26 files changed, 38 insertions(+), 2049 deletions(-) create mode 160000 ext/aemu_postoffice delete mode 100644 ext/aemu_postoffice/aemu_postoffice_packets.h delete mode 100644 ext/aemu_postoffice/client/delay_impl_linux.c delete mode 100644 ext/aemu_postoffice/client/delay_impl_windows.c delete mode 100644 ext/aemu_postoffice/client/log_linux.h delete mode 100644 ext/aemu_postoffice/client/log_windows.h delete mode 100644 ext/aemu_postoffice/client/mutex_impl_linux.c delete mode 100644 ext/aemu_postoffice/client/mutex_impl_linux.h delete mode 100644 ext/aemu_postoffice/client/mutex_impl_windows.c delete mode 100644 ext/aemu_postoffice/client/mutex_impl_windows.h delete mode 100644 ext/aemu_postoffice/client/postoffice.c delete mode 100644 ext/aemu_postoffice/client/postoffice_client.h delete mode 100644 ext/aemu_postoffice/client/sock_impl_linux.c delete mode 100644 ext/aemu_postoffice/client/sock_impl_linux.h delete mode 100644 ext/aemu_postoffice/client/sock_impl_windows.c delete mode 100644 ext/aemu_postoffice/client/sock_impl_windows.h delete mode 100644 ext/aemu_postoffice/gpl-3.0.txt delete mode 100644 ext/aemu_postoffice/upstream.txt diff --git a/.gitmodules b/.gitmodules index 878704d5ea..96853b36cb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -65,3 +65,7 @@ [submodule "ext/nanosvg"] path = ext/nanosvg url = https://github.com/hrydgard/nanosvg.git +[submodule "ext/aemu_postoffice"] + path = ext/aemu_postoffice + url = https://github.com/Kethen/aemu_postoffice.git + branch = ppsspp diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a83cf0fc5..6025a2df60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2082,20 +2082,23 @@ set(GPU_SOURCES GPU/Software/TransformUnit.h ) +set(aemu_postoffice + ext/aemu_postoffice/client/postoffice.c + ext/aemu_postoffice/client/mutex_impl_cpp.cpp + ext/aemu_postoffice/client/delay_impl_cpp.cpp + ext/aemu_postoffice/client/log_impl_ppsspp.cpp +) + if(WIN32) set(aemu_postoffice - ext/aemu_postoffice/client/postoffice.c - ext/aemu_postoffice/client/delay_impl_windows.c - ext/aemu_postoffice/client/mutex_impl_windows.c + ${aemu_postoffice} ext/aemu_postoffice/client/sock_impl_windows.c ) endif() if(LINUX OR ANDROID OR MACOSX OR IOS) set(aemu_postoffice - ext/aemu_postoffice/client/postoffice.c - ext/aemu_postoffice/client/delay_impl_linux.c - ext/aemu_postoffice/client/mutex_impl_linux.c + ${aemu_postoffice} ext/aemu_postoffice/client/sock_impl_linux.c ) endif() diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 4cce638c08..73e5e14150 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -641,9 +641,10 @@ - + - + + diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index aa1b8cc80a..7a360e2b38 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -532,13 +532,16 @@ HLE\Libraries - + HLE\Libraries HLE\Libraries - + + HLE\Libraries + + HLE\Libraries diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj index 7e3f7db365..569f1f6363 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj +++ b/UWP/CoreUWP/CoreUWP.vcxproj @@ -489,15 +489,12 @@ NotUsing - - NotUsing - + NotUsing - - NotUsing - + + diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters index 47191cd3b0..3d29c2cad2 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj.filters +++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters @@ -130,9 +130,10 @@ - + - + + diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 3643aaee1b..e5292feaa5 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -716,8 +716,9 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Core/HLE/sceNetAdhoc.cpp \ $(SRC)/ext/aemu_postoffice/client/postoffice.c \ $(SRC)/ext/aemu_postoffice/client/sock_impl_linux.c \ - $(SRC)/ext/aemu_postoffice/client/mutex_impl_linux.c \ - $(SRC)/ext/aemu_postoffice/client/delay_impl_linux.c \ + $(SRC)/ext/aemu_postoffice/client/mutex_impl_cpp.cpp \ + $(SRC)/ext/aemu_postoffice/client/delay_impl_cpp.cpp \ + $(SRC)/ext/aemu_postoffice/client/log_impl_ppsspp.cpp \ $(SRC)/Core/HLE/sceNetAdhocMatching.cpp \ $(SRC)/Core/HLE/sceNetApctl.cpp \ $(SRC)/Core/HLE/sceNetInet.cpp \ diff --git a/ext/aemu_postoffice b/ext/aemu_postoffice new file mode 160000 index 0000000000..098039af82 --- /dev/null +++ b/ext/aemu_postoffice @@ -0,0 +1 @@ +Subproject commit 098039af82636fa8c5ce10f227aa340e23c77251 diff --git a/ext/aemu_postoffice/aemu_postoffice_packets.h b/ext/aemu_postoffice/aemu_postoffice_packets.h deleted file mode 100644 index 0b5a607fa8..0000000000 --- a/ext/aemu_postoffice/aemu_postoffice_packets.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef __AEMU_POSTOFFICE_PACKETS_H -#define __AEMU_POSTOFFICE_PACKETS_H - -#include - -// structs here are gcc little endian - -typedef enum{ - AEMU_POSTOFFICE_INIT_PDP, - AEMU_POSTOFFICE_INIT_PTP_LISTEN, - AEMU_POSTOFFICE_INIT_PTP_CONNECT, - AEMU_POSTOFFICE_INIT_PTP_ACCEPT -} aemu_postoffice_init_type; - -#pragma pack(push, 1) - -// client -> server -typedef struct aemu_postoffice_init{ - int32_t init_type; - // 2 bytes on padding on the end, only 6 bytes are used - char src_addr[8]; - uint16_t sport; - // 2 bytes on padding on the end - char dst_addr[8]; - uint16_t dport; -} aemu_postoffice_init; - -// client <-> server -typedef struct aemu_postoffice_pdp{ - // 2 bytes on padding on the end - char addr[8]; - uint16_t port; - uint32_t size; -} aemu_postoffice_pdp; - -// server -> client -typedef struct aemu_postoffice_ptp_connect{ - // 2 bytes on padding on the end - char addr[8]; - uint16_t port; -} aemu_postoffice_ptp_connect; - -typedef struct aemu_postoffice_ptp_data{ - uint32_t size; -} aemu_postoffice_ptp_data; - -#pragma pack(pop) - -#endif diff --git a/ext/aemu_postoffice/client/delay_impl_linux.c b/ext/aemu_postoffice/client/delay_impl_linux.c deleted file mode 100644 index 98705b6ed1..0000000000 --- a/ext/aemu_postoffice/client/delay_impl_linux.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -void delay(int ms){ - const struct timespec duration = { - .tv_sec = 0, - .tv_nsec = ms * 1000000, - }; - nanosleep(&duration, NULL); -} diff --git a/ext/aemu_postoffice/client/delay_impl_windows.c b/ext/aemu_postoffice/client/delay_impl_windows.c deleted file mode 100644 index 39d0239fdb..0000000000 --- a/ext/aemu_postoffice/client/delay_impl_windows.c +++ /dev/null @@ -1,5 +0,0 @@ -#include - -void delay(int ms){ - Sleep(ms); -} diff --git a/ext/aemu_postoffice/client/log_linux.h b/ext/aemu_postoffice/client/log_linux.h deleted file mode 100644 index 293e305f90..0000000000 --- a/ext/aemu_postoffice/client/log_linux.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef __LOG_LINUX_H -#define __LOG_LINUX_H - -#include - -#define LOG(...) { \ - fprintf(stderr, __VA_ARGS__); \ - fflush(stderr); \ -} - -#endif diff --git a/ext/aemu_postoffice/client/log_windows.h b/ext/aemu_postoffice/client/log_windows.h deleted file mode 100644 index 09f75bcbbe..0000000000 --- a/ext/aemu_postoffice/client/log_windows.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef __LOG_WINDOWS_H -#define __LOG_WINDOWS_H - -#include - -#define LOG(...) { \ - fprintf(stderr, __VA_ARGS__); \ - fflush(stderr); \ -} - -#endif diff --git a/ext/aemu_postoffice/client/mutex_impl_linux.c b/ext/aemu_postoffice/client/mutex_impl_linux.c deleted file mode 100644 index 49cc164a59..0000000000 --- a/ext/aemu_postoffice/client/mutex_impl_linux.c +++ /dev/null @@ -1,12 +0,0 @@ -#include - -static pthread_mutex_t sock_alloc_mutex; -void init_sock_alloc_mutex(){ - pthread_mutex_init(&sock_alloc_mutex, NULL); -} -void lock_sock_alloc_mutex(){ - pthread_mutex_lock(&sock_alloc_mutex); -} -void unlock_sock_alloc_mutex(){ - pthread_mutex_unlock(&sock_alloc_mutex); -} diff --git a/ext/aemu_postoffice/client/mutex_impl_linux.h b/ext/aemu_postoffice/client/mutex_impl_linux.h deleted file mode 100644 index d21ebd73f5..0000000000 --- a/ext/aemu_postoffice/client/mutex_impl_linux.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __MUTEX_IMPL_LINUX_H -#define __MUTEX_IMPL_LINUX_H - -void init_sock_alloc_mutex(); -void lock_sock_alloc_mutex(); -void unlock_sock_alloc_mutex(); - -void delay(int ms); - -#endif diff --git a/ext/aemu_postoffice/client/mutex_impl_windows.c b/ext/aemu_postoffice/client/mutex_impl_windows.c deleted file mode 100644 index 9f231c0cd7..0000000000 --- a/ext/aemu_postoffice/client/mutex_impl_windows.c +++ /dev/null @@ -1,23 +0,0 @@ -#include -#include "log_windows.h" - -static HANDLE sock_alloc_mutex = NULL; - -void init_sock_alloc_mutex(){ - sock_alloc_mutex = CreateMutex(NULL, FALSE, NULL); - if (sock_alloc_mutex == NULL){ - LOG("%s: failed creating mutex, 0x%x\n", __func__, GetLastError()); - } -} - -void lock_sock_alloc_mutex(){ - if (sock_alloc_mutex != NULL){ - WaitForSingleObject(sock_alloc_mutex, INFINITE); - } -} - -void unlock_sock_alloc_mutex(){ - if (sock_alloc_mutex != NULL){ - ReleaseMutex(sock_alloc_mutex); - } -} diff --git a/ext/aemu_postoffice/client/mutex_impl_windows.h b/ext/aemu_postoffice/client/mutex_impl_windows.h deleted file mode 100644 index bf7632ce6e..0000000000 --- a/ext/aemu_postoffice/client/mutex_impl_windows.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __MUTEX_IMPL_WINDOWS_H -#define __MUTEX_IMPL_WINDOWS_H - -void init_sock_alloc_mutex(); -void lock_sock_alloc_mutex(); -void unlock_sock_alloc_mutex(); - -void delay(int ms); - -#endif diff --git a/ext/aemu_postoffice/client/postoffice.c b/ext/aemu_postoffice/client/postoffice.c deleted file mode 100644 index eeec52b97b..0000000000 --- a/ext/aemu_postoffice/client/postoffice.c +++ /dev/null @@ -1,827 +0,0 @@ -#include -#include -#include - -#include "postoffice_client.h" - -#if defined(__unix) || defined(__APPLE__) -#include "log_linux.h" -#include "sock_impl_linux.h" -#include "mutex_impl_linux.h" -#endif - -#ifdef __PSP__ -#include "log_psp.h" -#include "sock_impl_psp.h" -#include "mutex_impl_psp.h" -#endif - -#ifdef _WIN32 -#include "log_windows.h" -#include "sock_impl_windows.h" -#include "mutex_impl_windows.h" -#endif - -#include "../aemu_postoffice_packets.h" - -struct pdp_session{ - char *pdp_mac[6]; - int16_t pdp_port; - int sock; - bool dead; - bool abort; - char recv_buf[2048]; - bool recving; - bool sending; -}; - -struct ptp_listen_session{ - char *ptp_mac[6]; - int16_t ptp_port; - int sock; - bool dead; - bool abort; - char addr[sizeof(native_sock6_addr) > sizeof(native_sock_addr) ? sizeof(native_sock6_addr) : sizeof(native_sock_addr)]; - int addrlen; - bool accepting; -}; - -struct ptp_session{ - int sock; - bool dead; - bool abort; - char recv_buf[50 * 1024]; - int outstanding_data_size; - int outstanding_data_offset; - bool recving; - bool sending; -}; - -// wonder if games will actually use more than this -// we pre-allocate so that we don't have to use heap, it's kinda big, TODO test if it's too big on a psp, in theory we have plenty on slims -struct pdp_session pdp_sessions[32]; -struct ptp_listen_session ptp_listen_sessions[sizeof(pdp_sessions) / sizeof(pdp_sessions[0])]; -struct ptp_session ptp_sessions[sizeof(pdp_sessions) / sizeof(pdp_sessions[0])]; - -int aemu_post_office_init(){ - static bool first_run = true; - if (first_run){ - first_run = false; - for (int i = 0;i < sizeof(pdp_sessions) / sizeof(pdp_sessions[0]);i++){ - pdp_sessions[i].sock = -1; - ptp_listen_sessions[i].sock = -1; - ptp_sessions[i].sock = -1; - } - init_sock_alloc_mutex(); - }else{ - // re-run, close all opened sessions - for (int i = 0;i < sizeof(pdp_sessions) / sizeof(pdp_sessions[0]);i++){ - if (pdp_sessions[i].sock != -1){ - pdp_delete(&pdp_sessions[i]); - } - if (ptp_listen_sessions[i].sock != -1){ - ptp_listen_close(&ptp_listen_sessions[i]); - } - if (ptp_sessions[i].sock != -1){ - ptp_close(&ptp_sessions[i]); - } - } - } - return 0; -} - -static int create_and_init_socket(void *addr, int addrlen, const char *init_packet, int init_packet_len, const char *caller_name){ - int sock = native_connect_tcp_sock(addr, addrlen); - if (sock < 0){ - LOG("%s: tcp connection failed\n", caller_name); - return sock; - } - - bool abort = false; - int write_status = native_send_till_done(sock, (char *)init_packet, init_packet_len, false, &abort); - if (write_status == -1){ - LOG("%s: failed sending init packet\n", caller_name); - native_close_tcp_sock(sock); - return AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; - } - - return sock; -} - -static void *pdp_create(void *addr, int addrlen, const char *pdp_mac, int pdp_port, int *state){ - struct pdp_session* session = NULL; - lock_sock_alloc_mutex(); - for(int i = 0;i < sizeof(pdp_sessions) / sizeof(pdp_sessions[0]);i++){ - if (pdp_sessions[i].sock == -1){ - session = &pdp_sessions[i]; - session->sock = 0; - break; - } - } - unlock_sock_alloc_mutex(); - if (session == NULL){ - LOG("%s: failed allocating memory for pdp session\n", __func__); - *state = AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; - return NULL; - } - - // Prepare init packet - struct aemu_postoffice_init init_packet = {0}; - init_packet.init_type = AEMU_POSTOFFICE_INIT_PDP; - memcpy(init_packet.src_addr, pdp_mac, 6); - init_packet.sport = pdp_port; - - int sock = create_and_init_socket(addr, addrlen, (char *)&init_packet, sizeof(init_packet), __func__); - - if (sock < 0){ - *state = sock; - session->sock = -1; - return NULL; - } - - memcpy(session->pdp_mac, pdp_mac, 6); - session->pdp_port = pdp_port; - session->sock = sock; - session->dead = false; - session->abort = false; - session->recving = false; - session->sending = false; - - *state = AEMU_POSTOFFICE_CLIENT_OK; - return session; -} - -void *pdp_create_v6(const struct aemu_post_office_sock6_addr *addr, const char *pdp_mac, int pdp_port, int *state){ - native_sock6_addr native_addr; - to_native_sock6_addr(&native_addr, addr); - - return pdp_create(&native_addr, sizeof(native_addr), pdp_mac, pdp_port, state); -} - -void *pdp_create_v4(const struct aemu_post_office_sock_addr *addr, const char *pdp_mac, int pdp_port, int *state){ - native_sock_addr native_addr; - to_native_sock_addr(&native_addr, addr); - - return pdp_create(&native_addr, sizeof(native_addr), pdp_mac, pdp_port, state); -} - -int pdp_send(void *pdp_handle, const char *pdp_mac, int pdp_port, const char *buf, int len, bool non_block){ - if (pdp_handle == NULL){ - return -1; - } - struct pdp_session *session = (struct pdp_session *)pdp_handle; - if (session->dead || session->abort){ - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (len > sizeof(session->recv_buf)){ - LOG("%s: failed sending data, data too big, %d\n", __func__, len); - return AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; - } - - // Write header - struct aemu_postoffice_pdp pdp_header = { - .port = pdp_port, - .size = len - }; - memcpy(pdp_header.addr, pdp_mac, 6); - - session->sending = true; - int send_status = native_send_till_done(session->sock, (char *)&pdp_header, sizeof(pdp_header), non_block, &session->abort); - session->sending = false; - if (send_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ - return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; - } - if (send_status == NATIVE_SOCK_ABORTED){ - // getting aborted - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (send_status < 0){ - // Error - LOG("%s: failed sending header\n", __func__); - session->dead = true; - native_close_tcp_sock(session->sock); - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - session->sending = true; - send_status = native_send_till_done(session->sock, buf, len, false, &session->abort); - session->sending = false; - if (send_status == NATIVE_SOCK_ABORTED){ - // getting aborted - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (send_status < 0){ - // Error - LOG("%s: failed sending data\n", __func__); - session->dead = true; - native_close_tcp_sock(session->sock); - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - return AEMU_POSTOFFICE_CLIENT_OK; -} - -int pdp_recv(void *pdp_handle, char *pdp_mac, int *pdp_port, char *buf, int *len, bool non_block){ - if (pdp_handle == NULL){ - return -1; - } - struct pdp_session *session = (struct pdp_session *)pdp_handle; - if (session->dead || session->abort){ - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (*len > 2048){ - return AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; - } - - struct aemu_postoffice_pdp pdp_header; - session->recving = true; - int recv_status = native_recv_till_done(session->sock, (char *)&pdp_header, sizeof(pdp_header), non_block, &session->abort); - session->recving = false; - if (recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ - return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; - } - if (recv_status == NATIVE_SOCK_ABORTED){ - // getting aborted - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (recv_status == 0){ - LOG("%s: remote closed the socket\n", __func__); - native_close_tcp_sock(session->sock); - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (recv_status == -1){ - LOG("%s: failed receiving data\n", __func__); - native_close_tcp_sock(session->sock); - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - // We have a header - if (pdp_header.size > sizeof(session->recv_buf)){ - // The other side is sending packets that are too big - LOG("%s: failed receiving data, data too big %d\n", __func__, pdp_header.size); - native_close_tcp_sock(session->sock); - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (pdp_mac != NULL) - memcpy(pdp_mac, pdp_header.addr, 6); - if (pdp_port != NULL) - *pdp_port = pdp_header.port; - - session->recving = true; - recv_status = native_recv_till_done(session->sock, session->recv_buf, pdp_header.size, false, &session->abort); - session->recving = false; - if (recv_status == NATIVE_SOCK_ABORTED){ - // getting aborted - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (recv_status == 0){ - LOG("%s: remote closed the socket\n", __func__); - native_close_tcp_sock(session->sock); - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (recv_status == -1){ - LOG("%s: failed receiving data\n", __func__); - native_close_tcp_sock(session->sock); - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - // We have data - memcpy(buf, session->recv_buf, *len); - if (pdp_header.size > *len){ - return AEMU_POSTOFFICE_CLIENT_SESSION_DATA_TRUNC; - } - *len = pdp_header.size; - return AEMU_POSTOFFICE_CLIENT_OK; -} - -void pdp_delete(void *pdp_handle){ - if (pdp_handle == NULL){ - return; - } - struct pdp_session *session = (struct pdp_session *)pdp_handle; - - // abort on-going ops - session->abort = true; - - // make sure we are clear of send/recv operations - do{ - delay(50); - }while(session->sending || session->recving); - - if (!session->dead) - native_close_tcp_sock(session->sock); - session->sock = -1; -} - -int pdp_peek_next_size(void *pdp_handle){ - struct pdp_session *session = pdp_handle; - - if (session->dead || session->abort){ - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - aemu_postoffice_pdp header = {0}; - session->recving = true; - int peek_result = native_peek(session->sock, (char *)&header, sizeof(header)); - session->recving = false; - if (peek_result == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ - return 0; - } - if (session->abort){ - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (peek_result <= 0){ - session->dead = true; - native_close_tcp_sock(session->sock); - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (peek_result != sizeof(header)){ - return 0; - } - - return header.size; -} - -static void *ptp_listen(void *addr, int addrlen, const char *ptp_mac, int ptp_port, int *state){ - struct ptp_listen_session* session = NULL; - lock_sock_alloc_mutex(); - for(int i = 0;i < sizeof(ptp_listen_sessions) / sizeof(ptp_listen_sessions[0]);i++){ - if (ptp_listen_sessions[i].sock == -1){ - session = &ptp_listen_sessions[i]; - session->sock = 0; - break; - } - } - unlock_sock_alloc_mutex(); - if (session == NULL){ - LOG("%s: failed allocating memory for ptp listen session\n", __func__); - *state = AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; - return NULL; - } - - // Prepare init packet - struct aemu_postoffice_init init_packet = {0}; - init_packet.init_type = AEMU_POSTOFFICE_INIT_PTP_LISTEN; - memcpy(init_packet.src_addr, ptp_mac, 6); - init_packet.sport = ptp_port; - - int sock = create_and_init_socket(addr, addrlen, (char *)&init_packet, sizeof(init_packet), __func__); - - if (sock < 0){ - *state = sock; - session->sock = -1; - return NULL; - } - - memcpy(session->ptp_mac, ptp_mac, 6); - session->ptp_port = ptp_port; - session->sock = sock; - memcpy(session->addr, addr, addrlen); - session->addrlen = addrlen; - session->dead = false; - session->abort = false; - session->accepting = false; - - *state = AEMU_POSTOFFICE_CLIENT_OK; - return session; -} - -void *ptp_listen_v6(const struct aemu_post_office_sock6_addr *addr, const char *ptp_mac, int ptp_port, int *state){ - native_sock6_addr native_addr; - to_native_sock6_addr(&native_addr, addr); - - return ptp_listen(&native_addr, sizeof(native_addr), ptp_mac, ptp_port, state); -} - -void *ptp_listen_v4(const struct aemu_post_office_sock_addr *addr, const char *ptp_mac, int ptp_port, int *state){ - native_sock_addr native_addr; - to_native_sock_addr(&native_addr, addr); - - return ptp_listen(&native_addr, sizeof(native_addr), ptp_mac, ptp_port, state); -} - -void *ptp_accept(void *ptp_listen_handle, char *ptp_mac, int *ptp_port, bool nonblock, int *state){ - if (ptp_listen_handle == NULL){ - *state = AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - return NULL; - } - - struct ptp_listen_session *session = (struct ptp_listen_session *)ptp_listen_handle; - if (session->dead){ - *state = AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - return NULL; - } - - struct aemu_postoffice_ptp_connect connect_packet; - session->accepting = true; - int recv_status = native_recv_till_done(session->sock, (char *)&connect_packet, sizeof(connect_packet), nonblock, &session->abort); - session->accepting = false; - if (recv_status == NATIVE_SOCK_ABORTED){ - // getting aborted - *state = AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - return NULL; - } - if (recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ - *state = AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; - return NULL; - } - if (recv_status == 0){ - LOG("%s: the other side closed the listen socket\n", __func__); - session->dead = true; - native_close_tcp_sock(session->sock); - *state = AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - return NULL; - } - if (recv_status <= 0){ - LOG("%s: socket error, %d\n", __func__, recv_status); - session->dead = true; - native_close_tcp_sock(session->sock); - *state = AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - return NULL; - } - - // Allocate memory - struct ptp_session *new_session = NULL; - lock_sock_alloc_mutex(); - for(int i = 0;i < sizeof(ptp_sessions) / sizeof(ptp_sessions[0]);i++){ - if (ptp_sessions[i].sock == -1){ - new_session = &ptp_sessions[i]; - new_session->sock = 0; - break; - } - } - unlock_sock_alloc_mutex(); - if (new_session == NULL){ - *state = AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; - return NULL; - } - - // Prepare init packet - struct aemu_postoffice_init init_packet; - init_packet.init_type = AEMU_POSTOFFICE_INIT_PTP_ACCEPT; - memcpy(init_packet.src_addr, session->ptp_mac, 6); - init_packet.sport = session->ptp_port; - memcpy(init_packet.dst_addr, connect_packet.addr, 6); - init_packet.dport = connect_packet.port; - - int sock = create_and_init_socket(session->addr, session->addrlen, (char *)&init_packet, sizeof(init_packet), __func__); - - if (sock < 0){ - *state = sock; - new_session->sock = -1; - return NULL; - } - - // Consume the ack packet - bool abort = false; - int read_status = native_recv_till_done(sock, (char *)&connect_packet, sizeof(connect_packet), false, &abort); - if (read_status == 0){ - LOG("%s: remove closed the socket during initial recv\n", __func__); - *state = AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; - native_close_tcp_sock(sock); - new_session->sock = -1; - return NULL; - } - if (read_status == -1){ - LOG("%s: socket error receiving initial packet\n", __func__); - *state = AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; - native_close_tcp_sock(sock); - new_session->sock = -1; - return NULL; - } - - // Now the session is ready - new_session->sock = sock; - new_session->dead = false; - new_session->abort = false; - new_session->sending = false; - new_session->recving = false; - new_session->outstanding_data_size = 0; - *state = AEMU_POSTOFFICE_CLIENT_OK; - *ptp_port = connect_packet.port; - memcpy(ptp_mac, connect_packet.addr, 6); - return new_session; -} - -static void *ptp_connect(void *addr, int addrlen, const char *src_ptp_mac, int ptp_sport, const char *dst_ptp_mac, int ptp_dport, int *state){ - // Allocate memory - struct ptp_session *new_session = NULL; - lock_sock_alloc_mutex(); - for(int i = 0;i < sizeof(ptp_sessions) / sizeof(ptp_sessions[0]);i++){ - if (ptp_sessions[i].sock == -1){ - new_session = &ptp_sessions[i]; - new_session->sock = 0; - break; - } - } - unlock_sock_alloc_mutex(); - if (new_session == NULL){ - *state = AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; - return NULL; - } - - // Prepare init packet - struct aemu_postoffice_init init_packet; - init_packet.init_type = AEMU_POSTOFFICE_INIT_PTP_CONNECT; - memcpy(init_packet.src_addr, src_ptp_mac, 6); - init_packet.sport = ptp_sport; - memcpy(init_packet.dst_addr, dst_ptp_mac, 6); - init_packet.dport = ptp_dport; - - int sock = create_and_init_socket(addr, addrlen, (char *)&init_packet, sizeof(init_packet), __func__); - - if (sock < 0){ - *state = sock; - new_session->sock = -1; - return NULL; - } - - // Consume the ack packet - struct aemu_postoffice_ptp_connect connect_packet; - bool abort = false; - int read_status = native_recv_till_done(sock, (char *)&connect_packet, sizeof(connect_packet), false, &abort); - if (read_status == 0){ - LOG("%s: remove closed the socket during initial recv\n", __func__); - *state = AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; - native_close_tcp_sock(sock); - new_session->sock = -1; - return NULL; - } - if (read_status == -1){ - LOG("%s: socket error receiving initial packet\n", __func__); - *state = AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; - native_close_tcp_sock(sock); - new_session->sock = -1; - return NULL; - } - - // Now the session is ready - new_session->sock = sock; - new_session->dead = false; - new_session->abort = false; - new_session->sending = false; - new_session->recving = false; - new_session->outstanding_data_size = 0; - *state = AEMU_POSTOFFICE_CLIENT_OK; - return new_session; -} - -void *ptp_connect_v6(const struct aemu_post_office_sock6_addr *addr, const char *src_ptp_mac, int ptp_sport, const char *dst_ptp_mac, int ptp_dport, int *state){ - native_sock6_addr native_addr; - to_native_sock6_addr(&native_addr, addr); - - return ptp_connect(&native_addr, sizeof(native_addr), src_ptp_mac, ptp_sport, dst_ptp_mac, ptp_dport, state); -} - -void *ptp_connect_v4(const struct aemu_post_office_sock_addr *addr, const char *src_ptp_mac, int ptp_sport, const char *dst_ptp_mac, int ptp_dport, int *state){ - native_sock_addr native_addr; - to_native_sock_addr(&native_addr, addr); - - return ptp_connect(&native_addr, sizeof(native_addr), src_ptp_mac, ptp_sport, dst_ptp_mac, ptp_dport, state); -} - -int ptp_send(void *ptp_handle, const char *buf, int len, bool non_block){ - if (ptp_handle == NULL){ - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - struct ptp_session *session = (struct ptp_session *)ptp_handle; - if (session->dead || session->abort){ - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (len > sizeof(session->recv_buf)){ - LOG("%s: failed sending data, data too big, %d\n", __func__, len); - return AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; - } - - struct aemu_postoffice_ptp_data header = { - .size = len - }; - - session->sending = true; - int send_status = native_send_till_done(session->sock, (char *)&header, sizeof(header), non_block, &session->abort); - session->sending = false; - if (send_status == NATIVE_SOCK_ABORTED){ - // getting aborted - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - if (send_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ - return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; - } - - if (send_status < 0){ - LOG("%s: failed sending header\n", __func__); - native_close_tcp_sock(session->sock); - session->dead = true; - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - session->sending = true; - send_status = native_send_till_done(session->sock, buf, len, false, &session->abort); - session->sending = false; - if (send_status == NATIVE_SOCK_ABORTED){ - // getting aborted - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - if (send_status < 0){ - LOG("%s: failed sending data\n", __func__); - native_close_tcp_sock(session->sock); - session->dead = true; - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - return AEMU_POSTOFFICE_CLIENT_OK; -} - -int ptp_recv(void *ptp_handle, char *buf, int *len, bool non_block){ - if (ptp_handle == NULL){ - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - struct ptp_session *session = (struct ptp_session *)ptp_handle; - if (session->dead || session->abort){ - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (*len > sizeof(session->recv_buf)){ - LOG("%s: failed receiving data, data too big, %d\n", __func__, *len); - return AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY; - } - - // check if we have outstanding transfer - if (session->outstanding_data_size != 0){ - memcpy(buf, &session->recv_buf[session->outstanding_data_offset], *len); - if (session->outstanding_data_size > *len){ - session->outstanding_data_size -= *len; - session->outstanding_data_offset += *len; - return AEMU_POSTOFFICE_CLIENT_SESSION_DATA_TRUNC; - } - - *len = session->outstanding_data_size; - session->outstanding_data_size = 0; - return AEMU_POSTOFFICE_CLIENT_OK; - } - - struct aemu_postoffice_ptp_data header = {0}; - - session->recving = true; - int recv_status = native_recv_till_done(session->sock, (char *)&header, sizeof(header), non_block, &session->abort); - session->recving = false; - if (recv_status == NATIVE_SOCK_ABORTED){ - // getting aborted - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - if (recv_status == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ - return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; - } - - if (recv_status == 0){ - LOG("%s: remote closed the socket\n", __func__); - native_close_tcp_sock(session->sock); - session->dead = true; - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (recv_status < 0){ - LOG("%s: failed receiving header\n", __func__); - native_close_tcp_sock(session->sock); - session->dead = true; - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (header.size > sizeof(session->recv_buf)){ - LOG("%s: incoming data too big\n", __func__); - native_close_tcp_sock(session->sock); - session->dead = true; - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - session->recving = true; - recv_status = native_recv_till_done(session->sock, session->recv_buf, header.size, false, &session->abort); - session->recving = false; - if (recv_status == NATIVE_SOCK_ABORTED){ - // getting aborted - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (recv_status == 0){ - LOG("%s: remote closed the socket\n", __func__); - native_close_tcp_sock(session->sock); - session->dead = true; - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (recv_status < 0){ - LOG("%s: failed receiving data\n", __func__); - native_close_tcp_sock(session->sock); - session->dead = true; - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - memcpy(buf, session->recv_buf, *len); - if (*len < header.size){ - session->outstanding_data_offset = *len; - session->outstanding_data_size = header.size - *len; - return AEMU_POSTOFFICE_CLIENT_SESSION_DATA_TRUNC; - } - *len = header.size; - return AEMU_POSTOFFICE_CLIENT_OK; -} - -void ptp_close(void *ptp_handle){ - if (ptp_handle == NULL){ - return; - } - - struct ptp_session *session = (struct ptp_session *)ptp_handle; - - // abort on-going ops - session->abort = true; - - // make sure we are clear of send/recv operations - do{ - delay(50); - }while(session->sending || session->recving); - - if (!session->dead) - native_close_tcp_sock(session->sock); - session->sock = -1; -} - -void ptp_listen_close(void *ptp_listen_handle){ - if (ptp_listen_handle == NULL){ - return; - } - - struct ptp_listen_session *session = (struct ptp_listen_session *)ptp_listen_handle; - - // abort on-going ops - session->abort = true; - - // make sure we are clear of send/recv operations - do{ - delay(50); - }while(session->accepting); - - if (!session->dead) - native_close_tcp_sock(session->sock); - session->sock = -1; -} - -int pdp_get_native_sock(void *pdp_handle){ - struct pdp_session *session = pdp_handle; - return session->sock; -} - -int ptp_get_native_sock(void *ptp_handle){ - struct ptp_session *session = ptp_handle; - return session->sock; -} - -int ptp_listen_get_native_sock(void *ptp_listen_handle){ - struct ptp_listen_session *session = ptp_listen_handle; - return session->sock; -} - -int ptp_peek_next_size(void *ptp_handle){ - struct ptp_session *session = ptp_handle; - - if (session->dead || session->abort){ - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - aemu_postoffice_ptp_data header = {0}; - session->recving = true; - int peek_result = native_peek(session->sock, (char *)&header, sizeof(header)); - session->recving = false; - if (peek_result == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK){ - return 0; - } - if (session->abort){ - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (peek_result <= 0){ - session->dead = true; - native_close_tcp_sock(session->sock); - return AEMU_POSTOFFICE_CLIENT_SESSION_DEAD; - } - - if (peek_result != sizeof(header)){ - return 0; - } - - return header.size; -} diff --git a/ext/aemu_postoffice/client/postoffice_client.h b/ext/aemu_postoffice/client/postoffice_client.h deleted file mode 100644 index e60dc37fc9..0000000000 --- a/ext/aemu_postoffice/client/postoffice_client.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef __POSTOFFICE_CLIENT_H -#define __POSTOFFICE_CLIENT_H - -#include -#include - -enum aemu_postoffice_client_errors { - AEMU_POSTOFFICE_CLIENT_OK = 0, - AEMU_POSTOFFICE_CLIENT_UNKNOWN = -1, - AEMU_POSTOFFICE_CLIENT_OUT_OF_MEMORY = -2, - AEMU_POSTOFFICE_CLIENT_SESSION_DEAD = -3, - AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK = -4, - AEMU_POSTOFFICE_CLIENT_SESSION_DATA_TRUNC = -5, - AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK = -6 -}; - -struct aemu_post_office_sock_addr{ - uint32_t addr; // network order - uint16_t port; // network order -}; - -struct aemu_post_office_sock6_addr{ - uint8_t addr[16]; // network order - uint16_t port; // network order -}; - -#ifdef __cplusplus -extern "C" { -#endif - -int aemu_post_office_init(); - -/* - * Thread safety: - * multiple threads can perform create/listen/connect - * only one thread at a time can accept on a created socket - * only one thread at a time can send on a created socket - * only one thread at a time can recv/peek on a created socket - * only one thread at a time can close a created socket - * - * violating the above yields undefined results - */ - -void *pdp_create_v6(const struct aemu_post_office_sock6_addr *addr, const char *pdp_mac, int pdp_port, int *state); -void *pdp_create_v4(const struct aemu_post_office_sock_addr *addr, const char *pdp_mac, int pdp_port, int *state); -void pdp_delete(void *pdp_handle); -int pdp_send(void *pdp_handle, const char *pdp_mac, int pdp_port, const char *buf, int len, bool non_block); -int pdp_recv(void *pdp_handle, char *pdp_mac, int *pdp_port, char *buf, int *len, bool non_block); -int pdp_peek_next_size(void *pdp_handle); -void *ptp_listen_v6(const struct aemu_post_office_sock6_addr *addr, const char *ptp_mac, int ptp_port, int *state); -void *ptp_listen_v4(const struct aemu_post_office_sock_addr *addr, const char *ptp_mac, int ptp_port, int *state); -void *ptp_accept(void *ptp_listen_handle, char *ptp_mac, int *ptp_port, bool nonblock, int *state); -void *ptp_connect_v6(const struct aemu_post_office_sock6_addr *addr, const char *src_ptp_mac, int ptp_sport, const char *dst_ptp_mac, int ptp_dport, int *state); -void *ptp_connect_v4(const struct aemu_post_office_sock_addr *addr, const char *src_ptp_mac, int ptp_sport, const char *dst_ptp_mac, int ptp_dport, int *state); -int ptp_send(void *ptp_handle, const char *buf, int len, bool non_block); -int ptp_recv(void *ptp_handle, char *buf, int *len, bool non_block); -void ptp_close(void *ptp_handle); -void ptp_listen_close(void *ptp_listen_handle); -int ptp_peek_next_size(void *ptp_handle); - -int pdp_get_native_sock(void *pdp_handle); -int ptp_get_native_sock(void *ptp_handle); -int ptp_listen_get_native_sock(void *ptp_listen_handle); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/ext/aemu_postoffice/client/sock_impl_linux.c b/ext/aemu_postoffice/client/sock_impl_linux.c deleted file mode 100644 index 948a71a1a5..0000000000 --- a/ext/aemu_postoffice/client/sock_impl_linux.c +++ /dev/null @@ -1,128 +0,0 @@ -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "postoffice_client.h" -#include "sock_impl_linux.h" -#include "log_linux.h" - -void to_native_sock_addr(native_sock_addr *dst, const struct aemu_post_office_sock_addr *src){ - dst->sin_family = AF_INET; - dst->sin_addr.s_addr = src->addr; - dst->sin_port = src->port; -} - -void to_native_sock6_addr(native_sock6_addr *dst, const struct aemu_post_office_sock6_addr *src){ - dst->sin6_family = AF_INET6; - dst->sin6_port = src->port; - dst->sin6_flowinfo = 0; - memcpy(dst->sin6_addr.s6_addr, src->addr, 16); - dst->sin6_scope_id = 0; -} - -int native_connect_tcp_sock(void *addr, int addrlen){ - native_sock_addr *native_addr = addr; - int sock = socket(native_addr->sin_family, SOCK_STREAM, 0); - if (sock == -1){ - LOG("%s: failed creating socket, %s\n", __func__, strerror(errno)); - return AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; - } - - // Connect - int connect_status = connect(sock, addr, addrlen); - if (connect_status == -1){ - LOG("%s: failed connecting, %s\n", __func__, strerror(errno)); - close(sock); - return AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; - } - - // Set socket options - int sockopt = 1; - setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &sockopt, sizeof(sockopt)); - int flags = fcntl(sock, F_GETFL, 0); - flags |= O_NONBLOCK; - fcntl(sock, F_SETFL, flags); - - return sock; -} - -int native_send_till_done(int fd, const char *buf, int len, bool non_block, bool *abort){ - int write_offset = 0; - while(write_offset != len){ - if (*abort){ - return NATIVE_SOCK_ABORTED; - } - int write_status = send(fd, &buf[write_offset], len - write_offset, 0); - if (write_status == -1){ - int err = errno; - if (err == EAGAIN || err == EWOULDBLOCK){ - if (non_block && write_offset == 0){ - return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; - } - // Continue block sending, either in block mode or we already received part of the message - sleep(0); - continue; - } - // Other errors - LOG("%s: failed sending, %s\n", __func__, strerror(errno)); - return write_status; - } - write_offset += write_status; - } - return write_offset; -} - -int native_recv_till_done(int fd, char *buf, int len, bool non_block, bool *abort){ - int read_offset = 0; - while(read_offset != len){ - if (*abort){ - return NATIVE_SOCK_ABORTED; - } - int recv_status = recv(fd, &buf[read_offset], len - read_offset, 0); - if (recv_status == 0){ - return recv_status; - } - if (recv_status < 0){ - int err = errno; - if (err == EAGAIN || err == EWOULDBLOCK){ - if (non_block && read_offset == 0){ - return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; - } - // Continue block receving, either in block mode or we already sent part of the message - sleep(0); - continue; - } - // Other errors - LOG("%s: failed receving, %s\n", __func__, strerror(errno)); - return recv_status; - } - read_offset += recv_status; - } - return read_offset; -} - -int native_close_tcp_sock(int sock){ - return close(sock); -} - -int native_peek(int fd, char *buf, int len){ - int read_result = recv(fd, buf, len, MSG_PEEK); - if (read_result == 0){ - return 0; - } - if (read_result == -1){ - int err = errno; - if (err == EAGAIN || err == EWOULDBLOCK){ - return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; - } - LOG("%s: failed peeking, %s\n", __func__, strerror(errno)); - return -1; - } - return read_result; -} diff --git a/ext/aemu_postoffice/client/sock_impl_linux.h b/ext/aemu_postoffice/client/sock_impl_linux.h deleted file mode 100644 index f3aabf5bd2..0000000000 --- a/ext/aemu_postoffice/client/sock_impl_linux.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef __SOCK_IMPL_LINUX_H -#define __SOCK_IMPL_LINUX_H - -#include - -#include "postoffice_client.h" - -#define NATIVE_SOCK_ABORTED -100 - -typedef struct sockaddr_in native_sock_addr; -typedef struct sockaddr_in6 native_sock6_addr; - -void to_native_sock_addr(native_sock_addr *dst, const struct aemu_post_office_sock_addr *src); -void to_native_sock6_addr(native_sock6_addr *dst, const struct aemu_post_office_sock6_addr *src); - -int native_connect_tcp_sock(void *addr, int addrlen); -int native_close_tcp_sock(int sock); -int native_send_till_done(int fd, const char *buf, int len, bool non_block, bool *abort); -int native_recv_till_done(int fd, char *buf, int len, bool non_block, bool *abort); -int native_peek(int fd, char *buf, int len); - -#endif diff --git a/ext/aemu_postoffice/client/sock_impl_windows.c b/ext/aemu_postoffice/client/sock_impl_windows.c deleted file mode 100644 index 3bd159bc07..0000000000 --- a/ext/aemu_postoffice/client/sock_impl_windows.c +++ /dev/null @@ -1,137 +0,0 @@ -#include -#include - -#include -#include - -#include "postoffice_client.h" -#include "sock_impl_windows.h" -#include "log_windows.h" - -void to_native_sock_addr(native_sock_addr *dst, const struct aemu_post_office_sock_addr *src){ - dst->sin_family = AF_INET; - dst->sin_addr.s_addr = src->addr; - dst->sin_port = src->port; -} - -void to_native_sock6_addr(native_sock6_addr *dst, const struct aemu_post_office_sock6_addr *src){ - dst->sin6_family = AF_INET6; - dst->sin6_port = src->port; - dst->sin6_flowinfo = 0; - memcpy(dst->sin6_addr.s6_addr, src->addr, 16); - dst->sin6_scope_id = 0; -} - -static void init_winsock2(){ - static bool initialized = false; - if (!initialized){ - initialized = true; - WSADATA data; - int init_result = WSAStartup(MAKEWORD(2,2), &data); - if (init_result != 0){ - printf("%s: warning: WSAStartup seems to have failed, %d\n", __func__, init_result); - } - } -} - -int native_connect_tcp_sock(void *addr, int addrlen){ - init_winsock2(); - - native_sock_addr *native_addr = addr; - int sock = socket(native_addr->sin_family, SOCK_STREAM, 0); - if (sock == -1){ - LOG("%s: failed creating socket, %d\n", __func__, WSAGetLastError()); - return AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; - } - - // Connect - int connect_status = connect(sock, addr, addrlen); - if (connect_status == -1){ - LOG("%s: failed connecting, %d\n", __func__, WSAGetLastError()); - closesocket(sock); - return AEMU_POSTOFFICE_CLIENT_SESSION_NETWORK; - } - - // Set socket options - int sockopt = 1; - setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &sockopt, sizeof(sockopt)); - u_long ioctlopt = 1; - ioctlsocket(sock, FIONBIO, &ioctlopt); - - return sock; -} - -int native_send_till_done(int fd, const char *buf, int len, bool non_block, bool *abort){ - int write_offset = 0; - while(write_offset != len){ - if (*abort){ - return NATIVE_SOCK_ABORTED; - } - int write_status = send(fd, &buf[write_offset], len - write_offset, 0); - if (write_status == -1){ - int err = WSAGetLastError(); - if (err == WSAEWOULDBLOCK || err == WSAEINPROGRESS){ - if (non_block && write_offset == 0){ - return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; - } - // Continue block sending, either in block mode or we already received part of the message - Sleep(0); - continue; - } - // Other errors - LOG("%s: failed sending, %d\n", __func__, err); - return write_status; - } - write_offset += write_status; - } - return write_offset; -} - -int native_recv_till_done(int fd, char *buf, int len, bool non_block, bool *abort){ - int read_offset = 0; - while(read_offset != len){ - if (*abort){ - return NATIVE_SOCK_ABORTED; - } - int recv_status = recv(fd, &buf[read_offset], len - read_offset, 0); - if (recv_status == 0){ - return recv_status; - } - if (recv_status < 0){ - int err = WSAGetLastError(); - if (err == WSAEWOULDBLOCK || err == WSAEINPROGRESS){ - if (non_block && read_offset == 0){ - return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; - } - // Continue block receving, either in block mode or we already sent part of the message - Sleep(0); - continue; - } - // Other errors - LOG("%s: failed receving, %d\n", __func__, err); - return recv_status; - } - read_offset += recv_status; - } - return read_offset; -} - -int native_close_tcp_sock(int sock){ - return closesocket(sock); -} - -int native_peek(int fd, char *buf, int len){ - int read_result = recv(fd, buf, len, MSG_PEEK); - if (read_result == 0){ - return 0; - } - if (read_result == -1){ - int err = WSAGetLastError(); - if (err == WSAEWOULDBLOCK || err == WSAEINPROGRESS){ - return AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK; - } - LOG("%s: failed peeking, %d\n", __func__, WSAGetLastError()); - return -1; - } - return read_result; -} diff --git a/ext/aemu_postoffice/client/sock_impl_windows.h b/ext/aemu_postoffice/client/sock_impl_windows.h deleted file mode 100644 index 33d1606e7c..0000000000 --- a/ext/aemu_postoffice/client/sock_impl_windows.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef __SOCK_IMPL_WINDOWS_H -#define __SOCK_IMPL_WINDOWS_H - -#include -#include -#include - -#include "postoffice_client.h" - -#define NATIVE_SOCK_ABORTED -100 - -typedef struct sockaddr_in native_sock_addr; -typedef struct sockaddr_in6 native_sock6_addr; - -void to_native_sock_addr(native_sock_addr *dst, const struct aemu_post_office_sock_addr *src); -void to_native_sock6_addr(native_sock6_addr *dst, const struct aemu_post_office_sock6_addr *src); - -int native_connect_tcp_sock(void *addr, int addrlen); -int native_close_tcp_sock(int sock); -int native_send_till_done(int fd, const char *buf, int len, bool non_block, bool *abort); -int native_recv_till_done(int fd, char *buf, int len, bool non_block, bool *abort); -int native_peek(int fd, char *buf, int len); - -#endif diff --git a/ext/aemu_postoffice/gpl-3.0.txt b/ext/aemu_postoffice/gpl-3.0.txt deleted file mode 100644 index 94a9ed024d..0000000000 --- a/ext/aemu_postoffice/gpl-3.0.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/ext/aemu_postoffice/upstream.txt b/ext/aemu_postoffice/upstream.txt deleted file mode 100644 index 300f3b8e24..0000000000 --- a/ext/aemu_postoffice/upstream.txt +++ /dev/null @@ -1 +0,0 @@ -https://github.com/kethen/aemu_postoffice diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 1c90e1e18d..0d20ab6ff5 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -697,19 +697,19 @@ endif SOURCES_C += \ $(EXTDIR)/aemu_postoffice/client/postoffice.c +SOURCES_CXX += \ + $(EXTDIR)/aemu_postoffice/client/mutex_impl_cpp.cpp \ + $(EXTDIR)/aemu_postoffice/client/delay_impl_cpp.cpp \ + $(EXTDIR)/aemu_postoffice/client/log_impl_ppsspp.cpp \ + ifeq ($(PLATFORM_EXT), win32) SOURCES_C += \ - $(EXTDIR)/aemu_postoffice/client/delay_impl_windows.c \ - $(EXTDIR)/aemu_postoffice/client/sock_impl_windows.c \ - $(EXTDIR)/aemu_postoffice/client/mutex_impl_windows.c + $(EXTDIR)/aemu_postoffice/client/sock_impl_windows.c else SOURCES_C += \ - $(EXTDIR)/aemu_postoffice/client/delay_impl_linux.c \ - $(EXTDIR)/aemu_postoffice/client/sock_impl_linux.c \ - $(EXTDIR)/aemu_postoffice/client/mutex_impl_linux.c + $(EXTDIR)/aemu_postoffice/client/sock_impl_linux.c endif - SOURCES_CXX += \ $(COMMONDIR)/Render/Text/draw_text.cpp \ $(EXTDIR)/jpge/jpgd.cpp \ From f1bd8aca348ee65680f94dbc35819b152f1d44b2 Mon Sep 17 00:00:00 2001 From: Katharine Chui Date: Mon, 19 Jan 2026 22:32:04 +0100 Subject: [PATCH 10/10] save g_Config.bServerHasRelay at adhoc startup --- Core/HLE/proAdhoc.cpp | 3 +- Core/HLE/sceNetAdhoc.cpp | 69 +++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp index 75db5bf326..6092f1f633 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp @@ -91,6 +91,7 @@ int adhocConnectionType = ADHOC_CONNECT; int gameModeSocket = (int)INVALID_SOCKET; // UDP/PDP socket? on Master only? int gameModeBuffSize = 0; u8* gameModeBuffer = nullptr; +extern bool serverHasRelay; GameModeArea masterGameModeArea; std::vector replicaGameModeAreas; std::vector requiredGameModeMacs; @@ -421,7 +422,7 @@ void deleteAllAdhocSockets() { if (adhocSockets[i] != NULL) { auto sock = adhocSockets[i]; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { if (sock->type == SOCK_PTP) { // sync if (sock->connectThread != NULL) { diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 9c92a249e4..8bcbb7b9c6 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -85,6 +85,7 @@ int adhocSocketNotifyEvent = -1; std::map adhocctlRequests; std::map adhocSocketRequests; std::map sendTargetPeers; +bool serverHasRelay = false; int gameModeNotifyEvent = -1; @@ -177,7 +178,7 @@ static void __GameModeNotify(u64 userdata, int cyclesLate) { if (masterGameModeArea.dataUpdated) { int sentcount = 0; for (auto& gma : replicaGameModeAreas) { - if (!gma.dataSent && (g_Config.bServerHasRelay || IsSocketReady(sock->data.pdp.id, false, true) > 0)) { + if (!gma.dataSent && (serverHasRelay || IsSocketReady(sock->data.pdp.id, false, true) > 0)) { u16_le port = ADHOC_GAMEMODE_PORT; auto it = gameModePeerPorts.find(gma.mac); if (it != gameModePeerPorts.end()) @@ -241,7 +242,7 @@ static void __GameModeNotify(u64 userdata, int cyclesLate) { } // Recv new Replica data when available - if (g_Config.bServerHasRelay || IsSocketReady(sock->data.pdp.id, true, false) > 0) { + if (serverHasRelay || IsSocketReady(sock->data.pdp.id, true, false) > 0) { SceNetEtherAddr sendermac; s32_le senderport = ADHOC_GAMEMODE_PORT; s32_le bufsz = gameModeBuffSize; @@ -558,7 +559,7 @@ int DoBlockingPdpRecv(AdhocSocketRequest& req, s64& result) { sinlen = sizeof(sin); memset(&sin, 0, sinlen); - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { while(1) { int next_size = pdp_peek_next_size_postoffice(req.id - 1); if (next_size == 0) { @@ -735,7 +736,7 @@ int DoBlockingPdpSend(AdhocSocketRequest& req, s64& result, AdhocSendTargets& ta int ret = 0; int sockerr = 0; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { ret = pdp_send_postoffice(req.id - 1, &peer->mac, peer->port, req.buffer, targetPeers.length); if (ret == 0){ ret == *req.length; @@ -810,7 +811,7 @@ int DoBlockingPtpSend(AdhocSocketRequest& req, s64& result) { // Send Data int ret = 0; int sockerr = 0; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { ret = ptp_send_postoffice(req.id - 1, req.buffer, *req.length); if (ret == 0) { // sent @@ -909,7 +910,7 @@ int DoBlockingPtpRecv(AdhocSocketRequest& req, s64& result) { int ret = 0; int sockerr = 0; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { ret = ptp_recv_postoffice(req.id - 1, req.buffer, req.length); if (ret == 0){ // we got data @@ -1087,7 +1088,7 @@ int DoBlockingPtpAccept(AdhocSocketRequest& req, s64& result) { socklen_t sinlen = sizeof(sin); int ret, sockerr; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { ret = ptp_accept_postoffice(req.id - 1, req.remoteMAC, req.remotePort); if (ret >= 0) { result = ret; @@ -1197,7 +1198,7 @@ int DoBlockingPtpConnect(AdhocSocketRequest& req, s64& result, AdhocSendTargets& sin.sin_addr.s_addr = targetPeer.peers[0].ip; sin.sin_port = htons(ptpsocket.pport + targetPeer.peers[0].portOffset); - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { ret = ptp_connect_postoffice(req.id - 1, __func__); if (ret != 0) { ret = SOCKET_ERROR; @@ -1215,7 +1216,7 @@ int DoBlockingPtpConnect(AdhocSocketRequest& req, s64& result, AdhocSendTargets& // Check the connection state (assuming "connect" has been called before and is in-progress) // Note: On Linux "select" can return > 0 (with SO_ERROR = 0) even when the connection is not accepted yet, thus need "getpeername" to ensure else { - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { if (sock->postofficeHandle == NULL) { ret = SOCKET_ERROR; if (sock->connectThreadDone && sock->connectThreadResult == SCE_NET_ADHOC_ERROR_CONNECTION_REFUSED){ @@ -1245,7 +1246,7 @@ int DoBlockingPtpConnect(AdhocSocketRequest& req, s64& result, AdhocSendTargets& } // Check whether the connection has been established or not - if (!g_Config.bServerHasRelay && ret != SOCKET_ERROR) { + if (!serverHasRelay && ret != SOCKET_ERROR) { socklen_t sinlen = sizeof(sin); memset(&sin, 0, sinlen); // Note: "getpeername" shouldn't failed if the connection has been established, but on Windows it may succeed even when "connect" is still in-progress and not accepted yet (ie. "Tales of VS" on Windows) @@ -1641,7 +1642,11 @@ u32 sceNetAdhocInit() { // Since we are deleting GameMode Master here, we should probably need to make sure GameMode resources all cleared too. deleteAllGMB(); - aemu_post_office_init(); + serverHasRelay = g_Config.bServerHasRelay; + + if (serverHasRelay) { + aemu_post_office_init(); + } // Return Success return hleLogInfo(Log::sceNet, 0, "at %08x", currentMIPS->pc); @@ -1793,7 +1798,7 @@ int sceNetAdhocPdpCreate(const char *mac, int port, int bufferSize, u32 flag) { } // Valid MAC supplied. FIXME: MAC only valid after successful attempt to Create/Connect/Join a Group? (ie. adhocctlCurrentMode != ADHOCCTL_MODE_NONE) if ((adhocctlCurrentMode != ADHOCCTL_MODE_NONE) && isLocalMAC(saddr)) { - if (g_Config.bServerHasRelay) + if (serverHasRelay) return pdp_create_postoffice(saddr, port, bufferSize); // Create Internet UDP Socket @@ -2029,7 +2034,7 @@ int sceNetAdhocPdpSend(int id, const char *mac, u32 port, void *data, int len, i // Send Data. UDP are guaranteed to be sent as a whole or nothing(failed if len > SO_MAX_MSG_SIZE), and never be partially sent/recv int sent = 0; int error = 0; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { sent = pdp_send_postoffice(id - 1, daddr, dport, data, len); if (sent == 0) { sent = len; @@ -2142,7 +2147,7 @@ int sceNetAdhocPdpSend(int id, const char *mac, u32 port, void *data, int len, i int sent = 0; int error = 0; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { sent = pdp_send_postoffice(id - 1, &peer.mac, dport, data, len); if (sent == 0){ sent = len; @@ -2279,7 +2284,7 @@ int sceNetAdhocPdpRecv(int id, void *addr, void * port, void *buf, void *dataLen int received = 0; int error; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { while(1) { int next_size = pdp_peek_next_size_postoffice(id - 1); if (next_size == 0) { @@ -2363,7 +2368,7 @@ int sceNetAdhocPdpRecv(int id, void *addr, void * port, void *buf, void *dataLen return hleLogVerbose(Log::sceNet, SCE_NET_ADHOC_ERROR_NOT_ENOUGH_SPACE, "not enough space"); } - if (!g_Config.bServerHasRelay) { + if (!serverHasRelay) { sinlen = sizeof(sin); memset(&sin, 0, sinlen); // On Windows: Socket Error 10014 may happen when buffer size is less than the minimum allowed/required (ie. negative number on Vulcanus Seek and Destroy), the address is not a valid part of the user address space (ie. on the stack or when buffer overflow occurred), or the address is not properly aligned (ie. multiple of 4 on 32bit and multiple of 8 on 64bit) https://stackoverflow.com/questions/861154/winsock-error-code-10014 @@ -2509,7 +2514,7 @@ int PollAdhocSocket(SceNetAdhocPollSd* sds, int count, int timeout, int nonblock return SCE_NET_ADHOC_ERROR_SOCKET_DELETED; } - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { int postoffice_fd = get_postoffice_fd(sds[i].id - 1); if (postoffice_fd == -1) { continue; @@ -2540,7 +2545,7 @@ int PollAdhocSocket(SceNetAdhocPollSd* sds, int count, int timeout, int nonblock if (sds[i].id > 0 && sds[i].id <= MAX_SOCKET && adhocSockets[sds[i].id - 1] != NULL) { auto sock = adhocSockets[sds[i].id - 1]; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { int postoffice_fd = get_postoffice_fd(sds[i].id - 1); if (postoffice_fd == -1) { continue; @@ -2704,7 +2709,7 @@ int NetAdhocPdp_Delete(int id, int unknown) { // Valid Socket if (sock != NULL && sock->type == SOCK_PDP) { - if (g_Config.bServerHasRelay) + if (serverHasRelay) return pdp_delete_postoffice(id - 1); // Close Connection @@ -3603,7 +3608,7 @@ static int sceNetAdhocGetPdpStat(u32 structSize, u32 structAddr) { // Set available bytes to be received. With FIONREAD There might be ghosting 1 byte in recv buffer when remote peer's socket got closed (ie. Warriors Orochi 2) Attempting to recv this ghost 1 byte will result to socket error 10054 (may need to disable SIO_UDP_CONNRESET error) // It seems real PSP respecting the socket buffer size arg, so we may need to cap the value up to the buffer size arg since we use larger buffer, for PDP/UDP the total size must not contains partial/truncated message to avoid data loss. // TODO: We may need to manage PDP messages ourself by reading each msg 1-by-1 and moving it to our internal buffer(msg array) in order to calculate the correct messages size that can fit into buffer size when there are more than 1 messages in the recv buffer (simulate FIONREAD) - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { void *postofficeHandle = pdp_postoffice_recover(j); if (postofficeHandle != NULL) { sock->data.pdp.rcv_sb_cc = pdp_peek_next_size(postofficeHandle); @@ -3709,7 +3714,7 @@ static int sceNetAdhocGetPtpStat(u32 structSize, u32 structAddr) { // GvG Next Plus relies on GetPtpStat to determine if Connection has been Established or not, but should not be updated too long for GvG to work, and should not be updated too fast(need to be 1 frame after PollSocket checking for ADHOC_EV_CONNECT) for Bleach Heat the Soul 7 to work properly. if ((sock->data.ptp.state == ADHOC_PTP_STATE_SYN_SENT || sock->data.ptp.state == ADHOC_PTP_STATE_SYN_RCVD) && (static_cast(CoreTiming::GetGlobalTimeUsScaled() - sock->lastAttempt) > 33333/*sock->retry_interval*/)) { // FIXME: May be we should poll all of them together on a single poll call instead of each socket separately? - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { if (sock->postofficeHandle != NULL){ // good to go sock->data.ptp.state = ADHOC_PTP_STATE_ESTABLISHED; @@ -3727,7 +3732,7 @@ static int sceNetAdhocGetPtpStat(u32 structSize, u32 structAddr) { } } - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { if (sock->postofficeHandle != NULL) { sock->data.ptp.rcv_sb_cc = ptp_peek_next_size(sock->postofficeHandle); } else { @@ -3974,7 +3979,7 @@ static int sceNetAdhocPtpOpen(const char *srcmac, int sport, const char *dstmac, } // Random Port required - if (sport == 0 && !g_Config.bServerHasRelay) { + if (sport == 0 && !serverHasRelay) { isClient = true; //sport 0 should be shifted back to 0 when using offset Phantasy Star Portable 2 use this sport = -static_cast(portOffset); @@ -3982,7 +3987,7 @@ static int sceNetAdhocPtpOpen(const char *srcmac, int sport, const char *dstmac, // Valid Arguments if (bufsize > 0 && rexmt_int > 0 && rexmt_cnt > 0) { - if (g_Config.bServerHasRelay) + if (serverHasRelay) return ptp_open_postoffice(saddr, sport, daddr, dport, bufsize); // Create Infrastructure Socket (?) @@ -4295,7 +4300,7 @@ static int sceNetAdhocPtpAccept(int id, u32 peerMacAddrPtr, u32 peerPortPtr, int int error; int newsocket = 0; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { newsocket = ptp_accept_postoffice(id - 1, addr, port); if (newsocket >= 0) { return newsocket; @@ -4399,7 +4404,7 @@ int NetAdhocPtp_Connect(int id, int timeout, int flag, bool allowForcedConnect) // NOTE: Based on what i read at stackoverflow, The First Non-blocking POSIX connect will always returns EAGAIN/EWOULDBLOCK because it returns without waiting for ACK/handshake, But GvG Next Plus is treating non-blocking PtpConnect just like blocking connect, May be on a real PSP the first non-blocking sceNetAdhocPtpConnect can be successfull? int connectresult = 0; int errorcode = 0; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { connectresult = ptp_connect_postoffice(id - 1, __func__); if (connectresult != 0) { connectresult = SOCKET_ERROR; @@ -4432,8 +4437,8 @@ int NetAdhocPtp_Connect(int id, int timeout, int flag, bool allowForcedConnect) else if (connectresult == SOCKET_ERROR) { // Connection in Progress, or // ECONNREFUSED = No connection could be made because the target device actively refused it (on Windows/Linux/Android), or no one listening on the remote address (on Linux/Android) thus should try to connect again later (treated similarly to ETIMEDOUT/ENETUNREACH). - if (g_Config.bServerHasRelay || connectInProgress(errorcode) || errorcode == ECONNREFUSED) { - if (g_Config.bServerHasRelay || connectInProgress(errorcode)) + if (serverHasRelay || connectInProgress(errorcode) || errorcode == ECONNREFUSED) { + if (serverHasRelay || connectInProgress(errorcode)) { ptpsocket.state = ADHOC_PTP_STATE_SYN_SENT; } @@ -4536,7 +4541,7 @@ int NetAdhocPtp_Close(int id, int unknown) { // Valid Socket if (socket != NULL && socket->type == SOCK_PTP) { - if (g_Config.bServerHasRelay) + if (serverHasRelay) return ptp_close_postoffice(id - 1); // Close Connection @@ -4668,7 +4673,7 @@ static int sceNetAdhocPtpListen(const char *srcmac, int sport, int bufsize, int // Valid Arguments if (bufsize > 0 && rexmt_int > 0 && rexmt_cnt > 0 && backlog > 0) { - if (g_Config.bServerHasRelay) + if (serverHasRelay) return ptp_listen_postoffice(saddr, sport, bufsize); // Create Infrastructure Socket (?) @@ -4860,7 +4865,7 @@ static int sceNetAdhocPtpSend(int id, u32 dataAddr, u32 dataSizeAddr, int timeou // Send Data int sent = 0; int error = 0; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { sent = ptp_send_postoffice(id - 1, data, *len); if (sent == 0) { // sent @@ -4980,7 +4985,7 @@ static int sceNetAdhocPtpRecv(int id, u32 dataAddr, u32 dataSizeAddr, int timeou int received = 0; int error = 0; - if (g_Config.bServerHasRelay) { + if (serverHasRelay) { received = ptp_recv_postoffice(id - 1, buf, len); if (received == 0) { // we got data