X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=235219c1148aac2412b1b41879bf045d0b571af8;hb=42f73552054f4b013b5ba09da5400827f9c624f3;hp=737b77ac29e546fcdbf808dbd884e5dcf5b291e5;hpb=f1164756a9ce8f61b12060a48b84977f24d9e2b3;p=paraslash.git

diff --git a/vss.c b/vss.c
index 737b77ac..235219c1 100644
--- a/vss.c
+++ b/vss.c
@@ -416,7 +416,8 @@ static int compute_group_size(struct vss_task *vsst, struct fec_group *g,
 		g->bytes += len;
 		g->num_chunks++;
 	}
-	assert(g->num_chunks);
+	if (g->num_chunks == 0)
+		return -E_EOF;
 	PARA_DEBUG_LOG("group #%u: %u chunks, %u bytes total\n", g->num,
 		g->num_chunks, g->bytes);
 	return 1;
@@ -689,9 +690,11 @@ void vss_del_fec_client(struct fec_client *fc)
 
 	list_del(&fc->node);
 	free(fc->enc_buf);
-	for (i = 0; i < fc_num_data_slices(fc); i++)
-		free(fc->src_data[i]);
-	free(fc->src_data);
+	if (fc->src_data) {
+		for (i = 0; i < fc_num_data_slices(fc); i++)
+			free(fc->src_data[i]);
+		free(fc->src_data);
+	}
 	fec_free(fc->parms);
 	free(fc);
 }
@@ -842,7 +845,6 @@ static void vss_compute_timeout(struct sched *s, struct vss_task *vsst)
 
 static void vss_eof(struct vss_task *vsst)
 {
-
 	if (!vsst->map)
 		return;
 	if (mmd->new_vss_status_flags & VSS_NOMORE)
@@ -853,8 +855,8 @@ static void vss_eof(struct vss_task *vsst)
 	para_munmap(vsst->map, vsst->mapsize);
 	vsst->map = NULL;
 	mmd->chunks_sent = 0;
-	//mmd->offset = 0;
 	mmd->afd.afhi.seconds_total = 0;
+	mmd->afd.afhi.chunks_total = 0;
 	mmd->afd.afhi.chunk_tv.tv_sec = 0;
 	mmd->afd.afhi.chunk_tv.tv_usec = 0;
 	free(mmd->afd.afhi.chunk_table);
@@ -962,6 +964,11 @@ static void recv_afs_result(struct vss_task *vsst, fd_set *rfds)
 	if (ret < 0)
 		goto err;
 	vsst->afsss = AFS_SOCKET_READY;
+	if (afs_code == NO_ADMISSIBLE_FILES) {
+		PARA_NOTICE_LOG("no admissible files\n");
+		ret = 0;
+		goto err;
+	}
 	ret = -E_NOFD;
 	if (afs_code != NEXT_AUDIO_FILE) {
 		PARA_ERROR_LOG("afs code: %u, expected: %d\n", afs_code,
@@ -998,9 +1005,11 @@ static void recv_afs_result(struct vss_task *vsst, fd_set *rfds)
 	return;
 err:
 	free(mmd->afd.afhi.chunk_table);
+	mmd->afd.afhi.chunk_table = NULL;
 	if (passed_fd >= 0)
 		close(passed_fd);
-	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	if (ret < 0)
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	mmd->new_vss_status_flags = VSS_NEXT;
 }