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

DEV9: Retry if GetAdaptersAddresses() returns ERROR_BUFFER_OVERFLOW

This commit is contained in:
TheLastRar 2021-02-08 16:03:19 +00:00 committed by refractionpcsx2
parent 2473d626d8
commit c634f2e6e3
1 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pcsx2/DEV9/pcap_io.cpp
View File

@ -51,14 +51,18 @@ mac_address ps2_mac;
mac_address host_mac; mac_address host_mac;
#ifdef _WIN32 #ifdef _WIN32
int GetAdapterFromPcapName(char* adapter, PIP_ADAPTER_ADDRESSES retAdapterInfo) //IP_ADAPTER_ADDRESSES is a structure that contains ptrs to data in other regions
//of the buffer, se we need to return both so the caller can free the buffer
//after it's finished reading the needed data from IP_ADAPTER_ADDRESSES
bool GetWin32Adapter(const char* name, PIP_ADAPTER_ADDRESSES adapter, PIP_ADAPTER_ADDRESSES* buffer)
{ {
const int guidindex = strlen("\\Device\\NPF_"); const int guidindex = strlen("\\Device\\NPF_");
IP_ADAPTER_ADDRESSES AdapterInfo[128]; int neededSize = 128;
PIP_ADAPTER_ADDRESSES AdapterInfo = new IP_ADAPTER_ADDRESSES[neededSize];
ULONG dwBufLen = sizeof(IP_ADAPTER_ADDRESSES) * neededSize;
PIP_ADAPTER_ADDRESSES pAdapterInfo; PIP_ADAPTER_ADDRESSES pAdapterInfo;
ULONG dwBufLen = sizeof(AdapterInfo);
DWORD dwStatus = GetAdaptersAddresses( DWORD dwStatus = GetAdaptersAddresses(
AF_UNSPEC, AF_UNSPEC,
@ -66,23 +70,42 @@ int GetAdapterFromPcapName(char* adapter, PIP_ADAPTER_ADDRESSES retAdapterInfo)
NULL, NULL,
AdapterInfo, AdapterInfo,
&dwBufLen); &dwBufLen);
if (dwStatus == ERROR_BUFFER_OVERFLOW)
{
DevCon.WriteLn("GetWin32Adapter() buffer too small, resizing");
delete[] AdapterInfo;
neededSize = dwBufLen / sizeof(IP_ADAPTER_ADDRESSES) + 1;
AdapterInfo = new IP_ADAPTER_ADDRESSES[neededSize];
dwBufLen = sizeof(IP_ADAPTER_ADDRESSES) * neededSize;
DevCon.WriteLn("New size %i", neededSize);
DWORD dwStatus = GetAdaptersAddresses(
AF_UNSPEC,
GAA_FLAG_INCLUDE_PREFIX,
NULL,
AdapterInfo,
&dwBufLen);
}
if (dwStatus != ERROR_SUCCESS) if (dwStatus != ERROR_SUCCESS)
return 0; return false;
pAdapterInfo = AdapterInfo; pAdapterInfo = AdapterInfo;
do do
{ {
if (0 == strcmp(pAdapterInfo->AdapterName, &adapter[guidindex])) if (0 == strcmp(pAdapterInfo->AdapterName, &name[guidindex]))
{ {
*retAdapterInfo = *pAdapterInfo; *adapter = *pAdapterInfo;
return 1; *buffer = AdapterInfo;
return true;
} }
pAdapterInfo = pAdapterInfo->Next; pAdapterInfo = pAdapterInfo->Next;
} while (pAdapterInfo); } while (pAdapterInfo);
return 0; delete[] AdapterInfo;
return false;
} }
#endif #endif
@ -92,9 +115,14 @@ int GetMACAddress(char* adapter, mac_address* addr)
int retval = 0; int retval = 0;
#ifdef _WIN32 #ifdef _WIN32
IP_ADAPTER_ADDRESSES adapterInfo; IP_ADAPTER_ADDRESSES adapterInfo;
PIP_ADAPTER_ADDRESSES buffer;
if (GetAdapterFromPcapName(adapter, &adapterInfo)) if (GetWin32Adapter(adapter, &adapterInfo, &buffer))
{
memcpy(addr, adapterInfo.PhysicalAddress, 6); memcpy(addr, adapterInfo.PhysicalAddress, 6);
delete[] buffer;
retval = 1;
}
#elif defined(__linux__) #elif defined(__linux__)
struct ifreq ifr; struct ifreq ifr;
@ -377,9 +405,13 @@ std::vector<AdapterEntry> PCAPAdapter::GetAdapters()
entry.guid = std::wstring(wEth); entry.guid = std::wstring(wEth);
IP_ADAPTER_ADDRESSES adapterInfo; IP_ADAPTER_ADDRESSES adapterInfo;
PIP_ADAPTER_ADDRESSES buffer;
if (GetAdapterFromPcapName(d->name, &adapterInfo)) if (GetWin32Adapter(d->name, &adapterInfo, &buffer))
{
entry.name = std::wstring(adapterInfo.FriendlyName); entry.name = std::wstring(adapterInfo.FriendlyName);
delete[] buffer;
}
else else
{ {
//have to use description //have to use description