Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Default to P2P/Parent's MAC address if the target MAC on sceNetAdhocMatchingSendData is 00:00:00:00:00:00 (need to confirm whether this is correct or an error should be returned instead)

Browse source
This commit is contained in:
ANR2ME 2020-09-02 03:33:06 +07:00
parent a76a5bdf56
commit 9c5f02fbf5
3 changed files with 65 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Core/HLE/proAdhoc.cpp
View file

@ -84,7 +84,7 @@ 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.
// Ignoring the 1st byte since there are games (ie. Gran Turismo) who tamper with the 1st byte of OUI to change the unicast/multicast bit
return (memcmp(((const char*)addr1)+1, ((const char*)addr2)+1, ETHER_ADDR_LEN-1) == 0);
}
@ -1916,6 +1916,10 @@ int initNetwork(SceNetAdhocctlAdhocId *adhoc_id){
}
}
bool isZeroMAC(const SceNetEtherAddr* addr) {
return (memcmp(addr->data, "\x00\x00\x00\x00\x00\x00", ETHER_ADDR_LEN) == 0);
}
bool isBroadcastMAC(const SceNetEtherAddr * addr) {
return (memcmp(addr->data, "\xFF\xFF\xFF\xFF\xFF\xFF", ETHER_ADDR_LEN) == 0);
}

7
Core/HLE/proAdhoc.h
View file

@ -1253,6 +1253,13 @@ int getPTPSocketCount();
*/
int initNetwork(SceNetAdhocctlAdhocId *adhocid);
/**
* Zero MAC Check
* @param addr To-be-checked MAC Address
* @return true if MAC is all zeroes
*/
bool isZeroMAC(const SceNetEtherAddr* addr);
/**
* Broadcast MAC Check
* @param addr To-be-checked MAC Address

72
Core/HLE/sceNetAdhoc.cpp
View file

@ -3799,6 +3799,7 @@ static int sceNetAdhocMatchingGetMembers(int matchingId, u32 sizeAddr, u32 buf)
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_INVALID_ID, "adhocmatching invalid id");
}
// Gran Turismo may replace the 1st bit of the 1st byte of MAC address's OUI with 0 (unicast bit), or replace the whole 6-bytes of MAC address with all 00 (invalid mac) for unknown reason
int sceNetAdhocMatchingSendData(int matchingId, const char *mac, int dataLen, u32 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)
@ -3819,23 +3820,59 @@ int sceNetAdhocMatchingSendData(int matchingId, const char *mac, int dataLen, u3
// Running Context
if (context->running)
{
// Find Target Peer
SceNetAdhocMatchingMemberInternal * peer = findPeer(context, (SceNetEtherAddr *)mac);
// Invalid Data Length
if (dataLen <=0 || dataAddr == 0)
// Invalid Data Length
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_INVALID_DATALEN, "invalid datalen");
// Found Peer
if (peer != NULL)
{
void * data = NULL;
if (Memory::IsValidAddress(dataAddr)) data = Memory::GetPointer(dataAddr);
void* data = NULL;
if (Memory::IsValidAddress(dataAddr)) data = Memory::GetPointer(dataAddr);
// Valid Data Length
if (dataLen > 0 && data != NULL)
// FIXME: If the target MAC is 00:00:00:00:00:00 (invalid mac) Should we default to P2P/Parent's MAC or return an Error?
if (isZeroMAC((const SceNetEtherAddr*)mac)) {
int sent = 0;
peerlock.lock();
// Iterate Peer List for Matching Target
SceNetAdhocMatchingMemberInternal* peer = context->peerlist;
for (; peer != NULL; peer = peer->next)
{
// Valid Peer Connection State
if (peer->state == PSP_ADHOC_MATCHING_PEER_PARENT || peer->state == PSP_ADHOC_MATCHING_PEER_P2P)
{
// Skip Busy peers
if (peer->sending)
continue;
// Mark Peer as Sending
peer->sending = 1;
// Send Data to Peer
sendBulkData(context, peer, dataLen, data);
sent++;
break;
}
}
peerlock.unlock();
if (sent == 0)
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_UNKNOWN_TARGET, "invalid target");
// Return Success
return 0;
}
else {
// Find Target Peer
SceNetAdhocMatchingMemberInternal* peer = findPeer(context, (SceNetEtherAddr*)mac);
// Found Peer
if (peer != NULL)
{
// Valid Peer Connection State
if (peer->state == PSP_ADHOC_MATCHING_PEER_PARENT || peer->state == PSP_ADHOC_MATCHING_PEER_CHILD || peer->state == PSP_ADHOC_MATCHING_PEER_P2P)
{
// Send in Progress
if (peer->sending) return ERROR_NET_ADHOC_MATCHING_DATA_BUSY;
if (peer->sending)
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_DATA_BUSY, "data busy");
// Mark Peer as Sending
peer->sending = 1;
@ -3848,31 +3885,28 @@ int sceNetAdhocMatchingSendData(int matchingId, const char *mac, int dataLen, u3
}
// Not connected / accepted
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_NOT_ESTABLISHED, "adhocmatching not established");
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_NOT_ESTABLISHED, "not established");
}
// Invalid Data Length
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_INVALID_DATALEN, "adhocmatching invalid datalen");
}
// Peer not found
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_UNKNOWN_TARGET, "adhocmatching unknown target");
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_UNKNOWN_TARGET, "unknown target");
}
// Context not running
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_NOT_RUNNING, "adhocmatching not running");
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_NOT_RUNNING, "not running");
}
// Invalid Matching ID
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_INVALID_ID, "adhocmatching invalid id");
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_INVALID_ID, "invalid id");
}
// Invalid Arguments
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_INVALID_ARG, "adhocmatching invalid arg");
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_INVALID_ARG, "invalid arg");
}
// Uninitialized Library
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_NOT_INITIALIZED, "adhocmatching not initialized");
return hleLogError(SCENET, ERROR_NET_ADHOC_MATCHING_NOT_INITIALIZED, "not initialized");
}
int sceNetAdhocMatchingAbortSendData(int matchingId, const char *mac) {