X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=4be6e18a6833c313b40c0453a10fe021b75b3ee5;hp=898180c013a4845481bbfd48782fa9168f8e9048;hb=f099900540c4e4c54b10181254b895ccfe6ef410;hpb=15166c2d894212e8d326e7088d11c98c95c4fc06

diff --git a/vss.c b/vss.c
index 898180c0..4be6e18a 100644
--- a/vss.c
+++ b/vss.c
@@ -26,8 +26,8 @@
 #include "net.h"
 #include "server.cmdline.h"
 #include "list.h"
-#include "vss.h"
 #include "send.h"
+#include "vss.h"
 #include "ipc.h"
 #include "fd.h"
 #include "sched.h"
@@ -137,6 +137,10 @@ struct fec_group {
 struct fec_client {
 	/** If negative, this client is temporarily disabled. */
 	int error;
+	/** Whether the sender client is ready to push out data. */
+	bool ready;
+	/** The connected sender client (transport layer). */
+	struct sender_client *sc;
 	/** Parameters requested by the client. */
 	struct fec_client_parms *fcp;
 	/** Used by the core FEC code. */
@@ -161,6 +165,8 @@ struct fec_client {
 	int num_extra_slices;
 	/** Contains the FEC-encoded data. */
 	unsigned char *enc_buf;
+	/** Pointer obtained from sender when the client is added. */
+	void *private_data;
 };
 
 /**
@@ -408,38 +414,20 @@ size_t vss_get_fec_eof_packet(const char **buf)
 /**
  * Add one entry to the list of active fec clients.
  *
- * \param fcp Describes the fec parameters to be used for this client.
- * \param result An opaque pointer that must be used by remove the client later.
+ * \param sc  Generic sender_client data of the transport layer.
+ * \param fcp FEC parameters as supplied by the transport layer.
  *
- * \return Standard.
+ * \return Newly allocated fec_client struct.
  */
-int vss_add_fec_client(struct fec_client_parms *fcp, struct fec_client **result)
+struct fec_client *vss_add_fec_client(struct sender_client *sc,
+				      struct fec_client_parms *fcp)
 {
-	int ret;
-	struct fec_client *fc;
+	struct fec_client *fc = para_calloc(sizeof(*fc));
 
-	if (fcp->max_slice_bytes < FEC_HEADER_SIZE + fcp->data_slices_per_group)
-		return -ERRNO_TO_PARA_ERROR(EINVAL);
-	fc = para_calloc(sizeof(*fc));
+	fc->sc  = sc;
 	fc->fcp = fcp;
-	ret = fec_new(fcp->data_slices_per_group, fcp->slices_per_group,
-		&fc->parms);
-	if (ret < 0)
-		goto err;
-	fc->first_stream_chunk = -1; /* stream not yet started */
-	fc->src_data = para_malloc(fc->fcp->slices_per_group * sizeof(char *));
-	fc->enc_buf = para_calloc(fc->fcp->max_slice_bytes);
-	fc->num_extra_slices = 0;
-	fc->extra_src_buf = para_calloc(fc->fcp->max_slice_bytes);
-	fc->next_header_time.tv_sec = 0;
 	para_list_add(&fc->node, &fec_client_list);
-	*result = fc;
-	return 1;
-err:
-	fec_free(fc->parms);
-	free(fc);
-	*result = NULL;
-	return ret;
+	return fc;
 }
 
 /**
@@ -837,6 +825,42 @@ err:
 	mmd->new_vss_status_flags = VSS_NEXT;
 }
 
+static int initialize_fec_client(struct fec_client *fc)
+{
+	int ret;
+	struct fec_client_parms *fcp = fc->fcp;
+
+	if (fcp->init_fec) {
+		/*
+		 * Set the maximum slice size to the Maximum Packet Size if the
+		 * transport protocol allows to determine this value. The user
+		 * can specify a slice size up to this value.
+		 */
+		ret = fcp->init_fec(fc->sc);
+		if (ret < 0)
+			return ret;
+		if (!fcp->max_slice_bytes || fcp->max_slice_bytes > ret)
+			fcp->max_slice_bytes = ret;
+	}
+	if (fcp->max_slice_bytes < FEC_HEADER_SIZE + fcp->data_slices_per_group)
+		return -ERRNO_TO_PARA_ERROR(EINVAL);
+	ret = fec_new(fcp->data_slices_per_group, fcp->slices_per_group,
+		&fc->parms);
+	if (ret < 0)
+		goto err;
+	fc->first_stream_chunk = -1; /* stream not yet started */
+	fc->src_data = para_malloc(fc->fcp->slices_per_group * sizeof(char *));
+	fc->enc_buf = para_calloc(fc->fcp->max_slice_bytes);
+	fc->num_extra_slices = 0;
+	fc->extra_src_buf = para_calloc(fc->fcp->max_slice_bytes);
+	fc->next_header_time.tv_sec = 0;
+	fc->ready = true;
+	return 1;
+err:
+	fec_free(fc->parms);
+	return ret;
+}
+
 /**
  * Main sending function.
  *
@@ -848,7 +872,7 @@ err:
  */
 static void vss_send(struct vss_task *vsst)
 {
-	int i, fec_active = 0;
+	int ret, i, fec_active = 0;
 	struct timeval due;
 	struct fec_client *fc, *tmp_fc;
 
@@ -862,6 +886,13 @@ static void vss_send(struct vss_task *vsst)
 	list_for_each_entry_safe(fc, tmp_fc, &fec_client_list, node) {
 		if (fc->error < 0)
 			continue;
+		if (!fc->ready) {
+			ret = initialize_fec_client(fc);
+			if (ret < 0) {
+				PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+				continue;
+			}
+		}
 		if (!next_slice_is_due(fc, NULL)) {
 			fec_active = 1;
 			continue;
@@ -870,9 +901,8 @@ static void vss_send(struct vss_task *vsst)
 			continue;
 		PARA_DEBUG_LOG("sending %d:%d (%u bytes)\n", fc->group.num,
 			fc->current_slice_num, fc->fcp->max_slice_bytes);
-		fc->fcp->send((char *)fc->enc_buf,
-			fc->fcp->max_slice_bytes,
-			fc->fcp->private_data);
+		fc->fcp->send_fec(fc->sc, (char *)fc->enc_buf,
+				  fc->fcp->max_slice_bytes);
 		fc->current_slice_num++;
 		fec_active = 1;
 	}