X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=dc325a3d27ad1a121cae583dc69d48b78037214c;hb=0c82c9f7e35d989919894f76a05a084b0422e074;hp=b73562f9733a98e1bea760ea109f1a7cf883d426;hpb=96c1602f28d5ef601bad10941cf079686fc67dfd;p=paraslash.git

diff --git a/vss.c b/vss.c
index b73562f9..dc325a3d 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;
 
@@ -1038,7 +1039,7 @@ static void vss_send(struct vss_task *vsst)
 		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)
@@ -1048,7 +1049,7 @@ static void vss_send(struct vss_task *vsst)
 		fc->current_slice_num++;
 		fc->fcp->send_fec(fc->sc, (char *)fc->enc_buf,
 			fc->group.slice_bytes + FEC_HEADER_SIZE);
-		fec_active = 1;
+		fec_active = true;
 	}
 	if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */
 		if (!fec_active)
@@ -1066,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,
@@ -1181,7 +1181,6 @@ void init_vss_task(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? */
@@ -1193,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;