X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=7930f09234486d3448b196ba45ae3b178845d001;hp=7a1a89f73e1ab79d91fa2e0978072eaf9e10fc46;hb=761d9bd95a6601c0b3be6591a6b6672b755e1fbe;hpb=a24d175e6d093d6d9f6e583c3026e45924bad621

diff --git a/udp_send.c b/udp_send.c
index 7a1a89f7..7930f092 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,12 +8,11 @@
 
 
 #include <regex.h>
-#include <sys/time.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/udp.h>
 #include <net/if.h>
 #include <osl.h>
-#include <stdbool.h>
 
 #include "server.cmdline.h"
 #include "para.h"
@@ -24,11 +23,11 @@
 #include "server.h"
 #include "list.h"
 #include "send.h"
+#include "sched.h"
 #include "vss.h"
 #include "portable_io.h"
 #include "net.h"
 #include "fd.h"
-#include "sched.h"
 #include "close_on_fork.h"
 
 /**
@@ -278,18 +277,18 @@ static int udp_check_socket_state(struct sender_client *sc)
 	return -ERRNO_TO_PARA_ERROR(ret);
 }
 
-static int udp_send_fec(struct sender_client *sc, char *buf, size_t len)
+static void udp_send_fec(struct sender_client *sc, char *buf, size_t len)
 {
 	int ret;
 
 	if (sender_status == SENDER_OFF)
-		return 0;
+		return;
 	if (len == 0)
-		return 0;
+		return;
 	ret = udp_check_socket_state(sc);
 	if (ret < 0)
 		goto fail;
-	ret = write_nonblock(sc->fd, buf, len);
+	ret = xwrite(sc->fd, buf, len);
 	if (ret == -ERRNO_TO_PARA_ERROR(ECONNREFUSED)) {
 		/*
 		 * Happens if meanwhile an ICMP Destination / Port Unreachable
@@ -299,10 +298,9 @@ static int udp_send_fec(struct sender_client *sc, char *buf, size_t len)
 	}
 	if (ret < 0)
 		goto fail;
-	return 1;
+	return;
 fail:
 	udp_delete_target(sc, para_strerror(-ret));
-	return ret;
 }
 
 static int udp_com_add(struct sender_command_data *scd)