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

Split out RAOP packet sending

Browse Source
This commit is contained in:
Julien BLACHE 2010-10-05 19:52:07 +02:00
parent 385375cdc6
commit faea2d33a1
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/raop.c
View File

@ -2523,12 +2523,36 @@ raop_v2_make_packet(struct raop_v2_packet *pkt, uint8_t *rawbuf, uint64_t rtptim
return 0; return 0;
} }
static int
raop_v2_send_packet(struct raop_session *rs, struct raop_v2_packet *pkt)
{
uint8_t *data;
int ret;
data = (rs->encrypt) ? pkt->encrypted : pkt->clear;
ret = send(rs->server_fd, data, AIRTUNES_V2_PKT_LEN, 0);
if (ret < 0)
{
DPRINTF(E_LOG, L_RAOP, "Send error for %s: %s\n", rs->devname, strerror(errno));
raop_session_failure(rs);
return -1;
}
else if (ret != AIRTUNES_V2_PKT_LEN)
{
DPRINTF(E_WARN, L_RAOP, "Partial send (%d) for %s\n", ret, rs->devname);
return -1;
}
return 0;
}
void void
raop_v2_write(uint8_t *buf, uint64_t rtptime) raop_v2_write(uint8_t *buf, uint64_t rtptime)
{ {
struct raop_v2_packet pkt; struct raop_v2_packet pkt;
struct raop_session *rs; struct raop_session *rs;
uint8_t *data;
int ret; int ret;
ret = raop_v2_make_packet(&pkt, buf, rtptime); ret = raop_v2_make_packet(&pkt, buf, rtptime);
@ -2553,17 +2577,7 @@ raop_v2_write(uint8_t *buf, uint64_t rtptime)
if (rs->state != RAOP_STREAMING) if (rs->state != RAOP_STREAMING)
continue; continue;
data = (rs->encrypt) ? pkt.encrypted : pkt.clear; raop_v2_send_packet(rs, &pkt);
ret = send(rs->server_fd, data, AIRTUNES_V2_PKT_LEN, 0);
if (ret < 0)
{
DPRINTF(E_LOG, L_RAOP, "Send error for %s: %s\n", rs->devname, strerror(errno));
raop_session_failure(rs);
}
else if (ret != AIRTUNES_V2_PKT_LEN)
DPRINTF(E_WARN, L_RAOP, "Partial send (%d) for %s\n", ret, rs->devname);
} }
return; return;