1 files changed, 31 insertions, 24 deletions

diff --git a/src/system/Resolver.cxx b/src/system/Resolver.cxx
index 5e6ea590b..0cfb754ec 100644
--- a/src/system/Resolver.cxx
+++ b/src/system/Resolver.cxx
@@ -22,11 +22,12 @@
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 
-#include <glib.h>
-
 #ifndef WIN32
 #include <sys/socket.h>
 #include <netdb.h>
+#ifdef HAVE_TCP
+#include <netinet/in.h>
+#endif
 #else
 #include <ws2tcpip.h>
 #include <winsock.h>
@@ -41,17 +42,17 @@
 
 const Domain resolver_domain("resolver");
 
-char *
-sockaddr_to_string(const struct sockaddr *sa, size_t length, Error &error)
+std::string
+sockaddr_to_string(const struct sockaddr *sa, size_t length)
 {
 #ifdef HAVE_UN
 	if (sa->sa_family == AF_UNIX) {
 		/* return path of UNIX domain sockets */
 		const sockaddr_un &s_un = *(const sockaddr_un *)sa;
 		if (length < sizeof(s_un) || s_un.sun_path[0] == 0)
-			return g_strdup("local");
+			return "local";
 
-		return g_strdup(s_un.sun_path);
+		return s_un.sun_path;
 	}
 #endif
 
@@ -80,17 +81,23 @@ sockaddr_to_string(const struct sockaddr *sa, size_t length, Error &error)
 
 	ret = getnameinfo(sa, length, host, sizeof(host), serv, sizeof(serv),
 			  NI_NUMERICHOST|NI_NUMERICSERV);
-	if (ret != 0) {
-		error.Set(resolver_domain, ret, gai_strerror(ret));
-		return NULL;
-	}
+	if (ret != 0)
+		return "unknown";
 
 #ifdef HAVE_IPV6
-	if (strchr(host, ':') != NULL)
-		return g_strconcat("[", host, "]:", serv, NULL);
+	if (strchr(host, ':') != NULL) {
+		std::string result("[");
+		result.append(host);
+		result.append("]:");
+		result.append(serv);
+		return result;
+	}
 #endif
 
-	return g_strconcat(host, ":", serv, NULL);
+	std::string result(host);
+	result.push_back(':');
+	result.append(serv);
+	return result;
 }
 
 struct addrinfo *
@@ -98,19 +105,19 @@ resolve_host_port(const char *host_port, unsigned default_port,
 		  int flags, int socktype,
 		  Error &error)
 {
-	char *p = g_strdup(host_port);
-	const char *host = p, *port = NULL;
+	std::string p(host_port);
+	const char *host = p.c_str(), *port = nullptr;
 
 	if (host_port[0] == '[') {
 		/* IPv6 needs enclosing square braces, to
 		   differentiate between IP colons and the port
 		   separator */
 
-		char *q = strchr(p + 1, ']');
-		if (q != NULL && q[1] == ':' && q[2] != 0) {
-			*q = 0;
+		size_t q = p.find(']', 1);
+		if (q != p.npos && p[q + 1] == ':' && p[q + 2] != 0) {
+			p[q] = 0;
+			port = host + q + 2;
 			++host;
-			port = q + 2;
 		}
 	}
 
@@ -118,10 +125,11 @@ resolve_host_port(const char *host_port, unsigned default_port,
 		/* port is after the colon, but only if it's the only
 		   colon (don't split IPv6 addresses) */
 
-		char *q = strchr(p, ':');
-		if (q != NULL && q[1] != 0 && strchr(q + 1, ':') == NULL) {
-			*q = 0;
-			port = q + 1;
+		auto q = p.find(':');
+		if (q != p.npos && p[q + 1] != 0 &&
+		    p.find(':', q + 1) == p.npos) {
+			p[q] = 0;
+			port = host + q + 1;
 		}
 	}
 
@@ -142,7 +150,6 @@ resolve_host_port(const char *host_port, unsigned default_port,
 
 	struct addrinfo *ai;
 	int ret = getaddrinfo(host, port, &hints, &ai);
-	g_free(p);
 	if (ret != 0) {
 		error.Format(resolver_domain, ret,
 			     "Failed to look up '%s': %s",