X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=77d2f37626eaee75deeb7ab2e52b99d9dfd50182;hp=3632cf54557350f35dc19ec8a2ce07ce9a6d5c0f;hb=70a630c4c422298d40453c537edf9d326b613abc;hpb=8d106ca317a2c42f35a86ba244f843688f6939e6

diff --git a/vss.c b/vss.c
index 3632cf54..77d2f376 100644
--- a/vss.c
+++ b/vss.c
@@ -1024,7 +1024,8 @@ err:
  */
 static void vss_send(struct vss_task *vsst)
 {
-	int i, fec_active = 0;
+	int i;
+	bool fec_active = false;
 	struct timeval due;
 	struct fec_client *fc, *tmp_fc;
 
@@ -1032,24 +1033,23 @@ static void vss_send(struct vss_task *vsst)
 		return;
 	if (chk_barrier("eof", &vsst->eof_barrier, &due, 1) < 0)
 		return;
-	if (chk_barrier("data send", &vsst->data_send_barrier,
-			&due, 1) < 0)
+	if (chk_barrier("data send", &vsst->data_send_barrier, &due, 1) < 0)
 		return;
 	list_for_each_entry_safe(fc, tmp_fc, &fec_client_list, node) {
 		if (fc->state == FEC_STATE_DISABLED)
 			continue;
 		if (!next_slice_is_due(fc, NULL)) {
-			fec_active = 1;
+			fec_active = true;
 			continue;
 		}
 		if (compute_next_fec_slice(fc, vsst) <= 0)
 			continue;
 		PARA_DEBUG_LOG("sending %u:%u (%u bytes)\n", fc->group.num,
 			fc->current_slice_num, fc->group.slice_bytes);
+		fc->current_slice_num++;
 		fc->fcp->send_fec(fc->sc, (char *)fc->enc_buf,
 			fc->group.slice_bytes + FEC_HEADER_SIZE);
-		fc->current_slice_num++;
-		fec_active = 1;
+		fec_active = true;
 	}
 	if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */
 		if (!fec_active)
@@ -1067,13 +1067,12 @@ static void vss_send(struct vss_task *vsst)
 			mmd->events++;
 			set_mmd_offset();
 		}
-		/*
-		 * We call the send function also in case of empty chunks as
-		 * they might have still some data queued which can be sent in
-		 * this case.
-		 */
 		vss_get_chunk(mmd->current_chunk, vsst, &buf, &len);
 		for (i = 0; senders[i].name; i++) {
+			/*
+			 * We call ->send() even if len is zero because senders
+			 * might have data queued which can be sent now.
+			 */
 			if (!senders[i].send)
 				continue;
 			senders[i].send(mmd->current_chunk, mmd->chunks_sent,
@@ -1178,11 +1177,10 @@ static int vss_post_select(struct sched *s, void *context)
  * This also initializes all supported senders and starts streaming
  * if the --autoplay command line flag was given.
  */
-void init_vss_task(int afs_socket, struct sched *s)
+void vss_init(int afs_socket, struct sched *s)
 {
 	static struct vss_task vss_task_struct, *vsst = &vss_task_struct;
 	int i;
-	char *hn = para_hostname(), *home = para_homedir();
 	long unsigned announce_time = OPT_UINT32_VAL(ANNOUNCE_TIME),
 		autoplay_delay = OPT_UINT32_VAL(AUTOPLAY_DELAY);
 	vsst->header_interval.tv_sec = 5; /* should this be configurable? */
@@ -1194,8 +1192,6 @@ void init_vss_task(int afs_socket, struct sched *s)
 		PARA_NOTICE_LOG("initializing %s sender\n", senders[i].name);
 		senders[i].init(&senders[i]);
 	}
-	free(hn);
-	free(home);
 	mmd->sender_cmd_data.cmd_num = -1;
 	if (OPT_GIVEN(AUTOPLAY)) {
 		struct timeval tmp;