X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=e80670d0f3866dcde32114c0459a506b8cb78cff;hp=3f9059bb0b03f81c50ec2ef722e255effd41b1ce;hb=9b565c60fd159e12d255bb18db9dbff066deebea;hpb=b0fe6d882dd35b01360a66e130d6714aff7b6a0d diff --git a/udp_send.c b/udp_send.c index 3f9059bb..e80670d0 100644 --- a/udp_send.c +++ b/udp_send.c @@ -192,11 +192,13 @@ static void udp_shutdown_targets(void) size_t len = 0; /* STFU, gcc */ list_for_each_entry_safe(ut, tmp, &targets, node) { + int ubuntu_glibc_headers_suck; if (ut->fd < 0) continue; if (!buf) len = vss_get_fec_eof_packet(&buf); - write(ut->fd, buf, len); + /* ignore return value, we're closing the target anyway. */ + ubuntu_glibc_headers_suck = write(ut->fd, buf, len); /* STFU */ udp_close_target(ut); } } @@ -240,22 +242,24 @@ static int udp_send_fec(char *buf, size_t len, void *private_data) if (ret < 0) goto fail; ret = send_queued_chunks(ut->fd, ut->cq, 0); + if (ret == -ERRNO_TO_PARA_ERROR(ECONNREFUSED)) + ret = 0; if (ret < 0) goto fail; if (!len) return 0; if (!ret) { /* still data left in the queue */ - ret = cq_enqueue(ut->cq, buf, len); - if (ret < 0) - goto fail; + ret = cq_force_enqueue(ut->cq, buf, len); + assert(ret >= 0); } ret = write_nonblock(ut->fd, buf, len, 0); + if (ret == -ERRNO_TO_PARA_ERROR(ECONNREFUSED)) + ret = 0; if (ret < 0) goto fail; if (ret != len) { - ret = cq_enqueue(ut->cq, buf + ret, len - ret); - if (ret < 0) - goto fail; + ret = cq_force_enqueue(ut->cq, buf + ret, len - ret); + assert(ret >= 0); } return 1; fail: