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

DEV9: FreeBSD/Mac Fixes for ICMP session

This commit is contained in:
TheLastRar 2024-07-12 18:21:47 +01:00 committed by lightningterror
parent 48a1ec3531
commit 95c57462cc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcsx2/DEV9/Sessions/ICMP_Session/ICMP_Session.cpp
View File

@ -128,7 +128,8 @@ namespace Sessions
icmpResponseBufferLen = 8 + requestSize + 8; icmpResponseBufferLen = 8 + requestSize + 8;
#elif defined(ICMP_SOCKETS_BSD) #elif defined(ICMP_SOCKETS_BSD)
// Returned IP Header, ICMP Header & either data or failed ICMP packet // Returned IP Header, ICMP Header & either data or failed ICMP packet
icmpResponseBufferLen = 20 + 8 + std::max(20 + 8, requestSize); // Sometimes get full packet in ICMP error response
icmpResponseBufferLen = 20 + 8 + (20 + 8 + requestSize);
#endif #endif
break; break;
} }
@ -464,12 +465,15 @@ namespace Sessions
{ {
// Extract the packet the ICMP message is responding to // Extract the packet the ICMP message is responding to
IP_Packet ipPacket(icmpPayload->data, icmpPayload->GetLength(), true); IP_Packet ipPacket(icmpPayload->data, icmpPayload->GetLength(), true);
if (ipPacket.protocol != static_cast<u8>(IP_Type::ICMP))
return nullptr;
IP_PayloadPtr* ipPayload = static_cast<IP_PayloadPtr*>(ipPacket.GetPayload()); IP_PayloadPtr* ipPayload = static_cast<IP_PayloadPtr*>(ipPacket.GetPayload());
// TODO, validate proto? ICMP_Packet icmpInner(ipPayload->data, ipPayload->GetLength());
ICMP_Packet retIcmp(ipPayload->data, ipPayload->GetLength());
// Check if response is for us // Check if response is for us
ICMP_HeaderDataIdentifier headerData(icmp.headerData); ICMP_HeaderDataIdentifier headerData(icmpInner.headerData);
if (headerData.identifier != icmpId) if (headerData.identifier != icmpId)
return nullptr; return nullptr;