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

[mpd] Add fallback to IPv4 if IPv6 failed

Browse Source
This commit is contained in:
chme 2016-01-16 07:53:55 +01:00
parent 9a1c8409cf
commit 1d69a3de90
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/mpd.c
View File

@ -4588,8 +4588,24 @@ int mpd_init(void)
sin6.sin6_family = AF_INET6; sin6.sin6_family = AF_INET6;
sin6.sin6_port = htons(port); sin6.sin6_port = htons(port);
saddr = (struct sockaddr *)&sin6; saddr = (struct sockaddr *)&sin6;
listener = evconnlistener_new_bind(
evbase_mpd,
mpd_accept_conn_cb,
NULL,
LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE,
-1,
saddr,
saddr_length);
if (!listener)
{
DPRINTF(E_LOG, L_MPD, "Could not bind to port %d, falling back to IPv4\n", port);
v6enabled = 0;
}
} }
else
if (!v6enabled)
{ {
saddr_length = sizeof(struct sockaddr_in); saddr_length = sizeof(struct sockaddr_in);
memset(&sin, 0, saddr_length); memset(&sin, 0, saddr_length);
@ -4597,23 +4613,24 @@ int mpd_init(void)
sin.sin_addr.s_addr = htonl(0); sin.sin_addr.s_addr = htonl(0);
sin.sin_port = htons(port); sin.sin_port = htons(port);
saddr = (struct sockaddr *)&sin; saddr = (struct sockaddr *)&sin;
listener = evconnlistener_new_bind(
evbase_mpd,
mpd_accept_conn_cb,
NULL,
LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE,
-1,
saddr,
saddr_length);
if (!listener)
{
DPRINTF(E_LOG, L_MPD, "Could not create connection listener for mpd clients on port %d\n", port);
goto connew_fail;
}
} }
listener = evconnlistener_new_bind(
evbase_mpd,
mpd_accept_conn_cb,
NULL,
LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE,
-1,
saddr,
saddr_length);
if (!listener)
{
DPRINTF(E_LOG, L_MPD, "Could not create connection listener for mpd clients on port %d\n", port);
goto connew_fail;
}
evconnlistener_set_error_cb(listener, mpd_accept_error_cb); evconnlistener_set_error_cb(listener, mpd_accept_error_cb);
http_port = cfg_getint(cfg_getsec(cfg, "mpd"), "http_port"); http_port = cfg_getint(cfg_getsec(cfg, "mpd"), "http_port");