X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=dccp_send.c;h=b13f719ecf6e4ce0c9e245ce4fd49e74c6fe95d1;hb=f099900540c4e4c54b10181254b895ccfe6ef410;hp=7d8967cca6f9ad47dc5b8578b350fd81d2ad49d8;hpb=eecc102ad0abeb0335fe994bb72031a15b9090d7;p=paraslash.git

diff --git a/dccp_send.c b/dccp_send.c
index 7d8967cc..b13f719e 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -24,8 +24,8 @@
 #include "server.h"
 #include "net.h"
 #include "list.h"
-#include "vss.h"
 #include "send.h"
+#include "vss.h"
 #include "fd.h"
 #include "close_on_fork.h"
 #include "chunk_queue.h"
@@ -36,6 +36,14 @@
 #define DCCP_MAX_BYTES_PER_WRITE 1024
 
 static struct sender_status dccp_sender_status, *dss = &dccp_sender_status;
+static struct sender *self;
+
+
+struct dccp_fec_client {
+	struct fec_client_parms fcp;
+	struct fec_client *fc;
+	struct sender_client *sc;
+};
 
 static void dccp_pre_select(int *max_fileno, fd_set *rfds,
 		__a_unused fd_set *wfds)
@@ -65,14 +73,50 @@ static int dccp_get_tx_ccid(int sockfd)
 	return tx_ccid;
 }
 
+static void dccp_shutdown_client(struct sender_client *sc)
+{
+	struct dccp_fec_client *dfc = sc->private_data;
+
+	vss_del_fec_client(dfc->fc);
+	shutdown_client(sc, dss);
+}
+
+static void dccp_shutdown_clients(void)
+{
+	struct sender_client *sc, *tmp;
+
+	list_for_each_entry_safe(sc, tmp, &dss->client_list, node)
+		dccp_shutdown_client(sc);
+}
+
+static int dccp_open(void *client, struct fec_client_parms **fcp)
+{
+	struct dccp_fec_client *dfc = client;
+
+	dfc->fcp.slices_per_group = 4;
+	dfc->fcp.data_slices_per_group = 3;
+	dfc->fcp.max_slice_bytes = 1472;
+	*fcp = &dfc->fcp;
+	return 1;
+}
+
+static int dccp_send_fec(char *buf, size_t len, void *private_data)
+{
+	struct dccp_fec_client *dfc = private_data;
+	int ret = write_nonblock(dfc->sc->fd, buf, len, DCCP_MAX_BYTES_PER_WRITE);
+
+	if (ret < 0)
+		dccp_shutdown_client(dfc->sc);
+	return ret;
+}
+
 static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
 	struct sender_client *sc;
+	struct dccp_fec_client *dfc;
 	int tx_ccid;
 
-	if (dss->listen_fd < 0 || !FD_ISSET(dss->listen_fd, rfds))
-		return;
-	sc = accept_sender_client(dss);
+	sc = accept_sender_client(dss, rfds);
 	if (!sc)
 		return;
 
@@ -89,26 +133,15 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 	 * from the client; by shutting down this unused communication path we can
 	 * reduce processing costs a bit. See analogous comment in dccp_recv.c.
 	 */
-	if (shutdown(sc->fd, SHUT_RD) >= 0)
+	if (shutdown(sc->fd, SHUT_RD) < 0) {
+		PARA_WARNING_LOG("%s\n", strerror(errno));
+		shutdown_client(sc, dss);
 		return;
-	PARA_WARNING_LOG("%s\n", strerror(errno));
-	shutdown_client(sc, dss);
-}
-
-static void dccp_send(long unsigned current_chunk,
-		__a_unused long unsigned chunks_sent, const char *buf,
-		size_t len, const char *header_buf, size_t header_len)
-{
-	struct sender_client *sc, *tmp;
-
-	list_for_each_entry_safe(sc, tmp, &dss->client_list, node)
-		send_chunk(sc, dss, DCCP_MAX_BYTES_PER_WRITE, current_chunk, buf,
-			len, header_buf, header_len);
-}
-
-static void dccp_shutdown_clients(void)
-{
-	shutdown_clients(dss);
+	}
+	dfc = para_calloc(sizeof(*dfc));
+	sc->private_data = dfc;
+	dfc->sc = sc;
+	/* XXX RESOLVED LATER vss_add_fec_client(self, dfc, &dfc->fc); */
 }
 
 static int dccp_com_on(__a_unused struct sender_command_data *scd)
@@ -140,12 +173,13 @@ static int dccp_com_allow(struct sender_command_data *scd)
  */
 static const char *dccp_list_available_ccids(void)
 {
-	uint8_t ccids[DCCP_MAX_HOST_CCIDS];
-	uint8_t nccids = sizeof(ccids), i, len;
 	/* Worst case length: n * 3 digits + n-1 spaces + '\0' */
 	static char list[DCCP_MAX_HOST_CCIDS * 4];
+	uint8_t *ccids;
+	int i, len, nccids;
 
-	if (dccp_available_ccids(ccids, &nccids) == NULL) {
+	nccids = dccp_available_ccids(&ccids);
+	if (nccids < 0) {
 		snprintf(list, sizeof(list), "Unable to query available CCIDs");
 	} else {
 		for (i = len = 0; i < nccids; i++)
@@ -177,7 +211,9 @@ void dccp_send_init(struct sender *s)
 	int ret;
 
 	s->info = dccp_info;
-	s->send = dccp_send;
+	s->send = NULL;
+	s->open = dccp_open;
+	s->send_fec = dccp_send_fec;
 	s->pre_select = dccp_pre_select;
 	s->post_select = dccp_post_select;
 	s->shutdown_clients = dccp_shutdown_clients;
@@ -195,4 +231,5 @@ void dccp_send_init(struct sender *s)
 	ret = generic_com_on(dss, IPPROTO_DCCP);
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	self = s;
 }