summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/network/core/address.cpp24
-rw-r--r--src/network/core/address.h23
-rw-r--r--src/network/core/udp.cpp6
3 files changed, 26 insertions, 27 deletions
diff --git a/src/network/core/address.cpp b/src/network/core/address.cpp
index d3e373ef7..d40a72420 100644
--- a/src/network/core/address.cpp
+++ b/src/network/core/address.cpp
@@ -23,11 +23,13 @@ static const int DEFAULT_CONNECT_TIMEOUT_SECONDS = 3; ///< Allow connect() three
*/
const char *NetworkAddress::GetHostname()
{
- if (StrEmpty(this->hostname) && this->address.ss_family != AF_UNSPEC) {
+ if (this->hostname.empty() && this->address.ss_family != AF_UNSPEC) {
assert(this->address_length != 0);
- getnameinfo((struct sockaddr *)&this->address, this->address_length, this->hostname, sizeof(this->hostname), nullptr, 0, NI_NUMERICHOST);
+ char buffer[NETWORK_HOSTNAME_LENGTH];
+ getnameinfo((struct sockaddr *)&this->address, this->address_length, buffer, sizeof(buffer), nullptr, 0, NI_NUMERICHOST);
+ this->hostname = buffer;
}
- return this->hostname;
+ return this->hostname.c_str();
}
/**
@@ -234,32 +236,32 @@ SOCKET NetworkAddress::Resolve(int family, int socktype, int flags, SocketList *
/* Setting both hostname to nullptr and port to 0 is not allowed.
* As port 0 means bind to any port, the other must mean that
* we want to bind to 'all' IPs. */
- if (StrEmpty(this->hostname) && this->address_length == 0 && this->GetPort() == 0) {
+ if (this->hostname.empty() && this->address_length == 0 && this->GetPort() == 0) {
reset_hostname = true;
int fam = this->address.ss_family;
if (fam == AF_UNSPEC) fam = family;
- strecpy(this->hostname, fam == AF_INET ? "0.0.0.0" : "::", lastof(this->hostname));
+ this->hostname = fam == AF_INET ? "0.0.0.0" : "::";
}
static bool _resolve_timeout_error_message_shown = false;
auto start = std::chrono::steady_clock::now();
- int e = getaddrinfo(StrEmpty(this->hostname) ? nullptr : this->hostname, port_name, &hints, &ai);
+ int e = getaddrinfo(this->hostname.empty() ? nullptr : this->hostname.c_str(), port_name, &hints, &ai);
auto end = std::chrono::steady_clock::now();
std::chrono::seconds duration = std::chrono::duration_cast<std::chrono::seconds>(end - start);
if (!_resolve_timeout_error_message_shown && duration >= std::chrono::seconds(5)) {
DEBUG(net, 0, "getaddrinfo for hostname \"%s\", port %s, address family %s and socket type %s took %i seconds",
- this->hostname, port_name, AddressFamilyAsString(family), SocketTypeAsString(socktype), (int)duration.count());
+ this->hostname.c_str(), port_name, AddressFamilyAsString(family), SocketTypeAsString(socktype), (int)duration.count());
DEBUG(net, 0, " this is likely an issue in the DNS name resolver's configuration causing it to time out");
_resolve_timeout_error_message_shown = true;
}
- if (reset_hostname) strecpy(this->hostname, "", lastof(this->hostname));
+ if (reset_hostname) this->hostname.clear();
if (e != 0) {
if (func != ResolveLoopProc) {
DEBUG(net, 0, "getaddrinfo for hostname \"%s\", port %s, address family %s and socket type %s failed: %s",
- this->hostname, port_name, AddressFamilyAsString(family), SocketTypeAsString(socktype), FS2OTTD(gai_strerror(e)).c_str());
+ this->hostname.c_str(), port_name, AddressFamilyAsString(family), SocketTypeAsString(socktype), FS2OTTD(gai_strerror(e)).c_str());
}
return INVALID_SOCKET;
}
@@ -442,11 +444,11 @@ void NetworkAddress::Listen(int socktype, SocketList *sockets)
{
assert(sockets != nullptr);
- /* Setting both hostname to nullptr and port to 0 is not allowed.
+ /* Setting both hostname to "" and port to 0 is not allowed.
* As port 0 means bind to any port, the other must mean that
* we want to bind to 'all' IPs. */
if (this->address_length == 0 && this->address.ss_family == AF_UNSPEC &&
- StrEmpty(this->hostname) && this->GetPort() == 0) {
+ this->hostname.empty() && this->GetPort() == 0) {
this->Resolve(AF_INET, socktype, AI_ADDRCONFIG | AI_PASSIVE, sockets, ListenLoopProc);
this->Resolve(AF_INET6, socktype, AI_ADDRCONFIG | AI_PASSIVE, sockets, ListenLoopProc);
} else {
diff --git a/src/network/core/address.h b/src/network/core/address.h
index 65546818b..b4364c95a 100644
--- a/src/network/core/address.h
+++ b/src/network/core/address.h
@@ -28,10 +28,10 @@ typedef SmallMap<NetworkAddress, SOCKET> SocketList; ///< Type for a mapping
*/
class NetworkAddress {
private:
- char hostname[NETWORK_HOSTNAME_LENGTH]; ///< The hostname
- int address_length; ///< The length of the resolved address
- sockaddr_storage address; ///< The resolved address
- bool resolved; ///< Whether the address has been (tried to be) resolved
+ std::string hostname; ///< The hostname
+ int address_length; ///< The length of the resolved address
+ sockaddr_storage address; ///< The resolved address
+ bool resolved; ///< Whether the address has been (tried to be) resolved
/**
* Helper function to resolve something to a socket.
@@ -52,7 +52,6 @@ public:
address(address),
resolved(address_length != 0)
{
- *this->hostname = '\0';
}
/**
@@ -64,7 +63,6 @@ public:
address_length(address_length),
resolved(address_length != 0)
{
- *this->hostname = '\0';
memset(&this->address, 0, sizeof(this->address));
memcpy(&this->address, address, address_length);
}
@@ -75,16 +73,15 @@ public:
* @param port the port
* @param family the address family
*/
- NetworkAddress(const char *hostname = "", uint16 port = 0, int family = AF_UNSPEC) :
+ NetworkAddress(std::string_view hostname = "", uint16 port = 0, int family = AF_UNSPEC) :
address_length(0),
resolved(false)
{
- /* Also handle IPv6 bracket enclosed hostnames */
- if (StrEmpty(hostname)) hostname = "";
- if (*hostname == '[') hostname++;
- strecpy(this->hostname, StrEmpty(hostname) ? "" : hostname, lastof(this->hostname));
- char *tmp = strrchr(this->hostname, ']');
- if (tmp != nullptr) *tmp = '\0';
+ if (!hostname.empty() && hostname.front() == '[' && hostname.back() == ']') {
+ hostname.remove_prefix(1);
+ hostname.remove_suffix(1);
+ }
+ this->hostname = hostname;
memset(&this->address, 0, sizeof(this->address));
this->address.ss_family = family;
diff --git a/src/network/core/udp.cpp b/src/network/core/udp.cpp
index e7b99a53e..c4d448f26 100644
--- a/src/network/core/udp.cpp
+++ b/src/network/core/udp.cpp
@@ -28,11 +28,11 @@ NetworkUDPSocketHandler::NetworkUDPSocketHandler(NetworkAddressList *bind)
this->bind.push_back(addr);
}
} else {
- /* As hostname nullptr and port 0/nullptr don't go well when
+ /* As an empty hostname and port 0 don't go well when
* resolving it we need to add an address for each of
* the address families we support. */
- this->bind.emplace_back(nullptr, 0, AF_INET);
- this->bind.emplace_back(nullptr, 0, AF_INET6);
+ this->bind.emplace_back("", 0, AF_INET);
+ this->bind.emplace_back("", 0, AF_INET6);
}
}
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-23 08:52:31 +0000