X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=625fabe766bb7707ac2a35125f7af0ce250f1cae;hp=32e36a997fadadca81df24e12a776b974423420e;hb=71c6743e00d5741dc8eb60594575339543be0bcf;hpb=4c5be8deb22752fad56cff9dd7b35e8d09e3042d

diff --git a/vss.c b/vss.c
index 32e36a99..625fabe7 100644
--- a/vss.c
+++ b/vss.c
@@ -19,7 +19,9 @@
 #include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
+#include <lopsub.h>
 
+#include "server.lsg.h"
 #include "para.h"
 #include "error.h"
 #include "portable_io.h"
@@ -29,7 +31,6 @@
 #include "afs.h"
 #include "server.h"
 #include "net.h"
-#include "server.cmdline.h"
 #include "list.h"
 #include "send.h"
 #include "sched.h"
@@ -1031,8 +1032,7 @@ static void vss_send(struct vss_task *vsst)
 		return;
 	if (chk_barrier("eof", &vsst->eof_barrier, &due, 1) < 0)
 		return;
-	if (chk_barrier("data send", &vsst->data_send_barrier,
-			&due, 1) < 0)
+	if (chk_barrier("data send", &vsst->data_send_barrier, &due, 1) < 0)
 		return;
 	list_for_each_entry_safe(fc, tmp_fc, &fec_client_list, node) {
 		if (fc->state == FEC_STATE_DISABLED)
@@ -1045,9 +1045,9 @@ static void vss_send(struct vss_task *vsst)
 			continue;
 		PARA_DEBUG_LOG("sending %u:%u (%u bytes)\n", fc->group.num,
 			fc->current_slice_num, fc->group.slice_bytes);
+		fc->current_slice_num++;
 		fc->fcp->send_fec(fc->sc, (char *)fc->enc_buf,
 			fc->group.slice_bytes + FEC_HEADER_SIZE);
-		fc->current_slice_num++;
 		fec_active = 1;
 	}
 	if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */
@@ -1066,13 +1066,12 @@ static void vss_send(struct vss_task *vsst)
 			mmd->events++;
 			set_mmd_offset();
 		}
-		/*
-		 * We call the send function also in case of empty chunks as
-		 * they might have still some data queued which can be sent in
-		 * this case.
-		 */
 		vss_get_chunk(mmd->current_chunk, vsst, &buf, &len);
 		for (i = 0; senders[i].name; i++) {
+			/*
+			 * We call ->send() even if len is zero because senders
+			 * might have data queued which can be sent now.
+			 */
 			if (!senders[i].send)
 				continue;
 			senders[i].send(mmd->current_chunk, mmd->chunks_sent,
@@ -1182,10 +1181,8 @@ void init_vss_task(int afs_socket, struct sched *s)
 	static struct vss_task vss_task_struct, *vsst = &vss_task_struct;
 	int i;
 	char *hn = para_hostname(), *home = para_homedir();
-	long unsigned announce_time = conf.announce_time_arg > 0?
-			conf.announce_time_arg : 300,
-		autoplay_delay = conf.autoplay_delay_arg > 0?
-			conf.autoplay_delay_arg : 0;
+	long unsigned announce_time = OPT_UINT32_VAL(ANNOUNCE_TIME),
+		autoplay_delay = OPT_UINT32_VAL(AUTOPLAY_DELAY);
 	vsst->header_interval.tv_sec = 5; /* should this be configurable? */
 	vsst->afs_socket = afs_socket;
 	ms2tv(announce_time, &vsst->announce_tv);
@@ -1198,7 +1195,7 @@ void init_vss_task(int afs_socket, struct sched *s)
 	free(hn);
 	free(home);
 	mmd->sender_cmd_data.cmd_num = -1;
-	if (conf.autoplay_given) {
+	if (OPT_GIVEN(AUTOPLAY)) {
 		struct timeval tmp;
 		mmd->vss_status_flags |= VSS_PLAYING;
 		mmd->new_vss_status_flags |= VSS_PLAYING;