oysteikt/mpd
oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

listen: removed is_ipv6_enabled()

Browse Source 
Don't explicitly check is_ipv6_enabled(), just try calling
listen_add_port_ipv6(), but check its error code.
This commit is contained in:
Max Kellermann 2009-02-24 18:55:12 +01:00
parent adf044eb09
commit d0a17ffb9d
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/listen.c
View File

@ -136,19 +136,6 @@ listen_add_address(int pf, const struct sockaddr *addrp, socklen_t addrlen,
return true; return true;
} }
#ifdef HAVE_IPV6
static bool
is_ipv6_enabled(void)
{
int s;
s = socket(AF_INET6, SOCK_STREAM, 0);
if (s == -1)
return false;
close(s);
return true;
}
#endif
#ifdef HAVE_TCP #ifdef HAVE_TCP
/** /**
@ -211,24 +198,32 @@ listen_add_port(unsigned int port, GError **error)
#ifdef HAVE_TCP #ifdef HAVE_TCP
bool success; bool success;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
int ipv6_enabled = is_ipv6_enabled(); bool success6;
GError *error2 = NULL;
#endif #endif
g_debug("binding to any address"); g_debug("binding to any address");
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (ipv6_enabled) { success6 = listen_add_port_ipv6(port, &error2);
success = listen_add_port_ipv6(port, error); if (!success6) {
if (!success) if (error2->domain != listen_quark() ||
(error2->code != EAFNOSUPPORT && error2->code != EINVAL &&
error2->code != EPROTONOSUPPORT)) {
g_propagate_error(error, error2);
return false; return false;
} }
/* although MPD was compiled with IPv6 support, this
host does not have it - ignore this error */
g_error_free(error2);
}
#endif #endif
success = listen_add_port_ipv4(port, error); success = listen_add_port_ipv4(port, error);
if (!success) { if (!success) {
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (ipv6_enabled) if (success6)
/* non-critical: IPv6 listener is /* non-critical: IPv6 listener is
already set up */ already set up */
g_clear_error(error); g_clear_error(error);