armsx/ARMSX3
0
0
Fork 0
mirror of https://github.com/ARMSX2/ARMSX3.git synced 2026-08-24 16:58:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

NP: derive an Ethernet address on Android instead of failing

Browse Source 
discover_ether_address() reads the MAC with SIOCGIFHWADDR. Android has not let an
app do that since Android 6 and enforces it hard from 10 -- the ioctl returns
EPERM and /sys/class/net/*/address is unreadable -- so on every modern Android
device that branch failed, np_handler logged

    NPHandler: Failed to discover ethernet or ip address!

and gave up. That leaves the network stack unidentified and blocks RPCN and any
game that asks it who it is. Reported as issue #79 against two unrelated titles,
with network settings that looked correct and could not have helped, because
nothing exposed in them reaches this.

The IP half was never the problem: it learns the local address from a UDP connect
to 8.8.8.8, which is a routing lookup and sends nothing.

Derive the address from Console PSID, exactly as the derive_mac_from_psid path at
the top of the same function already does. Nothing validates it against hardware
-- it identifies the console to the network stack and to peers -- and a locally
administered address is the correct thing to present when the platform refuses
the real one. Console PSID defaults to a per-install random value, so two users
do not end up sharing one.

Tried after the ioctl rather than in place of it, so a device or ROM that does
answer still uses its own.
This commit is contained in:
jpolo1224
2026-08-21 09:30:04 -04:00
parent 0262053a91
commit b2caae9da2
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/NP/np_handler.cpp
+28
View File
@@ -697,6 +697,34 @@ namespace np
}
#endif
#ifdef __ANDROID__
// Android has not let an app read a MAC address since Android 6 and enforces it hard
// from 10: SIOCGIFHWADDR above returns EPERM and /sys/class/net/*/address is
// unreadable. So that branch cannot succeed here, discover_ether_address() always
// failed, and np_handler answered "Failed to discover ethernet or ip address!" -- which
// leaves the network stack unidentified and blocks RPCN and any game that asks it who
// it is. Reported as issue #79, where the network settings looked correct and nothing
// in them could have helped.
//
// Derive one, exactly as the derive_mac_from_psid path at the top of this function
// does. Nothing validates this against real hardware: it identifies the console to the
// network stack and to peers, and a locally administered address is the right thing to
// present when the platform will not hand over the real one. Console PSID defaults to a
// per-install random value, so two users do not collide.
//
// Tried after the ioctl rather than instead of it, so a device or ROM that does answer
// still gets its own address.
{
const u128 psid = g_cfg.sys.console_psid;
memcpy(ether_address.data(), &psid, 6);
ether_address[0] &= 0xFE; // Not a multicast address
ether_address[0] |= 0x02; // Locally administered
nph_log.notice("Derived the Ethernet address from Console PSID: the platform does not expose one.");
return true;
}
#endif
return false;
}