MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[cast] Fix for issue #275 where gnutls returns the 4 byte prefix of 

a Chromecast response together with the response message itself
This commit is contained in:
ejurgensen 2016-08-01 00:12:08 +02:00
parent 187ed6c1f7
commit 306dd47f1e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/outputs/cast.c
View File

@ -1104,28 +1104,25 @@ cast_listen_cb(int fd, short what, void *arg)
DPRINTF(E_DBG, L_CAST, "New data from '%s'\n", cs->devname); DPRINTF(E_DBG, L_CAST, "New data from '%s'\n", cs->devname);
#endif #endif
// We should get a 4 byte header and then the actual message. The header will
// be the length of the message. Sometimes gnutls first reads the header,
// other times the header + message are read together.
received = 0; received = 0;
while ((ret = gnutls_record_recv(cs->tls_session, buffer + received, MAX_BUF - received)) > 0) while ((ret = gnutls_record_recv(cs->tls_session, buffer + received, MAX_BUF - received)) > 0)
{ {
#ifdef DEBUG_CONNECTION #ifdef DEBUG_CONNECTION
DPRINTF(E_DBG, L_CAST, "Received %d bytes\n", ret); DPRINTF(E_DBG, L_CAST, "Received %d bytes\n", ret);
#endif
if (ret == 4) if (ret == 4)
{ {
#ifdef DEBUG_CONNECTION
uint32_t be; uint32_t be;
size_t len; size_t len;
memcpy(&be, buffer, 4); memcpy(&be, buffer, 4);
len = be32toh(be); len = be32toh(be);
DPRINTF(E_DBG, L_CAST, "Incoming %d bytes\n", len); DPRINTF(E_DBG, L_CAST, "Incoming %d bytes\n", len);
}
#endif #endif
}
else
{
received += ret;
}
received += ret;
if (received >= MAX_BUF) if (received >= MAX_BUF)
{ {
DPRINTF(E_LOG, L_CAST, "Receive buffer exhausted!\n"); DPRINTF(E_LOG, L_CAST, "Receive buffer exhausted!\n");
@ -1145,8 +1142,9 @@ cast_listen_cb(int fd, short what, void *arg)
return; return;
} }
if (received) // Ignore the first 4 bytes, they are just the length of the message
cast_msg_process(cs, buffer, received); if (received > 4)
cast_msg_process(cs, buffer + 4, received - 4);
} }
static void static void