MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-26 12:59:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Honour IPv6 config option in player/RAOP

Browse Source
This commit is contained in:
Julien BLACHE 2011-03-20 12:20:07 +01:00
parent 69fe64c277
commit 0d0877de9c
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/player.c
View File

@ -3771,6 +3771,8 @@ player_init(void)
return -1; return -1;
} }
raop_v6enabled = cfg_getbool(cfg_getsec(cfg, "general"), "ipv6");
#ifdef USE_EVENTFD #ifdef USE_EVENTFD
exit_efd = eventfd(0, EFD_CLOEXEC); exit_efd = eventfd(0, EFD_CLOEXEC);

29
src/raop.c
View File

@ -2157,13 +2157,16 @@ raop_v2_timing_stop(void)
} }
static int static int
raop_v2_timing_start(void) raop_v2_timing_start(int v6enabled)
{ {
int ret; int ret;
ret = raop_v2_timing_start_one(&timing_6svc, AF_INET6); if (v6enabled)
if (ret < 0) {
DPRINTF(E_WARN, L_RAOP, "Could not start timing service on IPv6\n"); ret = raop_v2_timing_start_one(&timing_6svc, AF_INET6);
if (ret < 0)
DPRINTF(E_WARN, L_RAOP, "Could not start timing service on IPv6\n");
}
ret = raop_v2_timing_start_one(&timing_4svc, AF_INET); ret = raop_v2_timing_start_one(&timing_4svc, AF_INET);
if (ret < 0) if (ret < 0)
@ -2485,13 +2488,16 @@ raop_v2_control_stop(void)
} }
static int static int
raop_v2_control_start(void) raop_v2_control_start(int v6enabled)
{ {
int ret; int ret;
ret = raop_v2_control_start_one(&control_6svc, AF_INET6); if (v6enabled)
if (ret < 0) {
DPRINTF(E_WARN, L_RAOP, "Could not start control service on IPv6\n"); ret = raop_v2_control_start_one(&control_6svc, AF_INET6);
if (ret < 0)
DPRINTF(E_WARN, L_RAOP, "Could not start control service on IPv6\n");
}
ret = raop_v2_control_start_one(&control_4svc, AF_INET); ret = raop_v2_control_start_one(&control_4svc, AF_INET);
if (ret < 0) if (ret < 0)
@ -3499,7 +3505,7 @@ raop_init(int *v6enabled)
if (ptr) if (ptr)
*ptr = '\0'; *ptr = '\0';
ret = raop_v2_timing_start(); ret = raop_v2_timing_start(*v6enabled);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_RAOP, "AirTunes v2 time synchronization failed to start\n"); DPRINTF(E_LOG, L_RAOP, "AirTunes v2 time synchronization failed to start\n");
@ -3507,7 +3513,7 @@ raop_init(int *v6enabled)
goto out_free_b64_iv; goto out_free_b64_iv;
} }
ret = raop_v2_control_start(); ret = raop_v2_control_start(*v6enabled);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_RAOP, "AirTunes v2 playback synchronization failed to start\n"); DPRINTF(E_LOG, L_RAOP, "AirTunes v2 playback synchronization failed to start\n");
@ -3515,7 +3521,8 @@ raop_init(int *v6enabled)
goto out_stop_timing; goto out_stop_timing;
} }
*v6enabled = !((timing_6svc.fd < 0) || (control_6svc.fd < 0)); if (*v6enabled)
*v6enabled = !((timing_6svc.fd < 0) || (control_6svc.fd < 0));
return 0; return 0;