X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=dccp_send.c;h=9a2f6caf33a2982cc621de6d8cfe04f27fd25573;hb=4ebaf62d6bbd0498d93e19bc4f0a3c9564b1a8f5;hp=0e69a969055f1a8466eae06770f91d7ddcfef6db;hpb=28f8405e062fcff1f0ce90eb01ffeaca299cffa7;p=paraslash.git

diff --git a/dccp_send.c b/dccp_send.c
index 0e69a969..9a2f6caf 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -32,17 +32,11 @@
 #include "server.cmdline.h"
 #include "acl.h"
 
-/** Do not write more than that many bytes at once. */
-#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,
@@ -89,24 +83,29 @@ static void dccp_shutdown_clients(void)
 		dccp_shutdown_client(sc);
 }
 
-static int dccp_open(void *client, struct fec_client_parms **fcp)
+/** * Obtain current MPS according to RFC 4340, sec. 14. */
+static int dccp_init_fec(struct sender_client *sc)
 {
-	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;
+	int mps, ret;
+	socklen_t ml = sizeof(mps);
+
+	/* If call fails, return some sensible minimum value */
+	ret = getsockopt(sc->fd, SOL_DCCP, DCCP_SOCKOPT_GET_CUR_MPS, &mps, &ml);
+	if (ret < 0) {
+		PARA_NOTICE_LOG("can not determine MPS: %s\n", strerror(errno));
+		mps = generic_max_transport_msg_size(sc->fd) - DCCP_MAX_HEADER;
+	}
+	PARA_INFO_LOG("current MPS = %d bytes\n", mps);
+	assert(mps > 0);
+	return mps;
 }
 
-static int dccp_send_fec(char *buf, size_t len, void *private_data)
+static int dccp_send_fec(struct sender_client *sc, char *buf, size_t len)
 {
-	struct dccp_fec_client *dfc = private_data;
-	int ret = write_nonblock(dfc->sc->fd, buf, len, DCCP_MAX_BYTES_PER_WRITE);
+	int ret = write_nonblock(sc->fd, buf, len);
 
 	if (ret < 0)
-		dccp_shutdown_client(dfc->sc);
+		dccp_shutdown_client(sc);
 	return ret;
 }
 
@@ -140,8 +139,11 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 	}
 	dfc = para_calloc(sizeof(*dfc));
 	sc->private_data = dfc;
-	dfc->sc = sc;
-	vss_add_fec_client(self, dfc, &dfc->fc);
+	dfc->fcp.slices_per_group	= 4;
+	dfc->fcp.data_slices_per_group	= 3;
+	dfc->fcp.init_fec		= dccp_init_fec;
+	dfc->fcp.send_fec		= dccp_send_fec;
+	dfc->fc = vss_add_fec_client(sc, &dfc->fcp);
 }
 
 static int dccp_com_on(__a_unused struct sender_command_data *scd)
@@ -212,8 +214,6 @@ void dccp_send_init(struct sender *s)
 
 	s->info = dccp_info;
 	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;
@@ -231,5 +231,4 @@ 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;
 }