/*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include <regex.h>
#include <sys/types.h>
-#include <dirent.h>
#include <osl.h>
#include "para.h"
#include "http.h"
#include "list.h"
#include "send.h"
+#include "sched.h"
#include "vss.h"
#include "close_on_fork.h"
#include "net.h"
static int http_send_msg(struct sender_client *sc, const char *msg)
{
- int ret = send_buffer(sc->fd, msg);
+ int ret = write_buffer(sc->fd, msg);
if (ret < 0)
shutdown_client(sc, hss);
shutdown_clients(hss);
}
+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;
+}
+
+/**
+ * Send one chunk of audio data to a connected client.
+ *
+ * \param sc The client.
+ * \param ss The sender.
+ * \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.
+ */
+static void http_send_chunk(struct sender_client *sc, struct sender_status *ss,
+ 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);
+ 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 = xwrite(sc->fd, buf, len);
+ 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));
+}
+
static void http_send(long unsigned current_chunk,
__a_unused long unsigned chunks_sent, const char *buf, size_t len,
const char *header_buf, size_t header_len)
struct private_http_sender_data *phsd = sc->private_data;
if (phsd->status == HTTP_STREAMING)
- send_chunk(sc, hss, current_chunk, buf, len,
+ http_send_chunk(sc, hss, current_chunk, buf, len,
header_buf, header_len);
}
}
s->pre_select = http_pre_select;
s->post_select = http_post_select;
s->shutdown_clients = http_shutdown_clients;
+ s->resolve_target = NULL;
s->help = generic_sender_help;
s->client_cmds[SENDER_ON] = http_com_on;
s->client_cmds[SENDER_OFF] = http_com_off;