X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=udp_send.c;h=91550aa8c66836239df07193d46d5d470612767e;hb=2bad70d84e763b4d866d7b97dbc1cdc8e030bd45;hp=eea1c93355c1461ada446942ef4d2d91f71cef46;hpb=0b786d977ded3c3922e851e5b8d60837b43469b9;p=paraslash.git

diff --git a/udp_send.c b/udp_send.c
index eea1c933..91550aa8 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -18,13 +18,13 @@
 #include "error.h"
 #include "string.h"
 #include "afh.h"
+#include "net.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 "close_on_fork.h"
 
@@ -56,6 +56,8 @@ static void udp_close_target(struct sender_client *sc)
 	size_t len;
 	struct udp_target *ut = sc->private_data;
 
+	if (process_is_command_handler())
+		return;
 	if (ut->sent_fec_eof)
 		return;
 	PARA_NOTICE_LOG("sending FEC EOF\n");
@@ -72,8 +74,11 @@ static void udp_delete_target(struct sender_client *sc, const char *msg)
 
 	PARA_NOTICE_LOG("deleting %s (%s) from list\n", sc->name, msg);
 	udp_close_target(sc);
-	close(sc->fd);
-	del_close_on_fork_list(sc->fd);
+	/* command handlers already called close_listed_fds() */
+	if (!process_is_command_handler()) {
+		close(sc->fd);
+		del_close_on_fork_list(sc->fd);
+	}
 	vss_del_fec_client(ut->fc);
 	list_del(&sc->node);
 	free(sc->name);
@@ -164,6 +169,13 @@ static void udp_shutdown_targets(void)
 		udp_close_target(sc);
 }
 
+static void udp_shutdown(void)
+{
+	struct sender_client *sc, *tmp;
+	list_for_each_entry_safe(sc, tmp, &targets, node)
+		udp_delete_target(sc, "shutdown");
+}
+
 static int udp_resolve_target(const char *url, struct sender_command_data *scd)
 {
 	const char *result;
@@ -382,7 +394,7 @@ static void udp_init_target_list(void)
 	struct sender_command_data scd;
 	int i;
 
-	INIT_LIST_HEAD(&targets);
+	init_list_head(&targets);
 	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)
@@ -415,7 +427,7 @@ static char *udp_help(void)
 /* Initialize the list of udp targets. */
 static void udp_send_init(void)
 {
-	INIT_LIST_HEAD(&targets);
+	init_list_head(&targets);
 	sender_status = SENDER_off;
 	udp_init_target_list();
 	if (!OPT_GIVEN(UDP_NO_AUTOSTART))
@@ -435,6 +447,7 @@ static void udp_send_init(void)
 const struct sender udp_sender = {
 	.name = "udp",
 	.init = udp_send_init,
+	.shutdown = udp_shutdown,
 	.shutdown_clients = udp_shutdown_targets,
 	.resolve_target = udp_resolve_target,
 	.client_cmds = {