notsoyuzu
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

network: narrow down scope of "result" in win32 code for 

GetAvailableNetworkInterfaces
This commit is contained in:
Sönke Holz 2021-08-13 00:37:03 +02:00
parent 04ec426201
commit 8513e59431
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/network/network_interface.cpp
View File

@ -22,8 +22,6 @@ namespace Network {
#ifdef _WIN32 #ifdef _WIN32
std::vector<NetworkInterface> GetAvailableNetworkInterfaces() { std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
std::vector<NetworkInterface> result;
std::vector<u8> adapter_addresses_raw; std::vector<u8> adapter_addresses_raw;
auto adapter_addresses = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(adapter_addresses_raw.data()); auto adapter_addresses = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(adapter_addresses_raw.data());
DWORD ret = ERROR_BUFFER_OVERFLOW; DWORD ret = ERROR_BUFFER_OVERFLOW;
@ -44,6 +42,8 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
} }
if (ret == NO_ERROR) { if (ret == NO_ERROR) {
std::vector<NetworkInterface> result;
for (auto current_address = adapter_addresses; current_address != nullptr; for (auto current_address = adapter_addresses; current_address != nullptr;
current_address = current_address->Next) { current_address = current_address->Next) {
if (current_address->FirstUnicastAddress == nullptr || if (current_address->FirstUnicastAddress == nullptr ||
@ -63,11 +63,12 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
.name{Common::UTF16ToUTF8(std::wstring{current_address->FriendlyName})}, .name{Common::UTF16ToUTF8(std::wstring{current_address->FriendlyName})},
.ip_address{ip_addr}}); .ip_address{ip_addr}});
} }
return result;
} else { } else {
LOG_ERROR(Network, "Failed to get network interfaces with GetAdaptersAddresses"); LOG_ERROR(Network, "Failed to get network interfaces with GetAdaptersAddresses");
return {};
} }
return result;
} }
#else #else