X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=8c9eebc94c3a5ef684ef86340b70d3140cd6fcda;hp=bbc38f0117d796ac5211bf86821244daf17baf84;hb=b1206644af64376f11877f14fa9f9dd3c30f8e4b;hpb=db748cc3c4d60e1ec7fefe2ad58142c2820ae07f

diff --git a/udp_send.c b/udp_send.c
index bbc38f01..8c9eebc9 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -15,8 +15,9 @@
 #include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
+#include <lopsub.h>
 
-#include "server.cmdline.h"
+#include "server.lsg.h"
 #include "para.h"
 #include "error.h"
 #include "string.h"
@@ -46,6 +47,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;
@@ -54,15 +57,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 write() 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)
@@ -91,11 +95,11 @@ static int mcast_sender_setup(struct sender_client *sc)
 {
 	struct sockaddr_storage ss;
 	socklen_t sslen = sizeof(ss);
-	int ttl = conf.udp_ttl_arg, id = 0;
+	int ttl = OPT_INT32_VAL(UDP_TTL), id = 0;
 	const int on = 1;
 
-	if (conf.udp_mcast_iface_given) {
-		char *iface = conf.udp_mcast_iface_arg;
+	if (OPT_GIVEN(UDP_MCAST_IFACE)) {
+		const char *iface = OPT_STRING_VAL(UDP_MCAST_IFACE);
 
 		id = if_nametoindex(iface);
 		if (id == 0)
@@ -171,7 +175,7 @@ static int udp_resolve_target(const char *url, struct sender_command_data *scd)
 	ret = parse_fec_url(url, scd);
 	if (ret)
 		return ret;
-	port = scd->port > 0 ? scd->port : conf.udp_default_port_arg;
+	port = scd->port > 0 ? scd->port : OPT_UINT32_VAL(UDP_DEFAULT_PORT);
 
 	ret = para_connect_simple(IPPROTO_UDP, scd->host, port);
 	if (ret < 0)
@@ -232,9 +236,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;
 
 	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;
@@ -367,7 +373,7 @@ static char *udp_status(void)
 		"port: %s\n"
 		"targets: %s\n",
 		(sender_status == SENDER_on)? "on" : "off",
-		stringify_port(conf.udp_default_port_arg, "udp"),
+		stringify_port(OPT_UINT32_VAL(UDP_DEFAULT_PORT), "udp"),
 		tgts? tgts : "(none)"
 	);
 	free(tgts);
@@ -380,10 +386,11 @@ static void udp_init_target_list(void)
 	int i;
 
 	INIT_LIST_HEAD(&targets);
-	for (i = 0; i < conf.udp_target_given; i++) {
-		if (udp_resolve_target(conf.udp_target_arg[i], &scd) < 0)
+	for (i = 0; i < OPT_GIVEN(UDP_TARGET); i++) {
+		const char *arg = lls_string_val(i, OPT_RESULT(UDP_TARGET));
+		if (udp_resolve_target(arg, &scd) < 0)
 			PARA_CRIT_LOG("not adding requested target '%s'\n",
-					conf.udp_target_arg[i]);
+					arg);
 		else
 			udp_com_add(&scd);
 	}
@@ -433,7 +440,7 @@ void udp_send_init(struct sender *s)
 	s->client_cmds[SENDER_delete] = udp_com_delete;
 	sender_status = SENDER_off;
 	udp_init_target_list();
-	if (!conf.udp_no_autostart_given)
+	if (!OPT_GIVEN(UDP_NO_AUTOSTART))
 		sender_status = SENDER_on;
 	PARA_DEBUG_LOG("udp sender init complete\n");
 }