MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-29 08:33:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix #147 where forked-daapd would not listen on IPv6 when enabled

Browse Source
This commit is contained in:
ejurgensen 2015-05-07 22:53:37 +02:00
parent 475d5db573
commit a183fc3299
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/httpd.c
View File

@ -1273,14 +1273,12 @@ httpd_basic_auth(struct evhttp_request *req, char *user, char *passwd, char *rea
int int
httpd_init(void) httpd_init(void)
{ {
const char *addr;
unsigned short port; unsigned short port;
int v6enabled;
int ret; int ret;
httpd_exit = 0; httpd_exit = 0;
v6enabled = cfg_getbool(cfg_getsec(cfg, "general"), "ipv6");
evbase_httpd = event_base_new(); evbase_httpd = event_base_new();
if (!evbase_httpd) if (!evbase_httpd)
{ {
@ -1351,27 +1349,21 @@ httpd_init(void)
goto evhttp_fail; goto evhttp_fail;
} }
if (cfg_getbool(cfg_getsec(cfg, "general"), "ipv6"))
addr = "::";
else
addr = "0.0.0.0";
port = cfg_getint(cfg_getsec(cfg, "library"), "port"); port = cfg_getint(cfg_getsec(cfg, "library"), "port");
/* We are binding v6 and v4 separately, and we allow v6 to fail ret = evhttp_bind_socket(evhttpd, addr, port);
* as IPv6 might not be supported on the system.
* We still warn about the failure, in case there's another issue.
*/
ret = evhttp_bind_socket(evhttpd, "0.0.0.0", port);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_FATAL, L_HTTPD, "Could not bind INADDR_ANY:%d\n", port); DPRINTF(E_FATAL, L_HTTPD, "Could not bind %s:%d\n", addr, port);
goto bind_fail; goto bind_fail;
} }
if (v6enabled)
{
ret = evhttp_bind_socket(evhttpd, "::", port);
if (ret < 0)
DPRINTF(E_WARN, L_HTTPD, "Could not bind IN6ADDR_ANY:%d (that's OK)\n", port);
}
evhttp_set_gencb(evhttpd, httpd_gen_cb, NULL); evhttp_set_gencb(evhttpd, httpd_gen_cb, NULL);
ret = pthread_create(&tid_httpd, NULL, httpd, NULL); ret = pthread_create(&tid_httpd, NULL, httpd, NULL);