X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=425118a135edfee7224f40256dc087a803115aaf;hp=b41c0ebf919ca902a6cafe55dd93471fe42aef46;hb=becfb4be64a123630775b6517279ed20e4b498f8;hpb=3879481ddabc38236b9eee979a090c2a9bfa74d3

diff --git a/udp_send.c b/udp_send.c
index b41c0ebf..425118a1 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -1,25 +1,26 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 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 <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"
@@ -45,6 +46,8 @@ struct udp_target {
 	struct fec_client *fc;
 	/** The FEC parameters for this target. */
 	struct fec_client_parms fcp;
+	/** Whether we already sent the FEC eof packet to this target. */
+	bool sent_fec_eof;
 };
 
 static struct list_head targets;
@@ -53,15 +56,16 @@ static int sender_status;
 static void udp_close_target(struct sender_client *sc)
 {
 	const char *buf;
-	size_t len = vss_get_fec_eof_packet(&buf);
-
-	/*
-	 * Ignore the return value of wirte() since we are closing the target
-	 * anyway. The sole purpose of the "do_nothing" statement is to silence
-	 * gcc.
-	 */
-	if (write(sc->fd, buf, len))
-		do_nothing;
+	size_t len;
+	struct udp_target *ut = sc->private_data;
+
+	if (ut->sent_fec_eof)
+		return;
+	PARA_NOTICE_LOG("sending FEC EOF\n");
+	len = vss_get_fec_eof_packet(&buf);
+	/* Ignore write() errors since we are closing the target anyway. */
+	if (write(sc->fd, buf, len) == len)
+		ut->sent_fec_eof = true;
 }
 
 static void udp_delete_target(struct sender_client *sc, const char *msg)
@@ -155,11 +159,6 @@ err:
 	return -ERRNO_TO_PARA_ERROR(errno);
 }
 
-static void udp_init_session(struct sender_client *sc)
-{
-	PARA_NOTICE_LOG("sending to udp %s\n", sc->name);
-}
-
 static void udp_shutdown_targets(void)
 {
 	struct sender_client *sc, *tmp;
@@ -191,14 +190,14 @@ static int udp_resolve_target(const char *url, struct sender_command_data *scd)
 
 static int udp_com_on(__a_unused struct sender_command_data *scd)
 {
-	sender_status = SENDER_ON;
+	sender_status = SENDER_on;
 	return 1;
 }
 
 static int udp_com_off(__a_unused struct sender_command_data *scd)
 {
 	udp_shutdown_targets();
-	sender_status = SENDER_OFF;
+	sender_status = SENDER_off;
 	return 1;
 }
 
@@ -236,9 +235,11 @@ static int udp_com_delete(struct sender_command_data *scd)
 /** Initialize UDP session and set maximum payload size. */
 static int udp_init_fec(struct sender_client *sc)
 {
+	struct udp_target *ut = sc->private_data;
 	int mps;
 
-	udp_init_session(sc);
+	PARA_NOTICE_LOG("sending to udp %s\n", sc->name);
+	ut->sent_fec_eof = false;
 	mps = generic_max_transport_msg_size(sc->fd) - sizeof(struct udphdr);
 	PARA_INFO_LOG("current MPS = %d bytes\n", mps);
 	return mps;
@@ -281,7 +282,7 @@ static void udp_send_fec(struct sender_client *sc, char *buf, size_t len)
 {
 	int ret;
 
-	if (sender_status == SENDER_OFF)
+	if (sender_status == SENDER_off)
 		return;
 	if (len == 0)
 		return;
@@ -351,7 +352,7 @@ err:
 	return ret;
 }
 
-static char *udp_info(void)
+static char *udp_status(void)
 {
 	struct sender_client *sc;
 	char *ret, *tgts = NULL;
@@ -367,11 +368,10 @@ static char *udp_info(void)
 		tgts = tmp;
 	}
 	ret = make_message(
-		"udp sender:\n"
-		"\tstatus: %s\n"
-		"\tport: %s\n"
-		"\ttargets: %s\n",
-		(sender_status == SENDER_ON)? "on" : "off",
+		"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)"
 	);
@@ -423,22 +423,22 @@ 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;
 	s->post_select = NULL;
 	s->shutdown_clients = udp_shutdown_targets;
 	s->resolve_target = udp_resolve_target;
-	s->client_cmds[SENDER_ON] = udp_com_on;
-	s->client_cmds[SENDER_OFF] = udp_com_off;
-	s->client_cmds[SENDER_DENY] = NULL;
-	s->client_cmds[SENDER_ALLOW] = NULL;
-	s->client_cmds[SENDER_ADD] = udp_com_add;
-	s->client_cmds[SENDER_DELETE] = udp_com_delete;
-	sender_status = SENDER_OFF;
+	s->client_cmds[SENDER_on] = udp_com_on;
+	s->client_cmds[SENDER_off] = udp_com_off;
+	s->client_cmds[SENDER_deny] = NULL;
+	s->client_cmds[SENDER_allow] = NULL;
+	s->client_cmds[SENDER_add] = udp_com_add;
+	s->client_cmds[SENDER_delete] = udp_com_delete;
+	sender_status = SENDER_off;
 	udp_init_target_list();
 	if (!conf.udp_no_autostart_given)
-		sender_status = SENDER_ON;
+		sender_status = SENDER_on;
 	PARA_DEBUG_LOG("udp sender init complete\n");
 }