X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=c7805f735b02c096083058d269ee4b0d2ee6b759;hp=08b3069fcdbc0f554a5e0ca655930ddd109ab360;hb=6817a8f0c4f649168a43fc347179771600a908fc;hpb=abbddde3ee707103d5d8b088c8fa6fc53f09ebff diff --git a/dccp_send.c b/dccp_send.c index 08b3069f..c7805f73 100644 --- a/dccp_send.c +++ b/dccp_send.c @@ -122,7 +122,12 @@ static void dccp_send(__unused struct audio_format *af, return; list_for_each_entry_safe(dc, tmp, &clients, node) { - if (!_write_ok(dc->fd)) + ret = write_ok(dc->fd); + if (ret < 0) { + dccp_shutdown_client(dc); + continue; + } + if (!ret) continue; if (!dc->header_sent && af->get_header_info && current_chunk) { header_buf = af->get_header_info(&header_len); @@ -130,13 +135,22 @@ static void dccp_send(__unused struct audio_format *af, continue; /* header not yet available */ ret = write(dc->fd, header_buf, header_len); if (ret != header_len) { + int err = errno; + PARA_ERROR_LOG("header write: %d/%d (%s)\n", + ret, header_len, ret < 0? + strerror(err) : ""); + dccp_shutdown_client(dc); + continue; + } + ret = write_ok(dc->fd); + if (ret < 0) { dccp_shutdown_client(dc); continue; } - if (!_write_ok(dc->fd)) + if (!ret) continue; } - PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd); +// PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd); ret = write(dc->fd, buf, len); if (ret != len) dccp_shutdown_client(dc);