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

DEV9: Match Win32 adapter with Pcap adapter using GUID 

When getting the source mac to generate the PS2 mac
This commit is contained in:
TheLastRar 2021-01-12 10:18:32 +00:00 committed by refractionpcsx2
parent 1144cc9ad9
commit 31606db6fe
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pcsx2/DEV9/pcap_io.cpp
View File

@ -45,16 +45,14 @@ extern u8 eeprom[];
char namebuff[256]; char namebuff[256];
// Fetches the MAC address and prints it
int GetMACAddress(char* adapter, mac_address* addr)
{
int retval = 0;
#ifdef _WIN32 #ifdef _WIN32
static IP_ADAPTER_ADDRESSES AdapterInfo[128]; int GetAdapterFromPcapName(char* adapter, PIP_ADAPTER_ADDRESSES retAdapterInfo)
{
const int guidindex = strlen("\\Device\\NPF_");
static PIP_ADAPTER_ADDRESSES pAdapterInfo; IP_ADAPTER_ADDRESSES AdapterInfo[128];
PIP_ADAPTER_ADDRESSES pAdapterInfo;
ULONG dwBufLen = sizeof(AdapterInfo); ULONG dwBufLen = sizeof(AdapterInfo);
DWORD dwStatus = GetAdaptersAddresses( DWORD dwStatus = GetAdaptersAddresses(
@ -68,29 +66,31 @@ int GetMACAddress(char* adapter, mac_address* addr)
pAdapterInfo = AdapterInfo; pAdapterInfo = AdapterInfo;
char adapter_desc[128] = "";
// Must get friendly description from the cryptic adapter name
for (int ii = 0; ii < pcap_io_get_dev_num(); ii++)
if (0 == strcmp(pcap_io_get_dev_name(ii), adapter))
{
strcpy(adapter_desc, pcap_io_get_dev_desc(ii));
break;
}
wchar_t wadapter[128];
std::mbstowcs(wadapter, adapter_desc, 128);
do do
{ {
if (0 == wcscmp(pAdapterInfo->Description, wadapter)) if (0 == strcmp(pAdapterInfo->AdapterName, &adapter[guidindex]))
{ {
memcpy(addr, pAdapterInfo->PhysicalAddress, 6); *retAdapterInfo = *pAdapterInfo;
return 1; return 1;
} }
pAdapterInfo = pAdapterInfo->Next; pAdapterInfo = pAdapterInfo->Next;
} while (pAdapterInfo); } while (pAdapterInfo);
return 0;
}
#endif
// Fetches the MAC address and prints it
int GetMACAddress(char* adapter, mac_address* addr)
{
int retval = 0;
#ifdef _WIN32
IP_ADAPTER_ADDRESSES adapterInfo;
if (GetAdapterFromPcapName(adapter, &adapterInfo))
memcpy(addr, adapterInfo.PhysicalAddress, 6);
#elif defined(__linux__) #elif defined(__linux__)
struct ifreq ifr; struct ifreq ifr;
int fd = socket(AF_INET, SOCK_DGRAM, 0); int fd = socket(AF_INET, SOCK_DGRAM, 0);

2
pcsx2/DEV9/pcap_io.h
View File

@ -160,10 +160,10 @@ int pcap_io_init(char *adapter);
int pcap_io_send(void* packet, int plen); int pcap_io_send(void* packet, int plen);
int pcap_io_recv(void* packet, int max_len); int pcap_io_recv(void* packet, int max_len);
void pcap_io_close(); void pcap_io_close();
*/
int pcap_io_get_dev_num(); int pcap_io_get_dev_num();
char* pcap_io_get_dev_desc(int num); char* pcap_io_get_dev_desc(int num);
char* pcap_io_get_dev_name(int num); char* pcap_io_get_dev_name(int num);
*/
#ifdef _WIN32 #ifdef _WIN32
bool load_pcap(); bool load_pcap();