1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 04:17:33 +00:00

Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky

This commit is contained in:
Nikolas Garofil 2009-11-21 15:50:35 +01:00
commit 20a7f5eb72
2 changed files with 5 additions and 6 deletions

View File

@ -1,3 +1,6 @@
2009-11-20
* Allow for mpd connections to use IPv6
2009-11-19 2009-11-19
* Added support for $pid_read and $pid_write * Added support for $pid_read and $pid_write

View File

@ -129,13 +129,9 @@ static int mpd_connect(mpd_Connection *connection, const char *host, int port,
struct addrinfo *res = NULL; struct addrinfo *res = NULL;
struct addrinfo *addrinfo = NULL; struct addrinfo *addrinfo = NULL;
/* Setup hints /* Setup hints */
*
* XXX: limit address family to PF_INET here.
* MPD does not support IPv6 yet, so if GAI returns
* an IPv6 address, the later connect() will fail. */
hints.ai_flags = AI_ADDRCONFIG; hints.ai_flags = AI_ADDRCONFIG;
hints.ai_family = PF_INET; hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP; hints.ai_protocol = IPPROTO_TCP;
hints.ai_addrlen = 0; hints.ai_addrlen = 0;