X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=06707d6cfee11a70089db3fd7ef230af454e1516;hp=cfa64a143cb1f5d665990dc6aeb23ef94d064d4c;hb=761d9bd95a6601c0b3be6591a6b6672b755e1fbe;hpb=f652ce6afe7f6fd0e42814505234cbf4321a736e

diff --git a/vss.c b/vss.c
index cfa64a14..06707d6c 100644
--- a/vss.c
+++ b/vss.c
@@ -565,8 +565,14 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 		if (payload_size < g->slice_bytes)
 			memset(fc->extra_header_buf + payload_size, 0,
 				g->slice_bytes - payload_size);
-		fc->src_data[i] = fc->extra_header_buf;
-		assert(i == g->num_header_slices - 1);
+		/*
+		 * There might be more than one header slice to fill although
+		 * only the first one will be used. Set all header slices to
+		 * our extra buffer.
+		 */
+		while (i < g->num_header_slices)
+			fc->src_data[i++] = fc->extra_header_buf;
+		break; /* we don't want i to be increased. */
 	}
 
 	/*
@@ -1114,12 +1120,11 @@ static void vss_send(struct vss_task *vsst)
 	}
 }
 
-static void vss_post_select(struct sched *s, struct task *t)
+static int vss_post_select(struct sched *s, struct task *t)
 {
 	int ret, i;
 	struct vss_task *vsst = container_of(t, struct vss_task, task);
 
-
 	if (mmd->sender_cmd_data.cmd_num >= 0) {
 		int num = mmd->sender_cmd_data.cmd_num,
 			sender_num = mmd->sender_cmd_data.sender_num;
@@ -1151,6 +1156,7 @@ static void vss_post_select(struct sched *s, struct task *t)
 			(vss_next() && vss_playing()))
 		tv_add(now, &vsst->announce_tv, &vsst->data_send_barrier);
 	vss_send(vsst);
+	return 0;
 }
 
 /**