X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=6ed5026ac31102932d4fb3b23e6e87d375002096;hp=d55a9abf3e43355118f77d9c158311d730effcf9;hb=e8ca7526ddebc98f3023736f77fa13b65034767b;hpb=d16fe3df649cb48d5ffa26187da3dad4c3066646

diff --git a/udp_send.c b/udp_send.c
index d55a9abf..6ed5026a 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -1,18 +1,22 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file udp_send.c Para_server's udp sender. */
 
-
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
-#include <sys/time.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/udp.h>
 #include <net/if.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
 #include <osl.h>
+#include <netdb.h>
 
 #include "server.cmdline.h"
 #include "para.h"
@@ -277,18 +281,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
@@ -298,10 +302,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)