/*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*/
static int open_sender(unsigned l4type, int port)
{
- int fd, ret = para_listen(AF_UNSPEC, l4type, port);
+ int fd, ret = para_listen_simple(l4type, port);
if (ret < 0)
return ret;
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);
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.
*
ret = make_message(
"%s sender:\n"
"\tstatus: %s\n"
- "\tport: %d\n"
+ "\tport: %s\n"
"\tnumber of connected clients: %d\n"
"\tmaximal number of clients: %d%s\n"
"\tconnected clients: %s\n"
"\taccess %s list: %s\n",
name,
(ss->listen_fd >= 0)? "on" : "off",
- ss->port,
+ stringify_port(ss->port, strcmp(name, "http") ? "dccp" : "tcp"),
ss->num_clients,
ss->max_clients,
ss->max_clients > 0? "" : " (unlimited)",
* \sa \ref para_accept(), \ref mark_fd_nonblocking(), \ref acl_check_access(),
* \ref cq_new(), \ref add_close_on_fork_list().
*/
-struct sender_client *accept_sender_client(struct sender_status *ss)
+struct sender_client *accept_sender_client(struct sender_status *ss, fd_set *rfds)
{
struct sender_client *sc;
- int fd, ret = para_accept(ss->listen_fd, NULL, 0);
- if (ret < 0) {
+ int fd, ret;
+
+ if (ss->listen_fd < 0)
+ return NULL;
+ ret = para_accept(ss->listen_fd, rfds, NULL, 0, &fd);
+ if (ret < 0)
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+ if (ret <= 0)
return NULL;
- }
- fd = ret;
ret = -E_MAX_CLIENTS;
if (ss->max_clients > 0 && ss->num_clients >= ss->max_clients)
goto err_out;
ss->num_clients++;
sc = para_calloc(sizeof(*sc));
sc->fd = fd;
- sc->name = make_message("%s", remote_name(fd));
+ sc->name = para_strdup(remote_name(fd));
sc->cq = cq_new(MAX_CQ_BYTES);
para_list_add(&sc->node, &ss->client_list);
add_close_on_fork_list(fd);
goto out;
}
/* use default fec parameters. */
- scd->max_slice_bytes = 1490;
+ scd->max_slice_bytes = 0;
scd->slices_per_group = 16;
scd->data_slices_per_group = 14;
ret = 0;