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

DEV9: Support networks with a netmask of 255.255.255.255

This commit is contained in:
TheLastRar 2024-11-10 19:54:08 +00:00
parent 38ac716a3b
commit cc1b1d06ae
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcsx2/DEV9/InternalServers/DHCP_Server.cpp
View File

@ -137,6 +137,18 @@ namespace InternalServers
if (gateways.size() > 0) if (gateways.size() > 0)
gateway = gateways[0]; gateway = gateways[0];
/*
* Some VPN adapters will present a subnet mask of 255.255.255.255 and omit setting a gateway.
* This is used for point-point links where the destination device handles routing out of the network.
* PS2 software, howver, expects a valid gateway for packets leaving the network.
* As a hackfix, we set the gateway to the PS2 IP, which is enough to allow such software to pregress.
* A side effect of this is that outbound packets will have the src and dst mac be identical.
* This is a mostly PCAP exclusive issue, I've only seen such networks with VPN devices,
* which don't like being bridged, preventing TAP from being used with them.
* Sockets (currently) uses its own internal network, and thus would be unaffected.
*/
else if (netmask == IP_Address{{{255, 255, 255, 255}}})
gateway = ps2IP;
} }
#ifdef _WIN32 #ifdef _WIN32
@ -180,7 +192,7 @@ namespace InternalServers
void DHCP_Server::AutoBroadcast(IP_Address parPS2IP, IP_Address parNetmask) void DHCP_Server::AutoBroadcast(IP_Address parPS2IP, IP_Address parNetmask)
{ {
if (parNetmask.integer != 0) if (parNetmask.integer != 0 && parNetmask != IP_Address{{{255, 255, 255, 255}}})
{ {
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
broadcastIP.bytes[i] = ((parPS2IP.bytes[i]) | (~parNetmask.bytes[i])); broadcastIP.bytes[i] = ((parPS2IP.bytes[i]) | (~parNetmask.bytes[i]));
@ -325,7 +337,10 @@ namespace InternalServers
retPay->options.push_back(new DHCPopDnsName("PCSX2")); retPay->options.push_back(new DHCPopDnsName("PCSX2"));
break; break;
case 28: case 28:
if (broadcastIP.integer != 0)
{
retPay->options.push_back(new DHCPopBCIP(broadcastIP)); retPay->options.push_back(new DHCPopBCIP(broadcastIP));
}
break; break;
case 50: case 50:
retPay->options.push_back(new DHCPopREQIP(ps2IP)); retPay->options.push_back(new DHCPopREQIP(ps2IP));

4
pcsx2/DEV9/InternalServers/DHCP_Server.h
View File

@ -24,8 +24,8 @@ namespace InternalServers
{ {
public: public:
PacketReader::IP::IP_Address ps2IP; PacketReader::IP::IP_Address ps2IP;
PacketReader::IP::IP_Address gateway; PacketReader::IP::IP_Address gateway{};
PacketReader::IP::IP_Address broadcastIP; PacketReader::IP::IP_Address broadcastIP{};
private: private:
std::function<void()> callback; std::function<void()> callback;