X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=dccp_send.c;h=5c274237ce33a106c90b3570b000f01572c5ad44;hb=bb899fb1a0c279a2890ff30d11bf7aec50fb92ed;hp=9ab21f8a096426cdb3f7d3a549bd53e270762655;hpb=0b786d977ded3c3922e851e5b8d60837b43469b9;p=paraslash.git

diff --git a/dccp_send.c b/dccp_send.c
index 9ab21f8a..5c274237 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -21,16 +21,13 @@
 #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"
+#include "send.h"
 #include "vss.h"
 #include "fd.h"
-#include "close_on_fork.h"
-#include "chunk_queue.h"
-#include "acl.h"
 
 static struct sender_status dccp_sender_status, *dss = &dccp_sender_status;
 
@@ -39,11 +36,13 @@ struct dccp_fec_client {
 	struct fec_client *fc;
 };
 
-static void dccp_pre_select(int *max_fileno, fd_set *rfds,
-		__a_unused fd_set *wfds)
+static void dccp_pre_select(struct sched *s)
 {
-	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)
+			sched_monitor_readfd(dss->listen_fds[n], s);
 }
 
 /**
@@ -83,6 +82,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)
 {
@@ -112,14 +118,14 @@ static void dccp_send_fec(struct sender_client *sc, char *buf, size_t len)
 		dccp_shutdown_client(sc);
 }
 
-static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
+static void dccp_post_select(__a_unused struct sched *s)
 {
 	struct sender_client *sc;
 	struct dccp_fec_client *dfc;
 	int tx_ccid;
 	uint32_t k, n;
 
-	sc = accept_sender_client(dss, rfds);
+	sc = accept_sender_client(dss);
 	if (!sc)
 		return;
 
@@ -161,7 +167,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)
@@ -220,14 +227,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);
 }
 
 /**
@@ -241,6 +247,7 @@ static void dccp_send_init(void)
 const struct sender dccp_sender = {
 	.name = "dccp",
 	.init = dccp_send_init,
+	.shutdown = dccp_shutdown,
 	.pre_select = dccp_pre_select,
 	.post_select = dccp_post_select,
 	.shutdown_clients = dccp_shutdown_clients,