X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=fc3bb2f5c5f657a45112cf2db3856407c8c0c611;hp=533af63a271f190718c45d8073f988b7971bf338;hb=ce20ee3c755b47f753f122b0fb58a481a0a9d7b9;hpb=c1d6c466251d21d1fb7b513ba2297ebf94d44853 diff --git a/udp_send.c b/udp_send.c index 533af63a..fc3bb2f5 100644 --- a/udp_send.c +++ b/udp_send.c @@ -232,8 +232,11 @@ static int udp_com_delete(struct sender_command_data *scd) static int udp_send_fec(char *buf, size_t len, void *private_data) { struct udp_target *ut = private_data; - int ret = udp_init_session(ut); + int ret; + if (sender_status == SENDER_OFF) + return 0; + ret = udp_init_session(ut); if (ret < 0) goto fail; ret = send_queued_chunks(ut->fd, ut->cq, 0); @@ -244,9 +247,8 @@ static int udp_send_fec(char *buf, size_t len, void *private_data) 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)) @@ -254,9 +256,8 @@ static int udp_send_fec(char *buf, size_t len, void *private_data) 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: