Leahnaya/gba-link-connection
1
0
Fork 0
mirror of https://github.com/afska/gba-link-connection.git synced 2026-10-03 06:17:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

LinkWireless: Improve timeout handling, so old confirmation numbers still trigger timeouts

Browse Source
This commit is contained in:
Rodrigo Alfonso
2025-01-16 01:56:57 -03:00
parent fd5f298649
commit 5e49c84903
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/LinkUniversal.hpp
View File

@@ -183,7 +183,8 @@ class LinkUniversal {
*/
bool deactivate(bool turnOffWireless = true) {
isEnabled = false;
linkCable.deactivate();
if (linkCable.isActive())
linkCable.deactivate();
bool success = linkWireless.deactivate(turnOffWireless);
resetState();
return success;

22
lib/LinkWireless.hpp
View File

@@ -1156,11 +1156,6 @@ class LinkWireless {
u32 checksum = header.dataChecksum;
bool isPing = data == MSG_PING;
sessionState.msgTimeouts[0] = 0;
sessionState.msgTimeouts[remotePlayerId] = 0;
sessionState.msgFlags[0] = true;
sessionState.msgFlags[remotePlayerId] = true;
if (checksum != buildChecksum(data))
continue;
@@ -1168,16 +1163,19 @@ class LinkWireless {
message.packetId = partialPacketId;
message.data = data;
message.playerId = remotePlayerId;
if (!acceptMessage(message, isConfirmation, remotePlayerCount) || isPing)
if (!acceptMessage(message, isConfirmation, remotePlayerCount))
continue;
if (config.retransmission && isConfirmation &&
!handleConfirmation(message))
continue;
if (config.retransmission && isConfirmation) {
if (!handleConfirmation(message))
continue;
} else {
sessionState.msgTimeouts[0] = 0;
sessionState.msgTimeouts[remotePlayerId] = 0;
sessionState.msgFlags[0] = true;
sessionState.msgFlags[remotePlayerId] = true;
if (!isPing && !isConfirmation)
sessionState.newIncomingMessages.push(message);
}
}
copyIncomingState();
}