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

Fix for Apple TV update 6.0

Browse Source 
- don't send Apple Challenge and RSA/AES key/iv if no encryption
- assume no password if no pw field
- clean up some indentation in raop.c
This commit is contained in:
ejurgensen 2013-10-13 21:48:15 +02:00
parent 347c10d7ae
commit 6fb718b55e
2 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/player.c
View File

@ -3675,19 +3675,20 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
p = keyval_get(txt, "pw"); p = keyval_get(txt, "pw");
if (!p) if (!p)
{ {
DPRINTF(E_LOG, L_PLAYER, "AirTunes %s: no pw field in TXT record!\n", name); DPRINTF(E_INFO, L_PLAYER, "AirTunes %s: no pw field in TXT record, assuming no password protection\n", name);
goto free_rd; has_password = 0;
} }
else if (*p == '\0')
if (*p == '\0')
{ {
DPRINTF(E_LOG, L_PLAYER, "AirTunes %s: pw has no value\n", name); DPRINTF(E_LOG, L_PLAYER, "AirTunes %s: pw has no value\n", name);
goto free_rd; goto free_rd;
} }
else
has_password = (strcmp(p, "false") != 0); {
has_password = (strcmp(p, "false") != 0);
}
if (has_password) if (has_password)
{ {
@ -3706,7 +3707,7 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
p = keyval_get(txt, "am"); p = keyval_get(txt, "am");
if (!p) if (!p)
{ {
DPRINTF(E_LOG, L_PLAYER, "AirTunes %s: no am field in TXT record!\n", name); DPRINTF(E_INFO, L_PLAYER, "AirTunes %s: no am field in TXT record, assuming old Airport Express\n", name);
/* Old AirPort Express */ /* Old AirPort Express */
devtype = RAOP_DEV_APEX_80211G; devtype = RAOP_DEV_APEX_80211G;

58
src/raop.c
View File

@ -1226,6 +1226,15 @@ raop_make_sdp(struct raop_session *rs, struct evrtsp_request *req, char *address
"a=fmtp:96 %d 0 16 40 10 14 2 255 0 0 44100\r\n" \ "a=fmtp:96 %d 0 16 40 10 14 2 255 0 0 44100\r\n" \
"a=rsaaeskey:%s\r\n" \ "a=rsaaeskey:%s\r\n" \
"a=aesiv:%s\r\n" "a=aesiv:%s\r\n"
#define SDP_PLD_FMT_NO_ENC \
"v=0\r\n" \
"o=iTunes %u 0 IN IP4 %s\r\n" \
"s=iTunes\r\n" \
"c=IN IP4 %s\r\n" \
"t=0 0\r\n" \
"m=audio 0 RTP/AVP 96\r\n" \
"a=rtpmap:96 AppleLossless\r\n" \
"a=fmtp:96 %d 0 16 40 10 14 2 255 0 0 44100\r\n"
char *p; char *p;
int ret; int ret;
@ -1234,10 +1243,14 @@ raop_make_sdp(struct raop_session *rs, struct evrtsp_request *req, char *address
if (p) if (p)
*p = '\0'; *p = '\0';
/* Add SDP payload */ /* Add SDP payload - but don't add RSA/AES key/iv if no encryption - important for ATV3 update 6.0 */
ret = evbuffer_add_printf(req->output_buffer, SDP_PLD_FMT, if (rs->encrypt)
session_id, address, rs->address, AIRTUNES_V2_PACKET_SAMPLES, ret = evbuffer_add_printf(req->output_buffer, SDP_PLD_FMT,
raop_aes_key_b64, raop_aes_iv_b64); session_id, address, rs->address, AIRTUNES_V2_PACKET_SAMPLES,
raop_aes_key_b64, raop_aes_iv_b64);
else
ret = evbuffer_add_printf(req->output_buffer, SDP_PLD_FMT_NO_ENC,
session_id, address, rs->address, AIRTUNES_V2_PACKET_SAMPLES);
if (p) if (p)
*p = '%'; *p = '%';
@ -1252,6 +1265,7 @@ raop_make_sdp(struct raop_session *rs, struct evrtsp_request *req, char *address
return 0; return 0;
#undef SDP_PLD_FMT #undef SDP_PLD_FMT
#undef SDP_PLD_FMT_NO_ENC
} }
@ -1587,25 +1601,28 @@ raop_send_req_announce(struct raop_session *rs, evrtsp_req_cb cb)
evrtsp_add_header(req->output_headers, "Content-Type", "application/sdp"); evrtsp_add_header(req->output_headers, "Content-Type", "application/sdp");
/* Challenge */ /* Challenge - but only if session is encrypted (important for ATV3 after update 6.0) */
gcry_randomize(challenge, sizeof(challenge), GCRY_STRONG_RANDOM); if (rs->encrypt)
challenge_b64 = b64_encode(challenge, sizeof(challenge));
if (!challenge_b64)
{ {
DPRINTF(E_LOG, L_RAOP, "Couldn't encode challenge\n"); gcry_randomize(challenge, sizeof(challenge), GCRY_STRONG_RANDOM);
challenge_b64 = b64_encode(challenge, sizeof(challenge));
if (!challenge_b64)
{
DPRINTF(E_LOG, L_RAOP, "Couldn't encode challenge\n");
goto cleanup_req; goto cleanup_req;
}
/* Remove base64 padding */
ptr = strchr(challenge_b64, '=');
if (ptr)
*ptr = '\0';
evrtsp_add_header(req->output_headers, "Apple-Challenge", challenge_b64);
free(challenge_b64);
} }
/* Remove base64 padding */
ptr = strchr(challenge_b64, '=');
if (ptr)
*ptr = '\0';
evrtsp_add_header(req->output_headers, "Apple-Challenge", challenge_b64);
free(challenge_b64);
ret = evrtsp_make_request(rs->ctrl, req, EVRTSP_REQ_ANNOUNCE, rs->session_url); ret = evrtsp_make_request(rs->ctrl, req, EVRTSP_REQ_ANNOUNCE, rs->session_url);
if (ret < 0) if (ret < 0)
{ {
@ -1851,11 +1868,12 @@ raop_session_make(struct raop_device *rd, int family, raop_status_cb cb)
rs->auth_quirk_itunes = 0; rs->auth_quirk_itunes = 0;
rs->wants_metadata = 1; rs->wants_metadata = 1;
break; break;
case OTHER: case OTHER:
rs->encrypt = 0; rs->encrypt = 0;
rs->auth_quirk_itunes = 0; rs->auth_quirk_itunes = 0;
rs->wants_metadata = 0; rs->wants_metadata = 0;
break; break;
} }
rs->ctrl = evrtsp_connection_new(address, port); rs->ctrl = evrtsp_connection_new(address, port);