ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV9: Improve validation of received sequence numbers

This commit is contained in:
TheLastRar 2024-04-12 15:10:20 +01:00 committed by Connor McLaughlin
parent 6d8a906605
commit 1e094096c2
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/DEV9/Sessions/TCP_Session/TCP_Session.h
View File

@ -38,7 +38,7 @@ namespace Sessions
enum struct NumCheckResult
{
OK,
GotOldData,
OldSeq,
Bad
};
@ -98,10 +98,10 @@ namespace Sessions
void ResetMyNumbers();
NumCheckResult CheckRepeatSYNNumbers(PacketReader::IP::TCP::TCP_Packet* tcp);
NumCheckResult CheckNumbers(PacketReader::IP::TCP::TCP_Packet* tcp);
NumCheckResult CheckNumbers(PacketReader::IP::TCP::TCP_Packet* tcp, bool rejectOldSeq = false);
s32 GetDelta(u32 a, u32 b); //Returns a - b
//Returns true if errored
bool ErrorOnNonEmptyPacket(PacketReader::IP::TCP::TCP_Packet* tcp);
bool ValidateEmptyPacket(PacketReader::IP::TCP::TCP_Packet* tcp, bool ignoreOld = true);
//PS2 sent SYN
PacketReader::IP::TCP::TCP_Packet* ConnectTCPComplete(bool success);

44
pcsx2/DEV9/Sessions/TCP_Session/TCP_Session_Out.cpp
View File

@ -311,11 +311,7 @@ namespace Sessions
//Check if we already have some of the data sent
const uint delta = GetDelta(expectedSeqNumber, tcp->sequenceNumber);
pxAssert(delta >= 0);
//if (Result == NumCheckResult::GotOldData)
//{
// DevCon.WriteLn("[PS2] New Data Offset: %d bytes", delta);
// DevCon.WriteLn("[PS2] New Data Length: %d bytes", ((uint)tcp->GetPayload()->GetLength() - delta));
//}
if (Result == NumCheckResult::Bad)
{
CloseByRemoteRST();
@ -324,6 +320,11 @@ namespace Sessions
}
if (tcp->GetPayload()->GetLength() != 0)
{
//if (Result == NumCheckResult::OldSeq)
//{
// DevCon.WriteLn("[PS2] New Data Offset: %d bytes", delta);
// DevCon.WriteLn("[PS2] New Data Length: %d bytes", ((uint)tcp->GetPayload()->GetLength() - delta));
//}
if (tcp->GetPayload()->GetLength() - delta > 0)
{
DevCon.WriteLn("DEV9: TCP: [PS2] Sending: %d bytes", tcp->GetPayload()->GetLength());
@ -396,7 +397,7 @@ namespace Sessions
}
}
ErrorOnNonEmptyPacket(tcp);
ValidateEmptyPacket(tcp);
return true;
}
@ -414,7 +415,7 @@ namespace Sessions
return NumCheckResult::OK;
}
TCP_Session::NumCheckResult TCP_Session::CheckNumbers(TCP_Packet* tcp)
TCP_Session::NumCheckResult TCP_Session::CheckNumbers(TCP_Packet* tcp, bool rejectOldSeq)
{
u32 seqNum;
std::vector<u32> oldSeqNums;
@ -446,9 +447,15 @@ namespace Sessions
if (tcp->sequenceNumber != expectedSeqNumber)
{
if (tcp->GetPayload()->GetLength() == 0)
if (rejectOldSeq)
{
Console.Error("DEV9: TCP: [PS2] Sent Unexpected Sequence Number, Got %u Expected %u", tcp->sequenceNumber, expectedSeqNumber);
return NumCheckResult::Bad;
}
else if (tcp->GetPayload()->GetLength() == 0)
{
Console.Error("DEV9: TCP: [PS2] Sent Unexpected Sequence Number From ACK Packet, Got %u Expected %u", tcp->sequenceNumber, expectedSeqNumber);
return NumCheckResult::OldSeq;
}
else
{
@ -456,7 +463,7 @@ namespace Sessions
if (std::find(receivedPS2SeqNumbers.begin(), receivedPS2SeqNumbers.end(), tcp->sequenceNumber) == receivedPS2SeqNumbers.end())
{
Console.Error("DEV9: TCP: [PS2] Sent an Old Seq Number on an Data packet, Got %u Expected %u", tcp->sequenceNumber, expectedSeqNumber);
return NumCheckResult::GotOldData;
return NumCheckResult::OldSeq;
}
else
{
@ -468,13 +475,9 @@ namespace Sessions
return NumCheckResult::OK;
}
bool TCP_Session::ErrorOnNonEmptyPacket(TCP_Packet* tcp)
bool TCP_Session::ValidateEmptyPacket(TCP_Packet* tcp, bool ignoreOld)
{
NumCheckResult ResultFIN = CheckNumbers(tcp);
if (ResultFIN == NumCheckResult::GotOldData)
{
return false;
}
NumCheckResult ResultFIN = CheckNumbers(tcp, !ignoreOld);
if (ResultFIN == NumCheckResult::Bad)
{
CloseByRemoteRST();
@ -484,7 +487,8 @@ namespace Sessions
if (tcp->GetPayload()->GetLength() > 0)
{
uint delta = GetDelta(expectedSeqNumber, tcp->sequenceNumber);
if (delta == 0)
//Check if packet contains only old data
if (delta >= tcp->GetPayload()->GetLength())
return false;
CloseByRemoteRST();
@ -499,7 +503,7 @@ namespace Sessions
{
//Console.WriteLn("DEV9: TCP: PS2 has closed connection");
if (ErrorOnNonEmptyPacket(tcp)) //Sending FIN with data
if (ValidateEmptyPacket(tcp, false)) //Sending FIN with data
return true;
receivedPS2SeqNumbers.erase(receivedPS2SeqNumbers.begin());
@ -532,7 +536,7 @@ namespace Sessions
//Close Part 4, Receive ACK from PS2
//Console.WriteLn("DEV9: TCP: Completed Close By PS2");
if (ErrorOnNonEmptyPacket(tcp))
if (ValidateEmptyPacket(tcp))
return true;
if (myNumberACKed.load())
@ -551,7 +555,7 @@ namespace Sessions
{
//Console.WriteLn("DEV9: TCP: Completed Close By PS2");
if (ErrorOnNonEmptyPacket(tcp))
if (ValidateEmptyPacket(tcp))
return true;
if (myNumberACKed.load())
@ -568,7 +572,7 @@ namespace Sessions
{
//Console.WriteLn("DEV9: TCP: PS2 has closed connection after remote");
if (ErrorOnNonEmptyPacket(tcp))
if (ValidateEmptyPacket(tcp, false)) //Sending FIN with data
return true;
receivedPS2SeqNumbers.erase(receivedPS2SeqNumbers.begin());