preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-23 19:29:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21460 from Kethen/adhoc_fixes

Browse Source 
fix street rider sending pdp packets using wrong pdp dst addresses in relay mode
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2026-03-17 20:07:26 +01:00
2 parents a52501aa24 0f219edcc9
commit 3268fc18ee
3 files changed
+36 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/HLE/proAdhoc.cpp
+18
View File
@@ -2333,6 +2333,24 @@ bool resolveIP(uint32_t ip, SceNetEtherAddr * mac) {
return false;
}
void fixGameMac(SceNetEtherAddr *mac) {
SceNetEtherAddr localMac;
getLocalMac(&localMac);
if (isMacMatch(&localMac, mac)) {
*mac = localMac;
return;
}
std::lock_guard<std::recursive_mutex> peer_guard(peerlock);
SceNetAdhocctlPeerInfo * peer = friends;
for (; peer != NULL; peer = peer->next) {
if (isMacMatch(&peer->mac_addr, mac)) {
*mac = peer->mac_addr;
return;
}
}
}
bool resolveMAC(SceNetEtherAddr* mac, uint32_t* ip, u16* port_offset) {
// Get Local MAC Address
SceNetEtherAddr localMac;
Core/HLE/proAdhoc.h
+6
View File
@@ -1322,6 +1322,12 @@ bool resolveIP(uint32_t ip, SceNetEtherAddr * mac);
*/
bool resolveMAC(SceNetEtherAddr* mac, uint32_t* ip, u16* port_offset = nullptr);
/**
* Fix mac address if the game messed with the first byte
* @param mac Peer MAC Address
*/
void fixGameMac(SceNetEtherAddr *mac);
/**
* Check whether Network Name contains only valid symbols
* @param group_name To-be-checked Network Name
Core/HLE/sceNetAdhoc.cpp
+12 -7
View File
@@ -724,8 +724,8 @@ static int pdp_recv_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *sport,
return SOCKET_ERROR;
}
int sport_copy;
SceNetEtherAddr saddr_copy;
int sport_copy = 0;
SceNetEtherAddr saddr_copy = {0};
int len_copy = *len;
if (len_copy > AEMU_POSTOFFICE_PDP_BLOCK_MAX) {
@@ -919,7 +919,10 @@ 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, offset_port_simple(dport), (char *)data, len, true);
SceNetEtherAddr fixed_daddr = *daddr;
fixGameMac(&fixed_daddr);
int pdp_send_status = pdp_send(pdp_sock, (const char *)&fixed_daddr, offset_port_simple(dport), (char *)data, len, true);
if (pdp_send_status == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD) {
handle_relay_connect_failure();
pdp_delete(internal->postofficeHandle);
@@ -1252,9 +1255,9 @@ static int ptp_accept_postoffice(int idx, SceNetEtherAddr *saddr, uint16_t *spor
return SCE_NET_ADHOC_ERROR_WOULD_BLOCK;
}
int state;
int port_cpy;
SceNetEtherAddr mac_cpy;
int state = 0;
int port_cpy = 0;
SceNetEtherAddr mac_cpy = {0};
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) {
@@ -1410,7 +1413,9 @@ 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, offset_port_simple(internal->data.ptp.lport), (const char *)&internal->data.ptp.paddr, offset_port_simple(internal->data.ptp.pport), &state);
SceNetEtherAddr fixed_daddr = internal->data.ptp.paddr;
fixGameMac(&fixed_daddr);
void *ptp_socket = ptp_connect_v4(&addr, (const char *)&internal->data.ptp.laddr, offset_port_simple(internal->data.ptp.lport), (const char *)&fixed_daddr, 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);