aboutsummaryrefslogtreecommitdiffstats
path: root/src/socket_util.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-20 07:56:59 +0200
committerMax Kellermann <max@duempel.org>2011-09-20 08:49:36 +0200
commit3ea1073809bf324e5b75fd33d61dcb0422463358 (patch)
tree2fdb6aee5783b2ea88aa10089e2708d1fadb6977 /src/socket_util.c
parent76a959a578c1039235988d886bcf335fff0c85f1 (diff)
downloadmpd-3ea1073809bf324e5b75fd33d61dcb0422463358.tar.gz
mpd-3ea1073809bf324e5b75fd33d61dcb0422463358.tar.xz
mpd-3ea1073809bf324e5b75fd33d61dcb0422463358.zip
socket_util: move sockaddr_to_string() to resolver.c
Diffstat (limited to 'src/socket_util.c')
-rw-r--r--src/socket_util.c50
1 files changed, 0 insertions, 50 deletions
diff --git a/src/socket_util.c b/src/socket_util.c
index f673d73e9..8f36c10cf 100644
--- a/src/socket_util.c
+++ b/src/socket_util.c
@@ -26,7 +26,6 @@
#ifndef G_OS_WIN32
#include <sys/socket.h>
-#include <netdb.h>
#else /* G_OS_WIN32 */
#define WINVER 0x0501
#include <ws2tcpip.h>
@@ -43,55 +42,6 @@ listen_quark(void)
return g_quark_from_static_string("listen");
}
-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);
-}
-
int
socket_bind_listen(int domain, int type, int protocol,
const struct sockaddr *address, size_t address_length,