MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-14 00:10:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add IPv6 support for AirTunes streaming

Browse Source
This commit is contained in:
Julien BLACHE 2010-05-14 17:38:10 +02:00
parent efbea91ed4
commit b1d265b0ea
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/raop.c
View File

@ -2254,12 +2254,13 @@ raop_v2_write(uint8_t *buf, uint64_t rtptime)
static int static int
raop_v2_stream_open(struct raop_session *rs) raop_v2_stream_open(struct raop_session *rs)
{ {
int len;
int ret; int ret;
#ifdef __linux__ #ifdef __linux__
rs->server_fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); rs->server_fd = socket(rs->sa.ss.ss_family, SOCK_DGRAM | SOCK_CLOEXEC, 0);
#else #else
rs->server_fd = socket(AF_INET, SOCK_DGRAM, 0); rs->server_fd = socket(rs->sa.ss.ss_family, SOCK_DGRAM, 0);
#endif #endif
if (rs->server_fd < 0) if (rs->server_fd < 0)
{ {
@ -2268,12 +2269,27 @@ raop_v2_stream_open(struct raop_session *rs)
return -1; return -1;
} }
rs->sa.sin.sin_port = htons(rs->server_port); switch (rs->sa.ss.ss_family)
{
case AF_INET:
rs->sa.sin.sin_port = htons(rs->server_port);
len = sizeof(rs->sa.sin);
break;
ret = connect(rs->server_fd, &rs->sa.sa, sizeof(struct sockaddr_in)); case AF_INET6:
rs->sa.sin6.sin6_port = htons(rs->server_port);
len = sizeof(rs->sa.sin6);
break;
default:
DPRINTF(E_WARN, L_RAOP, "Unknown family %d\n", rs->sa.ss.ss_family);
goto out_fail;
}
ret = connect(rs->server_fd, &rs->sa.sa, len);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_RAOP, "connect() to %s:%u failed: %s\n", rs->address, rs->server_port, strerror(errno)); DPRINTF(E_LOG, L_RAOP, "connect() to [%s]:%u failed: %s\n", rs->address, rs->server_port, strerror(errno));
goto out_fail; goto out_fail;
} }