X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=4c9f362344ce5bb8c6ae1e6b826fd78aaa140684;hp=8f177bab56b90a221f4ac84b73e4c54971df4a0c;hb=8843e506d1af0f71c61e2c301bea9b612187e360;hpb=0703f75a276020f9645f987134d49402f7c019c0

diff --git a/vss.c b/vss.c
index 8f177bab..4c9f3623 100644
--- a/vss.c
+++ b/vss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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. */
 	}
 
 	/*
@@ -932,7 +938,7 @@ static void vss_pre_select(struct sched *s, struct task *t)
 
 static int recv_afs_msg(int afs_socket, int *fd, uint32_t *code, uint32_t *data)
 {
-	char control[255], buf[8];
+	char control[255] __a_aligned(8), buf[8];
 	struct msghdr msg = {.msg_iov = NULL};
 	struct cmsghdr *cmsg;
 	struct iovec iov;
@@ -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;
 }
 
 /**