system/resolver: convert to C++

1 files changed, 0 insertions, 140 deletions

diff --git a/src/system/resolver.c b/src/system/resolver.c
deleted file mode 100644
index 243b7cd02..000000000
--- a/src/system/resolver.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "resolver.h"
-
-#ifndef G_OS_WIN32
-#include <sys/socket.h>
-#include <netdb.h>
-#else /* G_OS_WIN32 */
-#include <ws2tcpip.h>
-#include <winsock.h>
-#endif /* G_OS_WIN32 */
-
-#include <string.h>
-
-char *
-sockaddr_to_string(const struct sockaddr *sa, size_t length, GError **error)
-{
-#if defined(HAVE_IPV6) && defined(IN6_IS_ADDR_V4MAPPED)
-	const struct sockaddr_in6 *a6 = (const struct sockaddr_in6 *)sa;
-	struct sockaddr_in a4;
-#endif
-	int ret;
-	char host[NI_MAXHOST], serv[NI_MAXSERV];
-
-#if defined(HAVE_IPV6) && defined(IN6_IS_ADDR_V4MAPPED)
-	if (sa->sa_family == AF_INET6 &&
-	    IN6_IS_ADDR_V4MAPPED(&a6->sin6_addr)) {
-		/* convert "::ffff:127.0.0.1" to "127.0.0.1" */
-
-		memset(&a4, 0, sizeof(a4));
-		a4.sin_family = AF_INET;
-		memcpy(&a4.sin_addr, ((const char *)&a6->sin6_addr) + 12,
-		       sizeof(a4.sin_addr));
-		a4.sin_port = a6->sin6_port;
-
-		sa = (const struct sockaddr *)&a4;
-		length = sizeof(a4);
-	}
-#endif
-
-	ret = getnameinfo(sa, length, host, sizeof(host), serv, sizeof(serv),
-			  NI_NUMERICHOST|NI_NUMERICSERV);
-	if (ret != 0) {
-		g_set_error(error, g_quark_from_static_string("netdb"), ret,
-			    "%s", gai_strerror(ret));
-		return NULL;
-	}
-
-#ifdef HAVE_UN
-	if (sa->sa_family == AF_UNIX)
-		/* "serv" contains corrupt information with unix
-		   sockets */
-		return g_strdup(host);
-#endif
-
-#ifdef HAVE_IPV6
-	if (strchr(host, ':') != NULL)
-		return g_strconcat("[", host, "]:", serv, NULL);
-#endif
-
-	return g_strconcat(host, ":", serv, NULL);
-}
-
-struct addrinfo *
-resolve_host_port(const char *host_port, unsigned default_port,
-		  int flags, int socktype,
-		  GError **error_r)
-{
-	char *p = g_strdup(host_port);
-	const char *host = p, *port = NULL;
-
-	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;
-			++host;
-			port = q + 2;
-		}
-	}
-
-	if (port == NULL) {
-		/* 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;
-		}
-	}
-
-	char buffer[32];
-	if (port == NULL && default_port != 0) {
-		g_snprintf(buffer, sizeof(buffer), "%u", default_port);
-		port = buffer;
-	}
-
-	if ((flags & AI_PASSIVE) != 0 && strcmp(host, "*") == 0)
-		host = NULL;
-
-	const struct addrinfo hints = {
-		.ai_flags = flags,
-		.ai_family = AF_UNSPEC,
-		.ai_socktype = socktype,
-	};
-
-	struct addrinfo *ai;
-	int ret = getaddrinfo(host, port, &hints, &ai);
-	g_free(p);
-	if (ret != 0) {
-		g_set_error(error_r, resolver_quark(), ret,
-			    "Failed to look up '%s': %s",
-			    host_port, gai_strerror(ret));
-		return NULL;
-	}
-
-	return ai;
-}