The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-11-22 17:19:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

prudp: Dont expect sessionId to match for PING+ACK

Browse Source 
Fixes friend service connection periodically timing-out on Pretendo.

Seems that unlike Nintendo's servers, Pretendo doesn't set sessionId for PING ack packets.
This commit is contained in:
Exzap 2024-04-13 10:43:13 +02:00
parent d5a8530246
commit 9c28a728e4
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Cemu/nex/prudp.cpp
View File

@ -452,9 +452,7 @@ prudpIncomingPacket::prudpIncomingPacket(prudpStreamSettings_t* streamSettings,
} }
else else
{ {
#ifdef CEMU_DEBUG_ASSERT cemu_assert_suspicious();
assert_dbg();
#endif
} }
} }
@ -696,6 +694,8 @@ void prudpClient::handleIncomingPacket(prudpIncomingPacket* incomingPacket)
if (currentConnectionState == STATE_CONNECTING) if (currentConnectionState == STATE_CONNECTING)
{ {
lastPingTimestamp = prudpGetMSTimestamp(); lastPingTimestamp = prudpGetMSTimestamp();
if(serverSessionId != 0)
cemuLog_logDebug(LogType::Force, "PRUDP: ServerSessionId is already set");
serverSessionId = incomingPacket->sessionId; serverSessionId = incomingPacket->sessionId;
currentConnectionState = STATE_CONNECTED; currentConnectionState = STATE_CONNECTED;
//printf("Connection established. ClientSession %02x ServerSession %02x\n", clientSessionId, serverSessionId); //printf("Connection established. ClientSession %02x ServerSession %02x\n", clientSessionId, serverSessionId);
@ -763,7 +763,6 @@ bool prudpClient::update()
sint32 r = recvfrom(socketUdp, (char*)receiveBuffer, sizeof(receiveBuffer), 0, &receiveFrom, &receiveFromLen); sint32 r = recvfrom(socketUdp, (char*)receiveBuffer, sizeof(receiveBuffer), 0, &receiveFrom, &receiveFromLen);
if (r >= 0) if (r >= 0)
{ {
//printf("RECV 0x%04x byte\n", r);
// todo: Verify sender (receiveFrom) // todo: Verify sender (receiveFrom)
// calculate packet size // calculate packet size
sint32 pIdx = 0; sint32 pIdx = 0;
@ -772,18 +771,25 @@ bool prudpClient::update()
sint32 packetLength = prudpPacket::calculateSizeFromPacketData(receiveBuffer + pIdx, r - pIdx); sint32 packetLength = prudpPacket::calculateSizeFromPacketData(receiveBuffer + pIdx, r - pIdx);
if (packetLength <= 0 || (pIdx + packetLength) > r) if (packetLength <= 0 || (pIdx + packetLength) > r)
{ {
//printf("Invalid packet length\n"); cemuLog_logDebug(LogType::Force, "PRUDP: Invalid packet length");
break; break;
} }
prudpIncomingPacket* incomingPacket = new prudpIncomingPacket(&streamSettings, receiveBuffer + pIdx, packetLength); prudpIncomingPacket* incomingPacket = new prudpIncomingPacket(&streamSettings, receiveBuffer + pIdx, packetLength);
pIdx += packetLength; pIdx += packetLength;
if (incomingPacket->hasError()) if (incomingPacket->hasError())
{ {
cemuLog_logDebug(LogType::Force, "PRUDP: Packet error");
delete incomingPacket; delete incomingPacket;
break; break;
} }
if (incomingPacket->type != prudpPacket::TYPE_CON && incomingPacket->sessionId != serverSessionId) // sessionId validation is complicated and depends on specific flags and type combinations. It does not seem to cover all packet types
bool validateSessionId = serverSessionId != 0;
if((incomingPacket->type == prudpPacket::TYPE_PING && (incomingPacket->flags&prudpPacket::FLAG_ACK) != 0))
validateSessionId = false; // PING + ack -> disable session id validation. Pretendo's friend server sends PING ack packets without setting the sessionId (it is 0)
if (validateSessionId && incomingPacket->sessionId != serverSessionId)
{ {
cemuLog_logDebug(LogType::Force, "PRUDP: Invalid session id");
delete incomingPacket; delete incomingPacket;
continue; // different session continue; // different session
} }