From: Gerrit Renker <grenker@cscs.ch>
Date: Sun, 23 May 2010 05:43:04 +0000 (+0200)
Subject: sender: clean up old FEC API
X-Git-Tag: v0.4.3~13^2~10
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=013337ae0d58f56f036685f3ffa1aebad0b2602f;p=paraslash.git

sender: clean up old FEC API

After the preceding two patches integrated the new function pointers, this
patch removes the now obsolete open() and send_fec() pointers which are no
longer referenced anywhere. It also reorders send.h to get rid of forward
declarations.
---

diff --git a/send.h b/send.h
index f831cbc4..e606738b 100644
--- a/send.h
+++ b/send.h
@@ -9,43 +9,6 @@
 /** The sender subcommands. */
 enum {SENDER_ADD, SENDER_DELETE, SENDER_ALLOW, SENDER_DENY, SENDER_ON, SENDER_OFF, NUM_SENDER_CMDS};
 
-/**
- * Each paraslash sender may register arbitrary many clients to the virtual
- * streaming system, possibly with varying fec parameters. In order to do so,
- * it must allocate a \a fec_client_parms structure and pass it to \ref
- * add_fec_client.
- *
- * Clients are automatically removed from that list by the vss if an error
- * occurs, or if the sender requests deletion of a client by calling \ref
- * vss_del_fec_client().
- */
-struct fec_client;
-struct sender_client;
-
-/** FEC parameters requested by FEC clients. */
-struct fec_client_parms {
-	/** Number of data slices plus redundant slices. */
-	uint8_t slices_per_group;
-	/** Number of slices minus number of redundant slices. */
-	uint8_t data_slices_per_group;
-	/** Maximal number of bytes per slice, initially zero. */
-	uint16_t max_slice_bytes;
-	/**
-	 * Transport-layer initialisation for FEC support.
-	 *
-	 * This optional function serves (a) to make the transport layer
-	 * ready to send FEC slices and (b) to determine the Maximum
-	 * Packet Size (MPS) supported by the connection. The MPS value
-	 * determines the largest payload size. This value is used to
-	 * send FEC slices that are not larger than the path MTU, to avoid
-	 * fragmentation and to maximize packet utilization. The user can
-	 * alternatively specify a slice size of up to this value.
-	 */
-	int (*init_fec)(struct sender_client *sc);
-	/** Push out FEC-encoded packets */
-	int (*send_fec)(struct sender_client *sc, char *buf, size_t len);
-};
-
 /**
  * Describes one supported sender of para_server.
  *
@@ -88,23 +51,6 @@ struct sender {
 	void (*send)(long unsigned current_chunk, long unsigned chunks_sent,
 		const char *buf, size_t len, const char *header_buf,
 		size_t header_len);
-
-	/**
-	 * Obtain the FEC parameters of a FEC client.
-	 *
-	 * This is called once by vss.c at the beginning of a stream. Senders
-	 * are supposed to set \a fcp to a struct which is suitable for the FEC
-	 * client identified by \a private_data.
-	 */
-	int (*open)(void *client, struct fec_client_parms **fcp);
-	/**
-	 * Send the next slice to a FEC client.
-	 *
-	 * Called by vss.c when the next slice should be sent to the FEC client
-	 * identified by \a private_data, the pointer which was previously
-	 * passed to vss_add_fec_target().
-	 */
-	int (*send_fec)(char *buf, size_t num_bytes, void *private_data);
 	/**
 	 * Add file descriptors to fd_sets.
 	 *
@@ -159,6 +105,41 @@ struct sender_client {
 	void *private_data;
 };
 
+/**
+ * Each paraslash sender may register arbitrary many clients to the virtual
+ * streaming system, possibly with varying fec parameters. In order to do so,
+ * it must allocate a \a fec_client_parms structure and pass it to \ref
+ * vss_add_fec_client.
+ *
+ * Clients are automatically removed from that list by the vss if an error
+ * occurs, or if the sender requests deletion of a client by calling \ref
+ * vss_del_fec_client().
+ */
+
+/** FEC parameters requested by FEC clients. */
+struct fec_client_parms {
+	/** Number of data slices plus redundant slices. */
+	uint8_t slices_per_group;
+	/** Number of slices minus number of redundant slices. */
+	uint8_t data_slices_per_group;
+	/** Maximal number of bytes per slice, initially zero. */
+	uint16_t max_slice_bytes;
+	/**
+	 * Transport-layer initialisation for FEC support.
+	 *
+	 * This optional function serves (a) to make the transport layer
+	 * ready to send FEC slices and (b) to determine the Maximum
+	 * Packet Size (MPS) supported by the connection. The MPS value
+	 * determines the largest payload size. This value is used to
+	 * send FEC slices that are not larger than the path MTU, to avoid
+	 * fragmentation and to maximize packet utilization. The user can
+	 * alternatively specify a slice size of up to this value.
+	 */
+	int (*init_fec)(struct sender_client *sc);
+	/** Push out FEC-encoded packets */
+	int (*send_fec)(struct sender_client *sc, char *buf, size_t len);
+};
+
 /** Describes the current status of one paraslash sender. */
 struct sender_status {
 	/** The file descriptor of the socket this sender is listening on. */
diff --git a/vss.c b/vss.c
index 14cff696..e725eebd 100644
--- a/vss.c
+++ b/vss.c
@@ -169,8 +169,6 @@ 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;
 };
 
 /**