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

network_interface: Cleanup code

This commit is contained in:
Morph 2021-08-21 10:48:15 -04:00
parent a32a7dacf4
commit 871e1c6315
1 changed files with 100 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,14 +37,18 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
AF_INET, GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_INCLUDE_GATEWAYS, AF_INET, GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_INCLUDE_GATEWAYS,
nullptr, adapter_addresses.data(), &buf_size); nullptr, adapter_addresses.data(), &buf_size);
if (ret == ERROR_BUFFER_OVERFLOW) { if (ret != ERROR_BUFFER_OVERFLOW) {
adapter_addresses.resize((buf_size / sizeof(IP_ADAPTER_ADDRESSES)) + 1);
} else {
break; break;
} }
adapter_addresses.resize((buf_size / sizeof(IP_ADAPTER_ADDRESSES)) + 1);
}
if (ret != NO_ERROR) {
LOG_ERROR(Network, "Failed to get network interfaces with GetAdaptersAddresses");
return {};
} }
if (ret == NO_ERROR) {
std::vector<NetworkInterface> result; std::vector<NetworkInterface> result;
for (auto current_address = adapter_addresses.data(); current_address != nullptr; for (auto current_address = adapter_addresses.data(); current_address != nullptr;
@ -77,7 +81,7 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
.sin_addr; .sin_addr;
} }
result.push_back(NetworkInterface{ result.emplace_back(NetworkInterface{
.name{Common::UTF16ToUTF8(std::wstring{current_address->FriendlyName})}, .name{Common::UTF16ToUTF8(std::wstring{current_address->FriendlyName})},
.ip_address{ip_addr}, .ip_address{ip_addr},
.subnet_mask = in_addr{.S_un{.S_addr{mask}}}, .subnet_mask = in_addr{.S_un{.S_addr{mask}}},
@ -85,25 +89,21 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
} }
return result; return result;
} else {
LOG_ERROR(Network, "Failed to get network interfaces with GetAdaptersAddresses");
return {};
}
} }
#else #else
std::vector<NetworkInterface> GetAvailableNetworkInterfaces() { std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
std::vector<NetworkInterface> result;
struct ifaddrs* ifaddr = nullptr; struct ifaddrs* ifaddr = nullptr;
if (getifaddrs(&ifaddr) != 0) { if (getifaddrs(&ifaddr) != 0) {
LOG_ERROR(Network, "Failed to get network interfaces with getifaddrs: {}", LOG_ERROR(Network, "Failed to get network interfaces with getifaddrs: {}",
std::strerror(errno)); std::strerror(errno));
return result; return {};
} }
std::vector<NetworkInterface> result;
for (auto ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next) { for (auto ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next) {
if (ifa->ifa_addr == nullptr || ifa->ifa_netmask == nullptr) { if (ifa->ifa_addr == nullptr || ifa->ifa_netmask == nullptr) {
continue; continue;
@ -117,9 +117,19 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
continue; continue;
} }
std::uint32_t gateway{0}; u32 gateway{};
std::ifstream file{"/proc/net/route"}; std::ifstream file{"/proc/net/route"};
if (file.is_open()) { if (!file.is_open()) {
LOG_ERROR(Network, "Failed to open \"/proc/net/route\"");
result.emplace_back(NetworkInterface{
.name{ifa->ifa_name},
.ip_address{Common::BitCast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr},
.subnet_mask{Common::BitCast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr},
.gateway{in_addr{.s_addr = gateway}}});
continue;
}
// ignore header // ignore header
file.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); file.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
@ -129,7 +139,7 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
for (std::string line; std::getline(file, line);) { for (std::string line; std::getline(file, line);) {
std::istringstream iss{line}; std::istringstream iss{line};
std::string iface_name{}; std::string iface_name;
iss >> iface_name; iss >> iface_name;
if (iface_name != ifa->ifa_name) { if (iface_name != ifa->ifa_name) {
continue; continue;
@ -137,7 +147,7 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
iss >> std::hex; iss >> std::hex;
std::uint32_t dest{0}; u32 dest{};
iss >> dest; iss >> dest;
if (dest != 0) { if (dest != 0) {
// not the default route // not the default route
@ -146,7 +156,7 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
iss >> gateway; iss >> gateway;
std::uint16_t flags{0}; u16 flags{};
iss >> flags; iss >> flags;
// flag RTF_GATEWAY (defined in <linux/route.h>) // flag RTF_GATEWAY (defined in <linux/route.h>)
@ -161,11 +171,8 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
if (!gateway_found) { if (!gateway_found) {
gateway = 0; gateway = 0;
} }
} else {
LOG_ERROR(Network, "Failed to open \"/proc/net/route\"");
}
result.push_back(NetworkInterface{ result.emplace_back(NetworkInterface{
.name{ifa->ifa_name}, .name{ifa->ifa_name},
.ip_address{Common::BitCast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr}, .ip_address{Common::BitCast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr},
.subnet_mask{Common::BitCast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr}, .subnet_mask{Common::BitCast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr},