Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 09:03:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cr feedback

Browse source
This commit is contained in:
Howard Stearns 2019-07-01 15:23:00 -07:00
parent ce26611e1f
commit 36e526d1cd
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/platform/src/platform/backend/WINPlatform.cpp
View file

@ -78,12 +78,12 @@ void WINInstance::enumerateNics() {
// We can usually do better than the QNetworkInterface::humanReadableName() by // We can usually do better than the QNetworkInterface::humanReadableName() by
// matching up Iphlpapi.lib IP_ADAPTER_INFO by mac id. // matching up Iphlpapi.lib IP_ADAPTER_INFO by mac id.
ULONG buflen = sizeof(IP_ADAPTER_INFO); ULONG buflen = sizeof(IP_ADAPTER_INFO);
IP_ADAPTER_INFO *pAdapterInfo = (IP_ADAPTER_INFO *)malloc(buflen); IP_ADAPTER_INFO* pAdapterInfo = (IP_ADAPTER_INFO*) malloc(buflen);
// Size the buffer: // Size the buffer:
if (GetAdaptersInfo(pAdapterInfo, &buflen) == ERROR_BUFFER_OVERFLOW) { if (GetAdaptersInfo(pAdapterInfo, &buflen) == ERROR_BUFFER_OVERFLOW) {
free(pAdapterInfo); free(pAdapterInfo);
pAdapterInfo = (IP_ADAPTER_INFO *)malloc(buflen); pAdapterInfo = (IP_ADAPTER_INFO *) malloc(buflen);
} }
// Now get the data... // Now get the data...
@ -93,8 +93,8 @@ void WINInstance::enumerateNics() {
QString qtmac = nic[keys::nic::mac].get<std::string>().c_str(); QString qtmac = nic[keys::nic::mac].get<std::string>().c_str();
QString qtraw = qtmac.remove(QChar(':'), Qt::CaseInsensitive).toLower(); QString qtraw = qtmac.remove(QChar(':'), Qt::CaseInsensitive).toLower();
// ... and find the matching one in pAdapter: // ... and find the matching one in pAdapter:
for (IP_ADAPTER_INFO *pAdapter = pAdapterInfo; pAdapter; pAdapter = pAdapter->Next) { for (IP_ADAPTER_INFO* pAdapter = pAdapterInfo; pAdapter; pAdapter = pAdapter->Next) {
QByteArray wmac = QByteArray((const char *)(pAdapter->Address), pAdapter->AddressLength); QByteArray wmac = QByteArray((const char*) (pAdapter->Address), pAdapter->AddressLength);
QString wraw = wmac.toHex(); QString wraw = wmac.toHex();
if (qtraw == wraw) { if (qtraw == wraw) {
nic[keys::nic::name] = pAdapter->Description; nic[keys::nic::name] = pAdapter->Description;

2
libraries/platform/src/platform/backend/WINPlatform.h
View file

@ -19,7 +19,7 @@ namespace platform {
void enumerateGpus() override; void enumerateGpus() override;
void enumerateMemory() override; void enumerateMemory() override;
void enumerateComputer () override; void enumerateComputer () override;
void enumerateNics(); void enumerateNics() override;
}; };
} // namespace platform } // namespace platform