X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=send_common.c;h=dea96081d43a51209a0d667cbf8f73a9ff11e08d;hb=6b44f1fdf5fdfd18b9f77a87428a971eef0c547e;hp=b44c8133d821ef2611650eee0ea40039af18bbc3;hpb=5b15980ce22a3a4244e2440f46eac19eb0ceb3ef;p=paraslash.git

diff --git a/send_common.c b/send_common.c
index b44c8133..dea96081 100644
--- a/send_common.c
+++ b/send_common.c
@@ -96,34 +96,24 @@ void shutdown_clients(struct sender_status *ss)
 		shutdown_client(sc, ss);
 }
 
-static int queue_chunk_or_shutdown(struct sender_client *sc,
-		struct sender_status *ss, const char *buf, size_t num_bytes)
-{
-	int ret = cq_enqueue(sc->cq, buf, num_bytes);
-	if (ret < 0)
-		shutdown_client(sc, ss);
-	return ret;
-}
-
 /**
  * Try to empty the chunk queue for this fd.
  *
  * \param fd The file descriptor.
  * \param cq The list of queued chunks.
- * \param max_bytes_per_write Do not send more than this in one go.
  *
  * \return Negative on errors, zero if not everything was sent, one otherwise.
  */
-int send_queued_chunks(int fd, struct chunk_queue *cq,
-		size_t max_bytes_per_write)
+int send_queued_chunks(int fd, struct chunk_queue *cq)
 {
 	struct queued_chunk *qc;
 	while ((qc = cq_peek(cq))) {
 		const char *buf;
 		size_t len;
 		int ret;
+
 		cq_get(qc, &buf, &len);
-		ret = write_nonblock(fd, buf, len, max_bytes_per_write);
+		ret = write_nonblock(fd, buf, len);
 		if (ret < 0)
 			return ret;
 		cq_update(cq, ret);
@@ -134,59 +124,6 @@ int send_queued_chunks(int fd, struct chunk_queue *cq,
 	return 1;
 }
 
-/**
- * Send one chunk of audio data to a connected client.
- *
- * \param sc The client.
- * \param ss The sender.
- * \param max_bytes_per_write Split writes to chunks of at most that many bytes.
- * \param current_chunk The number of the chunk to write.
- * \param buf The data to write.
- * \param len The number of bytes of \a buf.
- * \param header_buf The audio file header.
- * \param header_len The number of bytes of \a header_buf.
- *
- * On errors, the client is shut down. If only a part of the buffer could be
- * written, the remainder is put into the chunk queue for that client.
- */
-void send_chunk(struct sender_client *sc, struct sender_status *ss,
-		size_t max_bytes_per_write, long unsigned current_chunk,
-		const char *buf, size_t len, const char *header_buf,
-		size_t header_len)
-{
-	int ret;
-
-	if (!sc->header_sent && current_chunk) {
-		if (header_buf && header_len > 0) {
-			ret = queue_chunk_or_shutdown(sc, ss, header_buf, header_len);
-			if (ret < 0)
-				goto out;
-		}
-	}
-	sc->header_sent = 1;
-	ret = send_queued_chunks(sc->fd, sc->cq, max_bytes_per_write);
-	if (ret < 0) {
-		shutdown_client(sc, ss);
-		goto out;
-	}
-	if (!len)
-		goto out;
-	if (!ret) { /* still data left in the queue */
-		ret = queue_chunk_or_shutdown(sc, ss, buf, len);
-		goto out;
-	}
-	ret = write_nonblock(sc->fd, buf, len, max_bytes_per_write);
-	if (ret < 0) {
-		shutdown_client(sc, ss);
-		goto out;
-	}
-	if (ret != len)
-		ret = queue_chunk_or_shutdown(sc, ss, buf + ret, len - ret);
-out:
-	if (ret < 0)
-		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
-}
-
 /**
  * Initialize a struct sender status.
  *
@@ -480,7 +417,7 @@ int parse_fec_url(const char *arg, struct sender_command_data *scd)
 		goto out;
 	}
 	/* use default fec parameters. */
-	scd->max_slice_bytes = 1472;
+	scd->max_slice_bytes = 0;
 	scd->slices_per_group = 16;
 	scd->data_slices_per_group = 14;
 	ret = 0;