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

Fix the ipv6 bind issue in a nicer way

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4428 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman 2006-07-22 17:19:59 +00:00
parent f22479e4d4
commit 6dfaa33f37
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/listen.c
View File

@ -115,6 +115,7 @@ static void parseListenConfigParam(unsigned int port, ConfigParam * param)
struct sockaddr_in sin; struct sockaddr_in sin;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
struct sockaddr_in6 sin6; struct sockaddr_in6 sin6;
int useIpv6 = ipv6Supported();
memset(&sin6, 0, sizeof(struct sockaddr_in6)); memset(&sin6, 0, sizeof(struct sockaddr_in6));
sin6.sin6_port = htons(port); sin6.sin6_port = htons(port);
@ -126,23 +127,28 @@ static void parseListenConfigParam(unsigned int port, ConfigParam * param)
if (!param || 0 == strcmp(param->value, "any")) { if (!param || 0 == strcmp(param->value, "any")) {
DEBUG("binding to any address\n"); DEBUG("binding to any address\n");
sin.sin_addr.s_addr = INADDR_ANY;
addrp = (struct sockaddr *)&sin;
addrlen = sizeof(struct sockaddr_in);
if (establishListen(port, addrp, addrlen) < 0) {
BINDERROR();
exit(EXIT_FAILURE);
}
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (ipv6Supported()) { if (useIpv6) {
sin6.sin6_addr = in6addr_any; sin6.sin6_addr = in6addr_any;
addrp = (struct sockaddr *)&sin6; addrp = (struct sockaddr *)&sin6;
addrlen = sizeof(struct sockaddr_in6); addrlen = sizeof(struct sockaddr_in6);
establishListen(port, addrp, addrlen); if (establishListen(port, addrp, addrlen) < 0) {
BINDERROR();
exit(EXIT_FAILURE);
}
} }
#endif #endif
sin.sin_addr.s_addr = INADDR_ANY;
addrp = (struct sockaddr *)&sin;
addrlen = sizeof(struct sockaddr_in);
#ifdef HAVE_IPV6
if ((establishListen(port, addrp, addrlen) < 0) && !useIpv6) {
#else
if (establishListen(port, addrp, addrlen) < 0) {
#endif
BINDERROR();
exit(EXIT_FAILURE);
}
} else { } else {
struct hostent *he; struct hostent *he;
DEBUG("binding to address for %s\n", param->value); DEBUG("binding to address for %s\n", param->value);
@ -154,7 +160,7 @@ static void parseListenConfigParam(unsigned int port, ConfigParam * param)
switch (he->h_addrtype) { switch (he->h_addrtype) {
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
case AF_INET6: case AF_INET6:
if (!ipv6Supported()) { if (!useIpv6) {
ERROR("no IPv6 support, but a IPv6 address " ERROR("no IPv6 support, but a IPv6 address "
"found for \"%s\" at line %i\n", "found for \"%s\" at line %i\n",
param->value, param->line); param->value, param->line);