X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=3ace49e9e90e8fb27144964a0f61f1fae267e843;hp=5b8c687d7651dbf92ba3631d7b9aea3005ed3608;hb=5f511d41a111aa04189b32fd77d02e16f90ff2cc;hpb=2e6b8f2ebf8131f906ab657764f9cc3100eee32b

diff --git a/vss.c b/vss.c
index 5b8c687d..3ace49e9 100644
--- a/vss.c
+++ b/vss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,8 +11,14 @@
  * senders.
  */
 
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <regex.h>
 #include <osl.h>
+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
@@ -565,8 +571,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. */
 	}
 
 	/*
@@ -1174,8 +1186,7 @@ void init_vss_task(int afs_socket, struct sched *s)
 	vsst->header_interval.tv_sec = 5; /* should this be configurable? */
 	vsst->afs_socket = afs_socket;
 	vsst->task.pre_select = vss_pre_select;
-	vsst->task.new_post_select = vss_post_select;
-	vsst->task.post_select = NULL;
+	vsst->task.post_select = vss_post_select;
 	ms2tv(announce_time, &vsst->announce_tv);
 	PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&vsst->announce_tv));
 	INIT_LIST_HEAD(&fec_client_list);