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

DEV9: Avoid using a netmask of 255.255.255.255

This commit is contained in:
TheLastRar 2024-11-18 02:39:21 +00:00
parent 405921110d
commit 53048f243f
2 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,14 +141,34 @@ namespace InternalServers
* Some VPN adapters will present a subnet mask of 255.255.255.255 and omit setting a gateway. * 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. * 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. * 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 possible hackfix was to set the gateway to the PS2 IP, however, some software rejects this.
* A side effect of this is that outbound packets will have the src and dst mac be identical. * Thus the only solution is to expand the netmask and add a fake gateway using the other IP.
* This is a mostly PCAP exclusive issue, I've only seen such networks with VPN devices, * 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. * 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. * Sockets (currently) uses its own internal network, and thus would be unaffected.
*/ */
else if (netmask == IP_Address{{{255, 255, 255, 255}}}) else if (netmask == IP_Address{{{255, 255, 255, 255}}})
gateway = ps2IP; {
// Expand the netmask to allow for a gateway
netmask = {{{255, 255, 255, 252}}};
// Need to ensure our IP isn't the broadcast IP
while (true)
{
// Shift is busted
const IP_Address bc = ps2IP | ~netmask;
if (ps2IP == bc)
netmask.integer = htonl(ntohl(netmask.integer) << 1);
else
break;
}
// Pick a free IP for our gateway
gateway = (ps2IP & netmask);
gateway.integer = htonl(ntohl(gateway.integer) + 1);
while (gateway == ps2IP)
gateway.integer = htonl(ntohl(gateway.integer) + 1);
}
} }
#ifdef _WIN32 #ifdef _WIN32
@ -192,7 +212,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 && parNetmask != IP_Address{{{255, 255, 255, 255}}}) if (parNetmask.integer != 0)
{ {
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]));

25
pcsx2/DEV9/PacketReader/IP/IP_Address.h
View File

@ -17,5 +17,30 @@ namespace PacketReader::IP
bool operator==(const IP_Address& other) const { return this->integer == other.integer; } bool operator==(const IP_Address& other) const { return this->integer == other.integer; }
bool operator!=(const IP_Address& other) const { return this->integer != other.integer; } bool operator!=(const IP_Address& other) const { return this->integer != other.integer; }
IP_Address operator~() const
{
IP_Address ret;
ret.integer = ~this->integer;
return ret;
}
IP_Address operator&(const IP_Address& other) const
{
IP_Address ret;
ret.integer = this->integer & other.integer;
return ret;
}
IP_Address operator|(const IP_Address& other) const
{
IP_Address ret;
ret.integer = this->integer | other.integer;
return ret;
}
IP_Address operator^(const IP_Address& other) const
{
IP_Address ret;
ret.integer = this->integer ^ other.integer;
return ret;
}
}; };
} // namespace PacketReader::IP } // namespace PacketReader::IP