X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=3f9059bb0b03f81c50ec2ef722e255effd41b1ce;hp=499af66e2addfcce8991fb21f5a0e58de4de4d6f;hb=e8089cd5efad59a5eec689117acf563a38b8c6c7;hpb=f31f8ceeaff0db558b63a46559e7d7464859d0c4

diff --git a/udp_send.c b/udp_send.c
index 499af66e..3f9059bb 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,6 +7,7 @@
 /** \file udp_send.c Para_server's udp sender. */
 
 
+#include <regex.h>
 #include <sys/time.h>
 #include <dirent.h>
 #include <sys/socket.h>
@@ -159,7 +160,7 @@ static int udp_init_session(struct udp_target *ut)
 	if (ut->fd >= 0) /* nothing to do */
 		return 0;
 
-	ret = makesock(AF_UNSPEC, IPPROTO_UDP, 0, ut->host, ut->port);
+	ret = para_connect_simple(IPPROTO_UDP, ut->host, ut->port);
 	if (ret < 0)
 		return ret;
 	ut->fd = ret;
@@ -180,9 +181,7 @@ static int udp_init_session(struct udp_target *ut)
 	}
 	add_close_on_fork_list(ut->fd);
 	ut->cq = cq_new(UDP_CQ_BYTES);
-	PARA_NOTICE_LOG("sending to udp %s#%d using fec parms %d:%d:%d\n",
-		ut->host, ut->port , ut->fcp.max_slice_bytes,
-		ut->fcp.data_slices_per_group, ut->fcp.slices_per_group);
+	PARA_NOTICE_LOG("sending to udp %s#%d\n", ut->host, ut->port);
 	return 1;
 }
 
@@ -233,8 +232,11 @@ static int udp_com_delete(struct sender_command_data *scd)
 static int udp_send_fec(char *buf, size_t len, void *private_data)
 {
 	struct udp_target *ut = private_data;
-	int ret = udp_init_session(ut);
+	int ret;
 
+	if (sender_status == SENDER_OFF)
+		return 0;
+	ret = udp_init_session(ut);
 	if (ret < 0)
 		goto fail;
 	ret = send_queued_chunks(ut->fd, ut->cq, 0);
@@ -304,10 +306,10 @@ static char *udp_info(void)
 	ret = make_message(
 		"udp sender:\n"
 		"\tstatus: %s\n"
-		"\tport: udp %d\n"
+		"\tport: %s\n"
 		"\ttargets: %s\n",
 		(sender_status == SENDER_ON)? "on" : "off",
-		conf.udp_default_port_arg,
+		stringify_port(conf.udp_default_port_arg, "udp"),
 		tgts? tgts : "(none)"
 	);
 	free(tgts);