X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=bca7ad6781e29d2bb1bea686d3971e02ede59909;hp=bd6c0257e432161c3d468505ec275638c70f010e;hb=442a3320ff155d09b990c0ee2abace399cbcd6dd;hpb=b0ec08945c28e35558ed85691b57f314724f7613

diff --git a/dccp_send.c b/dccp_send.c
index bd6c0257..bca7ad67 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -21,8 +21,8 @@
 #include "error.h"
 #include "string.h"
 #include "afh.h"
-#include "server.h"
 #include "net.h"
+#include "server.h"
 #include "list.h"
 #include "send.h"
 #include "sched.h"
@@ -39,8 +39,11 @@ struct dccp_fec_client {
 static void dccp_pre_select(int *max_fileno, fd_set *rfds,
 		__a_unused fd_set *wfds)
 {
-	if (dss->listen_fd >= 0)
-		para_fd_set(dss->listen_fd, rfds, max_fileno);
+	unsigned n;
+
+	FOR_EACH_LISTEN_FD(n, dss)
+		if (dss->listen_fds[n] >= 0)
+			para_fd_set(dss->listen_fds[n], rfds, max_fileno);
 }
 
 /**
@@ -80,6 +83,13 @@ static void dccp_shutdown_clients(void)
 		dccp_shutdown_client(sc);
 }
 
+static void dccp_shutdown(void)
+{
+	dccp_shutdown_clients();
+	generic_acl_deplete(&dss->acl);
+	free_sender_status(dss);
+}
+
 /** * Obtain current MPS according to RFC 4340, sec. 14. */
 static int dccp_init_fec(struct sender_client *sc)
 {
@@ -158,7 +168,8 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 
 static int dccp_com_on(__a_unused struct sender_command_data *scd)
 {
-	return generic_com_on(dss, IPPROTO_DCCP);
+	generic_com_on(dss, IPPROTO_DCCP);
+	return 1;
 }
 
 static int dccp_com_off(__a_unused struct sender_command_data *scd)
@@ -217,14 +228,13 @@ static char *dccp_status(void)
  */
 static void dccp_send_init(void)
 {
-	int ret;
-
 	init_sender_status(dss, OPT_RESULT(DCCP_ACCESS),
+		OPT_RESULT(DCCP_LISTEN_ADDRESS),
 		OPT_UINT32_VAL(DCCP_PORT), OPT_UINT32_VAL(DCCP_MAX_CLIENTS),
 		OPT_GIVEN(DCCP_DEFAULT_DENY));
-	ret = generic_com_on(dss, IPPROTO_DCCP);
-	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	if (OPT_GIVEN(DCCP_NO_AUTOSTART))
+		return;
+	generic_com_on(dss, IPPROTO_DCCP);
 }
 
 /**
@@ -238,7 +248,7 @@ static void dccp_send_init(void)
 const struct sender dccp_sender = {
 	.name = "dccp",
 	.init = dccp_send_init,
-	.shutdown = dccp_shutdown_clients,
+	.shutdown = dccp_shutdown,
 	.pre_select = dccp_pre_select,
 	.post_select = dccp_post_select,
 	.shutdown_clients = dccp_shutdown_clients,