net/ToString: append port only if it is non-zero

This commit is contained in:
Max Kellermann 2023-09-18 11:10:20 +02:00
parent 5fd2fc77f3
commit 61c29473d3

View File

@ -72,20 +72,24 @@ ToString(SocketAddress address) noexcept
if (ret != 0) if (ret != 0)
return "unknown"; return "unknown";
if (serv[0] != 0 && (serv[0] != '0' || serv[1] != 0)) {
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (std::strchr(host, ':') != nullptr) { if (std::strchr(host, ':') != nullptr) {
std::string result("["); std::string result("[");
result.append(host); result.append(host);
result.append("]:"); result.append("]:");
result.append(serv);
return result;
}
#endif
std::string result(host);
result.push_back(':');
result.append(serv); result.append(serv);
return result; return result;
} }
#endif
std::string result(host); return host;
result.push_back(':');
result.append(serv);
return result;
} }
std::string std::string