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

[httpd] Add fallback to IPv4 if v6 fails

Browse Source
This commit is contained in:
ejurgensen 2015-12-21 21:52:21 +01:00
parent 01f1a177b5
commit 6cabbc4ab7
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/httpd.c
View File

@ -1284,7 +1284,7 @@ httpd_basic_auth(struct evhttp_request *req, char *user, char *passwd, char *rea
int int
httpd_init(void) httpd_init(void)
{ {
const char *addr; int v6enabled;
unsigned short port; unsigned short port;
int ret; int ret;
@ -1361,19 +1361,27 @@ httpd_init(void)
goto event_fail; goto event_fail;
} }
if (cfg_getbool(cfg_getsec(cfg, "general"), "ipv6")) v6enabled = 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");
ret = evhttp_bind_socket(evhttpd, addr, port); if (v6enabled)
if (ret < 0)
{ {
DPRINTF(E_FATAL, L_HTTPD, "Could not bind %s:%d\n", addr, port); ret = evhttp_bind_socket(evhttpd, "::", port);
if (ret < 0)
{
DPRINTF(E_LOG, L_HTTPD, "Could not bind to port %d, falling back to IPv4\n", port);
v6enabled = 0;
}
}
goto bind_fail; if (!v6enabled)
{
ret = evhttp_bind_socket(evhttpd, "0.0.0.0", port);
if (ret < 0)
{
DPRINTF(E_FATAL, L_HTTPD, "Could not bind to port %d (forked-daapd already running?)\n", port);
goto bind_fail;
}
} }
evhttp_set_gencb(evhttpd, httpd_gen_cb, NULL); evhttp_set_gencb(evhttpd, httpd_gen_cb, NULL);