vss: unify calls to the FEC layer

[paraslash.git] / vss.c

diff --git a/vss.c b/vss.c
index afde0dcb829b42422310eaf33361b990bb98c2ac..4be6e18a6833c313b40c0453a10fe021b75b3ee5 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -137,8 +137,10 @@ struct fec_group {
 struct fec_client {
        /** If negative, this client is temporarily disabled. */
        int error;
-       /** UDP or DCCP. */
-       struct sender *sender;
+       /** 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. */
@@ -412,21 +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 sender *sender, void *private_data,
-               struct fec_client **result)
+struct fec_client *vss_add_fec_client(struct sender_client *sc,
+                                     struct fec_client_parms *fcp)
 {
        struct fec_client *fc = para_calloc(sizeof(*fc));
 
-       fc->private_data = private_data;
-       fc->sender = sender;
+       fc->sc  = sc;
+       fc->fcp = fcp;
        para_list_add(&fc->node, &fec_client_list);
-       *result = fc;
-       return 1;
+       return fc;
 }
 
 /**
@@ -700,7 +701,6 @@ static void vss_pre_select(struct sched *s, struct task *t)
                list_for_each_entry_safe(fc, tmp, &fec_client_list, node) {
                        fc->first_stream_chunk = -1;
                        fc->error = 0;
-                       fc->fcp = NULL;
                }
                mmd->stream_start.tv_sec = 0;
                mmd->stream_start.tv_usec = 0;
@@ -825,17 +825,23 @@ err:
        mmd->new_vss_status_flags = VSS_NEXT;
 }
 
-static int open_fec_client(struct fec_client *fc)
+static int initialize_fec_client(struct fec_client *fc)
 {
        int ret;
-       struct fec_client_parms *fcp;
+       struct fec_client_parms *fcp = fc->fcp;
 
-       ret = fc->sender->open(fc->private_data, &fc->fcp);
-       if (ret < 0) {
-               fc->fcp = NULL;
-               return ret;
+       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;
        }
-       fcp = fc->fcp;
        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,
@@ -848,6 +854,7 @@ static int open_fec_client(struct fec_client *fc)
        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);
@@ -879,8 +886,8 @@ 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->fcp) {
-                       ret = open_fec_client(fc);
+               if (!fc->ready) {
+                       ret = initialize_fec_client(fc);
                        if (ret < 0) {
                                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
                                continue;
@@ -894,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->sender->send_fec((char *)fc->enc_buf,
-                       fc->fcp->max_slice_bytes,
-                       fc->private_data);
+               fc->fcp->send_fec(fc->sc, (char *)fc->enc_buf,
+                                 fc->fcp->max_slice_bytes);
                fc->current_slice_num++;
                fec_active = 1;
        }