Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Ignores the 1st byte of MAC address when comparing, since there might be games (ie. Gran Turismo) that tries to tamper/change the 1st byte during multiplayer upon use.

Browse Source
This commit is contained in:
ANR2ME 2020-09-02 00:21:44 +07:00
parent 0dcaeb7841
commit a76a5bdf56
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Core/HLE/proAdhoc.cpp
View File

@ -83,11 +83,16 @@ SockAddrIN4 g_localhostIP;
sockaddr LocalIP;
int defaultWlanChannel = PSP_SYSTEMPARAM_ADHOC_CHANNEL_1; // Don't put 0(Auto) here, it needed to be a valid/actual channel number
bool isMacMatch(const SceNetEtherAddr* addr1, const SceNetEtherAddr* addr2) {
// Ignoring the 1st byte since there are games (ie. Gran Turismo) who tamper with the 1st byte (as some kind of protection?). Using only the last 4-bytes might be sufficient tho, since the first 3-bytes are manufacturer Id.
return (memcmp(((const char*)addr1)+1, ((const char*)addr2)+1, ETHER_ADDR_LEN-1) == 0);
}
bool isLocalMAC(const SceNetEtherAddr * addr) {
SceNetEtherAddr saddr;
getLocalMac(&saddr);
return (memcmp((const void*)addr, (const void*)&saddr, ETHER_ADDR_LEN) == 0);
return isMacMatch(addr, &saddr);
}
bool isPDPPortInUse(uint16_t port) {
@ -193,7 +198,7 @@ SceNetAdhocctlPeerInfo * findFriend(SceNetEtherAddr * MAC) {
// Iterate Friends
for (; peer != NULL; peer = peer->next) {
if (IsMatch(peer->mac_addr, *MAC)) break;
if (isMacMatch(&peer->mac_addr, MAC)) break;
}
// Return found friend
@ -262,7 +267,7 @@ SceNetAdhocctlScanInfo * findGroup(SceNetEtherAddr * MAC) {
// Iterate Groups
for (; group != NULL; group = group->next) {
if (IsMatch(group->bssid.mac_addr, *MAC)) break;
if (isMacMatch(&group->bssid.mac_addr, MAC)) break;
}
// Return found group
@ -533,7 +538,7 @@ SceNetAdhocMatchingMemberInternal * findPeer(SceNetAdhocMatchingContext * contex
for (; peer != NULL; peer = peer->next)
{
// Found Peer in List
if (memcmp(&peer->mac, mac, sizeof(SceNetEtherAddr)) == 0)
if (isMacMatch(&peer->mac, mac))
{
// Return Peer Pointer
return peer;
@ -1958,7 +1963,7 @@ bool resolveMAC(SceNetEtherAddr * mac, uint32_t * ip) {
SceNetEtherAddr localMac;
getLocalMac(&localMac);
// Local MAC Requested
if (memcmp(&localMac, mac, sizeof(SceNetEtherAddr)) == 0) {
if (isMacMatch(&localMac, mac)) {
// Get Local IP Address
sockaddr_in sockAddr;
getLocalIp(&sockAddr);
@ -1975,7 +1980,7 @@ bool resolveMAC(SceNetEtherAddr * mac, uint32_t * ip) {
// Iterate Peers
for (; peer != NULL; peer = peer->next) {
// Found Matching Peer
if (memcmp(&peer->mac_addr, mac, sizeof(SceNetEtherAddr)) == 0) {
if (isMacMatch(&peer->mac_addr, mac)) {
// Copy Data
*ip = peer->ip_addr;

9
Core/HLE/proAdhoc.h
View File

@ -857,10 +857,17 @@ bool SetMatchingInCallback(SceNetAdhocMatchingContext* context, bool IsInCB);
int IsAdhocctlInCallback();
int SetAdhocctlInCallback(bool IsInCB);
/**
* Compare MAC Addresses
* @param addr1 & addr2 To-be-compared MAC Address
* @return True if both matched
*/
bool isMacMatch(const SceNetEtherAddr* addr1, const SceNetEtherAddr* addr2);
/**
* Local MAC Check
* @param saddr To-be-checked MAC Address
* @return 1 if valid or... 0
* @return True if it's local mac
*/
bool isLocalMAC(const SceNetEtherAddr * addr);

6
Core/HLE/sceNetAdhoc.cpp
View File

@ -1381,7 +1381,7 @@ static int sceNetAdhocctlGetNameByAddr(const char *mac, u32 nameAddr) {
getLocalMac(&localmac);
// Local MAC Matches
if (memcmp(&localmac, mac, sizeof(SceNetEtherAddr)) == 0)
if (isMacMatch(&localmac, (const SceNetEtherAddr*)mac))
{
// Write Data
*nickname = parameter.nickname;
@ -1402,7 +1402,7 @@ static int sceNetAdhocctlGetNameByAddr(const char *mac, u32 nameAddr) {
for (; peer != NULL; peer = peer->next)
{
// Match found
if (memcmp(&peer->mac_addr, mac, sizeof(SceNetEtherAddr)) == 0)
if (isMacMatch(&peer->mac_addr, (const SceNetEtherAddr*)mac))
{
// Write Data
*nickname = peer->nickname;
@ -3800,7 +3800,7 @@ static int sceNetAdhocMatchingGetMembers(int matchingId, u32 sizeAddr, u32 buf)
}
int sceNetAdhocMatchingSendData(int matchingId, const char *mac, int dataLen, u32 dataAddr) {
WARN_LOG(SCENET, "UNTESTED sceNetAdhocMatchingSendData(%i, %s, %i, %08x)", matchingId, mac2str((SceNetEtherAddr*)mac).c_str(), dataLen, dataAddr);
WARN_LOG(SCENET, "UNTESTED sceNetAdhocMatchingSendData(%i, %s, %i, %08x) at %08x", matchingId, mac2str((SceNetEtherAddr*)mac).c_str(), dataLen, dataAddr, currentMIPS->pc);
if (!g_Config.bEnableWlan)
return -1;