X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=55f189ad4eb01632dbcd653e104ef7f0cfe54ff8;hp=0b454e792a84d679ec322561a00d7b383b1ef5b3;hb=e763809050b0c9a88cbb7fdf85082e33120efa9b;hpb=089fb2fb2d9e2a3473aa6fac91681ca8ddfffff3

diff --git a/dccp_send.c b/dccp_send.c
index 0b454e79..55f189ad 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);
 }
 
 /**
@@ -84,6 +87,7 @@ 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. */
@@ -164,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)
@@ -223,14 +228,11 @@ 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));
+	generic_com_on(dss, IPPROTO_DCCP);
 }
 
 /**