mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

raop: Fix packet retransmission

Browse source 
Fix UDP header decoding (sequence number and number of packets);
Fix missing pa_memblock_release() causing assertions after retransmission.
This commit is contained in:
Colin Leroy 2016-11-06 12:54:15 -06:00 • committed by Tanu Kaskinen
parent 4d16369707
commit f4bd06bfa5
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/raop/raop-client.c
View file

@ -470,6 +470,7 @@ static ssize_t send_udp_audio_packet(pa_raop_client *c, pa_memchunk *block, size
written = pa_write(c->udp_sfd, buffer, packet->length, NULL); written = pa_write(c->udp_sfd, buffer, packet->length, NULL);
if (written < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) { if (written < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
pa_log_debug("Discarding UDP (audio, seq=%d) packet due to EAGAIN (%s)", c->seq, pa_cstrerror(errno)); pa_log_debug("Discarding UDP (audio, seq=%d) packet due to EAGAIN (%s)", c->seq, pa_cstrerror(errno));
pa_memblock_release(packet->memblock);
return (ssize_t) packet->length; return (ssize_t) packet->length;
} }
@ -525,9 +526,11 @@ static ssize_t resend_udp_audio_packets(pa_raop_client *c, uint16_t seq, uint16_
written = pa_write(c->udp_cfd, buffer, packet->length, NULL); written = pa_write(c->udp_cfd, buffer, packet->length, NULL);
if (written < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) { if (written < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
pa_log_debug("Discarding UDP (audio-restransmitted, seq=%d) packet due to EAGAIN", seq + i); pa_log_debug("Discarding UDP (audio-restransmitted, seq=%d) packet due to EAGAIN", seq + i);
pa_memblock_release(packet->memblock);
continue; continue;
} }
pa_memblock_release(packet->memblock);
total += written; total += written;
} }
@ -582,8 +585,8 @@ static size_t handle_udp_control_packet(pa_raop_client *c, const uint8_t packet[
if (size != 8 || packet[0] != 0x80) if (size != 8 || packet[0] != 0x80)
return 1; return 1;
seq = ntohs((uint16_t) packet[4]); seq = ntohs((uint16_t) (packet[4] | packet[5] << 8));
nbp = ntohs((uint16_t) packet[6]); nbp = ntohs((uint16_t) (packet[6] | packet[7] << 8));
if (nbp <= 0) if (nbp <= 0)
return 1; return 1;