X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=304a42e749a647d5d6a568ae0e9850d183907979;hp=9a2f6caf33a2982cc621de6d8cfe04f27fd25573;hb=69a7e7aa11d8bf9b05d6431c57276befbc9b35a3;hpb=72d73eb53316768a5a3527cf56afad7158d9ef4d

diff --git a/dccp_send.c b/dccp_send.c
index 9a2f6caf..304a42e7 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -97,6 +97,8 @@ 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;
 }
 
@@ -139,10 +141,11 @@ 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->fcp.need_periodic_header   = false;
 	dfc->fc = vss_add_fec_client(sc, &dfc->fcp);
 }
 
@@ -153,6 +156,7 @@ static int dccp_com_on(__a_unused struct sender_command_data *scd)
 
 static int dccp_com_off(__a_unused struct sender_command_data *scd)
 {
+	dccp_shutdown_clients();
 	generic_com_off(dss);
 	return 1;
 }
@@ -210,13 +214,14 @@ 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;
 	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;
@@ -225,6 +230,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);