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

DEV9: Use const in AdapterUtils

This commit is contained in:
TheLastRar 2024-05-23 11:40:44 +01:00 committed by refractionpcsx2
parent 0856f3b223
commit f58ee161c7
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pcsx2/DEV9/AdapterUtils.cpp
View File

@ -257,7 +257,7 @@ bool AdapterUtils::GetAdapterAuto(Adapter* adapter, AdapterBuffer* buffer)
// AdapterMAC.
#ifdef _WIN32
std::optional<MAC_Address> AdapterUtils::GetAdapterMAC(Adapter* adapter)
std::optional<MAC_Address> AdapterUtils::GetAdapterMAC(const Adapter* adapter)
{
if (adapter != nullptr && adapter->PhysicalAddressLength == 6)
{
@ -269,7 +269,7 @@ std::optional<MAC_Address> AdapterUtils::GetAdapterMAC(Adapter* adapter)
return std::nullopt;
}
#else
std::optional<MAC_Address> AdapterUtils::GetAdapterMAC(Adapter* adapter)
std::optional<MAC_Address> AdapterUtils::GetAdapterMAC(const Adapter* adapter)
{
MAC_Address macAddr{};
#if defined(AF_LINK)
@ -335,7 +335,7 @@ std::optional<MAC_Address> AdapterUtils::GetAdapterMAC(Adapter* adapter)
// AdapterIP.
#ifdef _WIN32
std::optional<IP_Address> AdapterUtils::GetAdapterIP(Adapter* adapter)
std::optional<IP_Address> AdapterUtils::GetAdapterIP(const Adapter* adapter)
{
PIP_ADAPTER_UNICAST_ADDRESS address = nullptr;
if (adapter != nullptr)
@ -347,13 +347,13 @@ std::optional<IP_Address> AdapterUtils::GetAdapterIP(Adapter* adapter)
if (address != nullptr)
{
sockaddr_in* sockaddr = reinterpret_cast<sockaddr_in*>(address->Address.lpSockaddr);
const sockaddr_in* sockaddr = reinterpret_cast<sockaddr_in*>(address->Address.lpSockaddr);
return std::bit_cast<IP_Address>(sockaddr->sin_addr);
}
return std::nullopt;
}
#elif defined(__POSIX__)
std::optional<IP_Address> AdapterUtils::GetAdapterIP(Adapter* adapter)
std::optional<IP_Address> AdapterUtils::GetAdapterIP(const Adapter* adapter)
{
sockaddr_in* address = nullptr;
if (adapter != nullptr)
@ -371,7 +371,7 @@ std::optional<IP_Address> AdapterUtils::GetAdapterIP(Adapter* adapter)
// Gateways.
#ifdef _WIN32
std::vector<IP_Address> AdapterUtils::GetGateways(Adapter* adapter)
std::vector<IP_Address> AdapterUtils::GetGateways(const Adapter* adapter)
{
if (adapter == nullptr)
return {};
@ -383,7 +383,7 @@ std::vector<IP_Address> AdapterUtils::GetGateways(Adapter* adapter)
{
if (ReadAddressFamily(address->Address.lpSockaddr) == AF_INET)
{
sockaddr_in* sockaddr = reinterpret_cast<sockaddr_in*>(address->Address.lpSockaddr);
const sockaddr_in* sockaddr = reinterpret_cast<sockaddr_in*>(address->Address.lpSockaddr);
collection.push_back(std::bit_cast<IP_Address>(sockaddr->sin_addr));
}
address = address->Next;
@ -393,7 +393,7 @@ std::vector<IP_Address> AdapterUtils::GetGateways(Adapter* adapter)
}
#elif defined(__POSIX__)
#ifdef __linux__
std::vector<IP_Address> AdapterUtils::GetGateways(Adapter* adapter)
std::vector<IP_Address> AdapterUtils::GetGateways(const Adapter* adapter)
{
// /proc/net/route contains some information about gateway addresses,
// and separates the information about by each interface.
@ -419,15 +419,15 @@ std::vector<IP_Address> AdapterUtils::GetGateways(Adapter* adapter)
// Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT.
for (size_t i = 1; i < routeLines.size(); i++)
{
std::string line = routeLines[i];
const std::string line = routeLines[i];
if (line.rfind(adapter->ifa_name, 0) == 0)
{
std::vector<std::string_view> split = StringUtil::SplitString(line, '\t', true);
std::string gatewayIPHex{split[2]};
const std::vector<std::string_view> split = StringUtil::SplitString(line, '\t', true);
const std::string gatewayIPHex{split[2]};
// stoi assumes hex values are unsigned, but tries to store it in a signed int,
// this results in a std::out_of_range exception for addresses ending in a number > 128.
// We don't have a stoui for (unsigned int), so instead use stoul for (unsigned long).
u32 addressValue = static_cast<u32>(std::stoul(gatewayIPHex, 0, 16));
const u32 addressValue = static_cast<u32>(std::stoul(gatewayIPHex, 0, 16));
// Skip device routes without valid NextHop IP address.
if (addressValue != 0)
collection.push_back(std::bit_cast<IP_Address>(addressValue));
@ -436,7 +436,7 @@ std::vector<IP_Address> AdapterUtils::GetGateways(Adapter* adapter)
return collection;
}
#elif defined(__FreeBSD__) || defined(__APPLE__)
std::vector<IP_Address> AdapterUtils::GetGateways(Adapter* adapter)
std::vector<IP_Address> AdapterUtils::GetGateways(const Adapter* adapter)
{
if (adapter == nullptr)
return {};
@ -527,7 +527,7 @@ std::vector<IP_Address> AdapterUtils::GetGateways(Adapter* adapter)
// DNS.
#ifdef _WIN32
std::vector<IP_Address> AdapterUtils::GetDNS(Adapter* adapter)
std::vector<IP_Address> AdapterUtils::GetDNS(const Adapter* adapter)
{
if (adapter == nullptr)
return {};
@ -539,7 +539,7 @@ std::vector<IP_Address> AdapterUtils::GetDNS(Adapter* adapter)
{
if (ReadAddressFamily(address->Address.lpSockaddr) == AF_INET)
{
sockaddr_in* sockaddr = reinterpret_cast<sockaddr_in*>(address->Address.lpSockaddr);
const sockaddr_in* sockaddr = reinterpret_cast<sockaddr_in*>(address->Address.lpSockaddr);
collection.push_back(std::bit_cast<IP_Address>(sockaddr->sin_addr));
}
address = address->Next;
@ -548,7 +548,7 @@ std::vector<IP_Address> AdapterUtils::GetDNS(Adapter* adapter)
return collection;
}
#elif defined(__POSIX__)
std::vector<IP_Address> AdapterUtils::GetDNS(Adapter* adapter)
std::vector<IP_Address> AdapterUtils::GetDNS(const Adapter* adapter)
{
// On Linux and OSX, DNS is system wide, not adapter specific, so we can ignore the adapter parameter.
@ -579,13 +579,13 @@ std::vector<IP_Address> AdapterUtils::GetDNS(Adapter* adapter)
const IP_Address systemdDNS{{{127, 0, 0, 53}}};
for (size_t i = 1; i < serversLines.size(); i++)
{
std::string line = serversLines[i];
const std::string line = serversLines[i];
if (line.rfind("nameserver", 0) == 0)
{
std::vector<std::string_view> split = StringUtil::SplitString(line, '\t', true);
if (split.size() == 1)
split = StringUtil::SplitString(line, ' ', true);
std::string dns{split[1]};
const std::string dns{split[1]};
IP_Address address;
if (inet_pton(AF_INET, dns.c_str(), &address) != 1)

8
pcsx2/DEV9/AdapterUtils.h
View File

@ -47,9 +47,9 @@ namespace AdapterUtils
bool GetAdapter(const std::string& name, Adapter* adapter, AdapterBuffer* buffer);
bool GetAdapterAuto(Adapter* adapter, AdapterBuffer* buffer);
std::optional<PacketReader::MAC_Address> GetAdapterMAC(Adapter* adapter);
std::optional<PacketReader::IP::IP_Address> GetAdapterIP(Adapter* adapter);
std::optional<PacketReader::MAC_Address> GetAdapterMAC(const Adapter* adapter);
std::optional<PacketReader::IP::IP_Address> GetAdapterIP(const Adapter* adapter);
// Mask.
std::vector<PacketReader::IP::IP_Address> GetGateways(Adapter* adapter);
std::vector<PacketReader::IP::IP_Address> GetDNS(Adapter* adapter);
std::vector<PacketReader::IP::IP_Address> GetGateways(const Adapter* adapter);
std::vector<PacketReader::IP::IP_Address> GetDNS(const Adapter* adapter);
}; // namespace AdapterUtils