X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;fp=dccp_send.c;h=770ac601047a892025724bbb7e677a7d8bcaed18;hp=69ba65f5ef864396e81a722d8e69817a0040166f;hb=e2167286448ce2ed9a01a548e7e9832563035088;hpb=3998a8c581623224b7b56bce593646b2c8516a0f

diff --git a/dccp_send.c b/dccp_send.c
index 69ba65f5..770ac601 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -28,9 +28,6 @@
 #include "sched.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;
 
@@ -83,6 +80,12 @@ static void dccp_shutdown_clients(void)
 		dccp_shutdown_client(sc);
 }
 
+static void dccp_shutdown(void)
+{
+	dccp_shutdown_clients();
+	generic_acl_deplete(&dss->acl);
+}
+
 /** * Obtain current MPS according to RFC 4340, sec. 14. */
 static int dccp_init_fec(struct sender_client *sc)
 {
@@ -215,32 +218,39 @@ static char *dccp_status(void)
 	return result;
 }
 
-/**
- * The init function of the dccp sender.
- *
- * \param s pointer to the dccp sender struct.
- *
- * It initializes all function pointers of \a s and starts
- * listening on the given port.
+/*
+ * Initialize the client list and the access control list and listen on the
+ * dccp port.
  */
-void dccp_send_init(struct sender *s)
+static void dccp_send_init(void)
 {
-	s->status = dccp_status;
-	s->send = NULL;
-	s->pre_select = dccp_pre_select;
-	s->post_select = dccp_post_select;
-	s->shutdown_clients = dccp_shutdown_clients;
-	s->resolve_target = NULL;
-	s->help = generic_sender_help;
-	s->client_cmds[SENDER_on] = dccp_com_on;
-	s->client_cmds[SENDER_off] = dccp_com_off;
-	s->client_cmds[SENDER_deny] = dccp_com_deny;
-	s->client_cmds[SENDER_allow] = dccp_com_allow;
-	s->client_cmds[SENDER_add] = NULL;
-	s->client_cmds[SENDER_delete] = NULL;
-
 	init_sender_status(dss, OPT_RESULT(DCCP_ACCESS),
 		OPT_UINT32_VAL(DCCP_PORT), OPT_UINT32_VAL(DCCP_MAX_CLIENTS),
 		OPT_GIVEN(DCCP_DEFAULT_DENY));
 	generic_com_on(dss, IPPROTO_DCCP);
 }
+
+/**
+ * The DCCP sender.
+ *
+ * This sender offers congestion control not available in plain TCP. Most
+ * methods of the sender structure are implemented as simple wrappers for the
+ * generic functions defined in \ref send_common.c. Like UDP streams, DCCP
+ * streams are sent FEC-encoded.
+ */
+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,
+	.client_cmds = {
+		[SENDER_on] = dccp_com_on,
+		[SENDER_off] = dccp_com_off,
+		[SENDER_deny] = dccp_com_deny,
+		[SENDER_allow] = dccp_com_allow,
+	},
+	.help = generic_sender_help,
+	.status = dccp_status,
+};