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

Fix bug when binding to both ipv6 and ipv4 on Linux

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4427 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman 2006-07-22 13:15:20 +00:00
parent 8a938bc8d3
commit f22479e4d4
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/listen.c
View File

@ -40,11 +40,16 @@
#define DEFAULT_PORT 6600 #define DEFAULT_PORT 6600
#define BINDERROR() do { \
ERROR("unable to bind port %u: %s\n", port, strerror(errno)); \
ERROR("maybe MPD is still running?\n"); \
} while (0);
int *listenSockets = NULL; int *listenSockets = NULL;
int numberOfListenSockets = 0; int numberOfListenSockets = 0;
static void establishListen(unsigned int port, static int establishListen(unsigned int port,
struct sockaddr *addrp, socklen_t addrlen) struct sockaddr *addrp, socklen_t addrlen)
{ {
int pf; int pf;
int sock; int sock;
@ -85,10 +90,8 @@ static void establishListen(unsigned int port,
} }
if (bind(sock, addrp, addrlen) < 0) { if (bind(sock, addrp, addrlen) < 0) {
ERROR("unable to bind port %u", port); close(sock);
ERROR(": %s\n", strerror(errno)); return -1;
ERROR("maybe MPD is still running?\n");
exit(EXIT_FAILURE);
} }
if (listen(sock, 5) < 0) { if (listen(sock, 5) < 0) {
@ -101,6 +104,8 @@ static void establishListen(unsigned int port,
realloc(listenSockets, sizeof(int) * numberOfListenSockets); realloc(listenSockets, sizeof(int) * numberOfListenSockets);
listenSockets[numberOfListenSockets - 1] = sock; listenSockets[numberOfListenSockets - 1] = sock;
return 0;
} }
static void parseListenConfigParam(unsigned int port, ConfigParam * param) static void parseListenConfigParam(unsigned int port, ConfigParam * param)
@ -121,6 +126,15 @@ 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 (ipv6Supported()) {
sin6.sin6_addr = in6addr_any; sin6.sin6_addr = in6addr_any;
@ -129,10 +143,6 @@ static void parseListenConfigParam(unsigned int port, ConfigParam * param)
establishListen(port, addrp, addrlen); establishListen(port, addrp, addrlen);
} }
#endif #endif
sin.sin_addr.s_addr = INADDR_ANY;
addrp = (struct sockaddr *)&sin;
addrlen = sizeof(struct sockaddr_in);
establishListen(port, addrp, addrlen);
} 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);
@ -168,7 +178,10 @@ static void parseListenConfigParam(unsigned int port, ConfigParam * param)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
establishListen(port, addrp, addrlen); if (establishListen(port, addrp, addrlen) < 0) {
BINDERROR();
exit(EXIT_FAILURE);
}
} }
} }