X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=dccp_send.c;h=bca7ad6781e29d2bb1bea686d3971e02ede59909;hb=HEAD;hp=496895a509f15466e7430af454c784a09bc3ce7e;hpb=f787a626b8885247948e3c47ae886b1e3a7c2a3a;p=paraslash.git

diff --git a/dccp_send.c b/dccp_send.c
index 496895a5..6182c964 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -24,8 +24,8 @@
 #include "net.h"
 #include "server.h"
 #include "list.h"
-#include "send.h"
 #include "sched.h"
+#include "send.h"
 #include "vss.h"
 #include "fd.h"
 
@@ -36,16 +36,19 @@ 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_monitor(struct sched *s)
 {
 	unsigned n;
 
 	FOR_EACH_LISTEN_FD(n, dss)
 		if (dss->listen_fds[n] >= 0)
-			para_fd_set(dss->listen_fds[n], rfds, max_fileno);
+			sched_monitor_readfd(dss->listen_fds[n], s);
 }
 
+#ifndef DCCP_SOCKOPT_TX_CCID
+#define DCCP_SOCKOPT_TX_CCID 14 /**< Set/get the TX CCID. */
+#endif
+
 /**
  * Query the TX CCID used on the sender-client half connection.
  * \param sockfd Server socket descriptor to query (after accept(2)).
@@ -87,8 +90,16 @@ static void dccp_shutdown(void)
 {
 	dccp_shutdown_clients();
 	generic_acl_deplete(&dss->acl);
+	free_sender_status(dss);
 }
 
+#ifndef DCCP_SOCKOPT_GET_CUR_MPS
+#define DCCP_SOCKOPT_GET_CUR_MPS 5 /**< Max packet size, RFC 4340, 14. */
+#endif
+
+/** Estimated worst-case length of a DCCP header including options. */
+#define DCCP_MAX_HEADER 128
+
 /** * Obtain current MPS according to RFC 4340, sec. 14. */
 static int dccp_init_fec(struct sender_client *sc)
 {
@@ -118,14 +129,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_monitor(__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;
 
@@ -147,7 +158,7 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 		shutdown_client(sc, dss);
 		return;
 	}
-	dfc = para_calloc(sizeof(*dfc));
+	dfc = zalloc(sizeof(*dfc));
 	sc->private_data = dfc;
 	k = OPT_UINT32_VAL(DCCP_DATA_SLICES_PER_GROUP);
 	n = OPT_UINT32_VAL(DCCP_SLICES_PER_GROUP);
@@ -231,6 +242,8 @@ static void dccp_send_init(void)
 		OPT_RESULT(DCCP_LISTEN_ADDRESS),
 		OPT_UINT32_VAL(DCCP_PORT), OPT_UINT32_VAL(DCCP_MAX_CLIENTS),
 		OPT_GIVEN(DCCP_DEFAULT_DENY));
+	if (OPT_GIVEN(DCCP_NO_AUTOSTART))
+		return;
 	generic_com_on(dss, IPPROTO_DCCP);
 }
 
@@ -246,8 +259,8 @@ const struct sender dccp_sender = {
 	.name = "dccp",
 	.init = dccp_send_init,
 	.shutdown = dccp_shutdown,
-	.pre_select = dccp_pre_select,
-	.post_select = dccp_post_select,
+	.pre_monitor = dccp_pre_monitor,
+	.post_monitor = dccp_post_monitor,
 	.shutdown_clients = dccp_shutdown_clients,
 	.client_cmds = {
 		[SENDER_on] = dccp_com_on,