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

DEV9: Always bind UDP ports

This commit is contained in:
TheLastRar 2024-11-26 23:40:56 +00:00 committed by Ty
parent 671255c684
commit 687c587d19
1 changed files with 36 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pcsx2/DEV9/sockets.cpp
View File

@ -464,28 +464,22 @@ bool SocketAdapter::SendUDP(ConnectionKey Key, IP_Packet* ipPkt)
return false; return false;
else else
{ {
UDP_Session* s = nullptr; // Always bind the UDP source port
// PS2 software can run into issues if the source port is not preserved
if (abs(udp.sourcePort - udp.destinationPort) <= 10 || //Used for games that assume the destination/source port
ipPkt->destinationIP == dhcpServer.broadcastIP || //Broadcast packets
ipPkt->destinationIP == IP_Address{{{255, 255, 255, 255}}} || //Limited Broadcast packets
(ipPkt->destinationIP.bytes[0] & 0xF0) == 0xE0) //Multicast address start with 0b1110
{
UDP_FixedPort* fPort = nullptr; UDP_FixedPort* fPort = nullptr;
BaseSession* fSession; BaseSession* fSession;
if (fixedUDPPorts.TryGetValue(udp.sourcePort, &fSession)) if (fixedUDPPorts.TryGetValue(udp.sourcePort, &fSession))
{ {
//DevCon.WriteLn("DEV9: Socket: Using Existing UDPFixedPort");
fPort = static_cast<UDP_FixedPort*>(fSession); fPort = static_cast<UDP_FixedPort*>(fSession);
} }
else else
{ {
ConnectionKey fKey{}; ConnectionKey fKey{};
fKey.protocol = (u8)IP_Type::UDP; fKey.protocol = static_cast<u8>(IP_Type::UDP);
fKey.ps2Port = udp.sourcePort; fKey.ps2Port = udp.sourcePort;
fKey.srvPort = 0; fKey.srvPort = 0;
Console.WriteLn("DEV9: Socket: Creating New UDPFixedPort with port %d", udp.sourcePort); Console.WriteLn("DEV9: Socket: Binding UDP fixed port %d", udp.sourcePort);
fPort = new UDP_FixedPort(fKey, adapterIP, udp.sourcePort); fPort = new UDP_FixedPort(fKey, adapterIP, udp.sourcePort);
fPort->AddConnectionClosedHandler([&](BaseSession* session) { HandleFixedPortClosed(session); }); fPort->AddConnectionClosedHandler([&](BaseSession* session) { HandleFixedPortClosed(session); });
@ -499,20 +493,16 @@ bool SocketAdapter::SendUDP(ConnectionKey Key, IP_Packet* ipPkt)
fPort->Init(); fPort->Init();
} }
Console.WriteLn("DEV9: Socket: Creating New UDP Connection from FixedPort %d to %d", udp.sourcePort, udp.destinationPort); Console.WriteLn("DEV9: Socket: Creating New UDP Connection from fixed port %d to %d", udp.sourcePort, udp.destinationPort);
s = fPort->NewClientSession(Key, UDP_Session* s = fPort->NewClientSession(Key,
ipPkt->destinationIP == dhcpServer.broadcastIP || ipPkt->destinationIP == IP_Address{{{255, 255, 255, 255}}}, ipPkt->destinationIP == dhcpServer.broadcastIP || ipPkt->destinationIP == IP_Address{{{255, 255, 255, 255}}},
(ipPkt->destinationIP.bytes[0] & 0xF0) == 0xE0); (ipPkt->destinationIP.bytes[0] & 0xF0) == 0xE0);
// If we are unable to bind to the port, fall back to a dynamic port
if (s == nullptr) if (s == nullptr)
{ {
Console.Error("DEV9: Socket: Failed to Create New UDP Connection from FixedPort"); Console.Error("DEV9: Socket: Failed to Create New UDP Connection from fixed port");
return false; Console.WriteLn("DEV9: Socket: Retrying with dynamic port to %d", udp.destinationPort);
}
}
else
{
Console.WriteLn("DEV9: Socket: Creating New UDP Connection to %d", udp.destinationPort);
s = new UDP_Session(Key, adapterIP); s = new UDP_Session(Key, adapterIP);
} }
@ -577,7 +567,7 @@ void SocketAdapter::HandleFixedPortClosed(BaseSession* sender)
else else
deleteQueueRecvThread.push_back(sender); deleteQueueRecvThread.push_back(sender);
Console.WriteLn("DEV9: Socket: Closed Dead UDP Fixed Port to %d", key.ps2Port); Console.WriteLn("DEV9: Socket: Unbound fixed port %d", key.ps2Port);
} }
void SocketAdapter::close() void SocketAdapter::close()