X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=vss.c;h=d6f914e72870efb58b8fd81570e31e0b939a4c2e;hb=9c1aa53f0cda586aa13a022452d16a2704055578;hp=8f177bab56b90a221f4ac84b73e4c54971df4a0c;hpb=f0e41e36c3f1a3a5bb6ff66d92d2814391d8f908;p=paraslash.git

diff --git a/vss.c b/vss.c
index 8f177bab..d6f914e7 100644
--- a/vss.c
+++ b/vss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2012 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. */
 	}
 
 	/*
@@ -912,7 +924,8 @@ static void vss_pre_select(struct sched *s, struct task *t)
 		tv_add(now, &vsst->announce_tv, &vsst->data_send_barrier);
 		set_eof_barrier(vsst);
 		mmd->chunks_sent = 0;
-		mmd->current_chunk = mmd->repos_request;
+		mmd->current_chunk = afh_get_start_chunk(mmd->repos_request,
+			&mmd->afd.afhi);
 		mmd->new_vss_status_flags &= ~VSS_REPOS;
 		set_mmd_offset();
 	}
@@ -1114,12 +1127,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 +1163,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;
 }
 
 /**