X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=6cfdfbbeddccb42cd46a5d4b8c06aec24a0427ec;hp=77bee09783ad2cd46b7a55a70722b2dc5ffc4c93;hb=18f8523446329aaabbcdd14ec2be6fc27802ef4f;hpb=1fa9dbea57d2dbc5d9b728a83a583c3a8f675410

diff --git a/dccp_send.c b/dccp_send.c
index 77bee097..6cfdfbbe 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -97,12 +97,14 @@ static int dccp_init_fec(struct sender_client *sc)
 	}
 	PARA_INFO_LOG("current MPS = %d bytes\n", mps);
 	assert(mps > 0);
+	if (conf.dccp_max_slice_size_arg > 0)
+		mps = PARA_MIN(mps, conf.dccp_max_slice_size_arg);
 	return mps;
 }
 
 static int dccp_send_fec(struct sender_client *sc, char *buf, size_t len)
 {
-	int ret = write_nonblock(sc->fd, buf, len, 0);
+	int ret = write_nonblock(sc->fd, buf, len);
 
 	if (ret < 0)
 		dccp_shutdown_client(sc);
@@ -139,8 +141,8 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 	}
 	dfc = para_calloc(sizeof(*dfc));
 	sc->private_data = dfc;
-	dfc->fcp.slices_per_group	= 4;
-	dfc->fcp.data_slices_per_group	= 3;
+	dfc->fcp.data_slices_per_group	= conf.dccp_data_slices_per_group_arg;
+	dfc->fcp.slices_per_group	= conf.dccp_slices_per_group_arg;
 	dfc->fcp.init_fec		= dccp_init_fec;
 	dfc->fcp.send_fec		= dccp_send_fec;
 	dfc->fc = vss_add_fec_client(sc, &dfc->fcp);
@@ -210,7 +212,7 @@ static char *dccp_info(void)
  */
 void dccp_send_init(struct sender *s)
 {
-	int ret;
+	int ret, k, n;
 
 	s->info = dccp_info;
 	s->send = NULL;
@@ -225,6 +227,15 @@ void dccp_send_init(struct sender *s)
 	s->client_cmds[SENDER_ADD] = NULL;
 	s->client_cmds[SENDER_DELETE] = NULL;
 
+	k = conf.dccp_data_slices_per_group_arg;
+	n = conf.dccp_slices_per_group_arg;
+
+	if (k <= 0 || n <= 0 || k >= n) {
+		PARA_WARNING_LOG("invalid FEC parameters, using defaults\n");
+		conf.dccp_data_slices_per_group_arg = 3;
+		conf.dccp_slices_per_group_arg = 4;
+	}
+
 	init_sender_status(dss, conf.dccp_access_arg, conf.dccp_access_given,
 		conf.dccp_port_arg, conf.dccp_max_clients_arg,
 		conf.dccp_default_deny_given);