oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/raop: error checking in send_control_command()

Browse Source
This commit is contained in:
Max Kellermann 2011-08-24 00:05:04 +02:00
parent 9ffa2604f8
commit 92c1b8f31e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/output/raop_output_plugin.c
View File

@ -448,7 +448,9 @@ get_time_for_rtp(struct play_state *state, struct timeval *tout)
* Send a control command * Send a control command
*/ */
static bool static bool
send_control_command(struct control_data *ctrl, struct raop_data *rd, struct play_state *state) send_control_command(struct control_data *ctrl, struct raop_data *rd,
struct play_state *state,
GError **error_r)
{ {
unsigned char buf[20]; unsigned char buf[20];
int diff; int diff;
@ -473,6 +475,12 @@ send_control_command(struct control_data *ctrl, struct raop_data *rd, struct pla
fill_int(buf + 16, state->rtptime); fill_int(buf + 16, state->rtptime);
num_bytes = sendto(ctrl->fd, buf, sizeof(buf), 0, (struct sockaddr *) &rd->ctrl_addr, sizeof(rd->ctrl_addr)); num_bytes = sendto(ctrl->fd, buf, sizeof(buf), 0, (struct sockaddr *) &rd->ctrl_addr, sizeof(rd->ctrl_addr));
if (num_bytes < 0) {
g_set_error(error_r, raop_output_quark(), errno,
"Unable to send control command: %s",
g_strerror(errno));
return false;
}
return true; return true;
} }
@ -1360,12 +1368,11 @@ raop_output_play(void *data, const void *chunk, size_t size,
} }
iter = raop_session->raop_list; iter = raop_session->raop_list;
while (iter) { while (iter) {
if (!send_control_command(&raop_session->ctrl, iter, &raop_session->play_state)) { if (!send_control_command(&raop_session->ctrl, iter,
g_mutex_unlock(raop_session->list_mutex); &raop_session->play_state,
g_set_error(error_r, raop_output_quark(), -1, error_r))
"Unable to send control command");
goto erexit; goto erexit;
}
iter = iter->next; iter = iter->next;
} }
g_mutex_unlock(raop_session->list_mutex); g_mutex_unlock(raop_session->list_mutex);