X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=c84f416a31ed3e5071c28969b6bd5057d9da0534;hp=13d2a2ca20d52336f6743458cc4a060b8ec0ef36;hb=5667dca4697c3bbbe4830699ee91df800bf2efd3;hpb=ed0c68b07ddbc130e033035baa1cc0862e511b46

diff --git a/udp_send.c b/udp_send.c
index 13d2a2ca..c84f416a 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -160,7 +160,7 @@ static int udp_init_session(struct udp_target *ut)
 	if (ut->fd >= 0) /* nothing to do */
 		return 0;
 
-	ret = makesock(AF_UNSPEC, IPPROTO_UDP, 0, ut->host, ut->port, NULL);
+	ret = para_connect_simple(IPPROTO_UDP, ut->host, ut->port);
 	if (ret < 0)
 		return ret;
 	ut->fd = ret;
@@ -237,22 +237,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: