X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=8fca5bc6c2759c27b4e0402cba3e341b60b82ebc;hp=7a1a89f73e1ab79d91fa2e0978072eaf9e10fc46;hb=b52960c3c1419f0c9198e29425d25eb69bdd3fa4;hpb=d7b4aa3835197ee906f13f515040e1cda6385544

diff --git a/udp_send.c b/udp_send.c
index 7a1a89f7..8fca5bc6 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -1,34 +1,34 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file udp_send.c Para_server's udp sender. */
 
-
-#include <regex.h>
-#include <sys/time.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
+#include <regex.h>
+#include <sys/types.h>
 #include <netinet/udp.h>
 #include <net/if.h>
-#include <osl.h>
-#include <stdbool.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "server.cmdline.h"
 #include "para.h"
 #include "error.h"
 #include "string.h"
 #include "afh.h"
-#include "afs.h"
 #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"
 
 /**
@@ -57,7 +57,7 @@ static void udp_close_target(struct sender_client *sc)
 	size_t len = vss_get_fec_eof_packet(&buf);
 
 	/*
-	 * Ignore the return value of wirte() since we are closing the target
+	 * Ignore the return value of write() since we are closing the target
 	 * anyway. The sole purpose of the "do_nothing" statement is to silence
 	 * gcc.
 	 */
@@ -278,18 +278,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 +299,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)
@@ -353,7 +352,7 @@ err:
 	return ret;
 }
 
-static char *udp_info(void)
+static char *udp_status(void)
 {
 	struct sender_client *sc;
 	char *ret, *tgts = NULL;
@@ -369,10 +368,9 @@ static char *udp_info(void)
 		tgts = tmp;
 	}
 	ret = make_message(
-		"udp sender:\n"
-		"\tstatus: %s\n"
-		"\tport: %s\n"
-		"\ttargets: %s\n",
+		"status: %s\n"
+		"port: %s\n"
+		"targets: %s\n",
 		(sender_status == SENDER_ON)? "on" : "off",
 		stringify_port(conf.udp_default_port_arg, "udp"),
 		tgts? tgts : "(none)"
@@ -425,7 +423,7 @@ static char *udp_help(void)
 void udp_send_init(struct sender *s)
 {
 	INIT_LIST_HEAD(&targets);
-	s->info = udp_info;
+	s->status = udp_status;
 	s->help = udp_help;
 	s->send = NULL;
 	s->pre_select = NULL;