/*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file http_send.c paraslash's http sender */
+#include <regex.h>
#include <sys/types.h>
#include <dirent.h>
+#include <osl.h>
+#include <stdbool.h>
#include "para.h"
#include "error.h"
#include "afs.h"
#include "server.h"
#include "http.h"
-#include "vss.h"
#include "list.h"
#include "send.h"
+#include "vss.h"
#include "close_on_fork.h"
#include "net.h"
#include "fd.h"
HTTP_INVALID_GET_REQUEST
};
+/** For each connected client, a structure of this type is maintained. */
struct private_http_sender_data {
+ /** The current state of this client. */
enum http_client_status status;
};
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 = write_nonblock(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)
+ __a_unused long unsigned chunks_sent, const char *buf, size_t len,
+ const char *header_buf, size_t header_len)
{
struct sender_client *sc, *tmp;
list_for_each_entry_safe(sc, tmp, &hss->client_list, node) {
struct private_http_sender_data *phsd = sc->private_data;
- if (phsd->status != HTTP_STREAMING)
- continue;
- send_chunk(sc, hss, 0, current_chunk, buf, len);
+
+ if (phsd->status == HTTP_STREAMING)
+ http_send_chunk(sc, hss, current_chunk, buf, len,
+ header_buf, header_len);
}
}
{
struct sender_client *sc, *tmp;
struct private_http_sender_data *phsd;
+ int ret;
- if (hss->listen_fd < 0)
- return;
list_for_each_entry_safe(sc, tmp, &hss->client_list, node) {
phsd = sc->private_data;
switch (phsd->status) {
case HTTP_STREAMING: /* nothing to do */
break;
case HTTP_CONNECTED: /* need to recv get request */
- if (FD_ISSET(sc->fd, rfds)) {
- if (recv_pattern(sc->fd, HTTP_GET_MSG, MAXLINE)
- < 0) {
- phsd->status = HTTP_INVALID_GET_REQUEST;
- } else {
- phsd->status = HTTP_GOT_GET_REQUEST;
- PARA_INFO_LOG("%s",
- "received get request\n");
- }
+ ret = read_pattern(sc->fd, HTTP_GET_MSG, MAXLINE, rfds);
+ if (ret < 0)
+ phsd->status = HTTP_INVALID_GET_REQUEST;
+ else if (ret > 0) {
+ phsd->status = HTTP_GOT_GET_REQUEST;
+ PARA_INFO_LOG("received get request\n");
}
break;
case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
break;
}
}
- if (!FD_ISSET(hss->listen_fd, rfds))
- return;
- sc = accept_sender_client(hss);
+ sc = accept_sender_client(hss, rfds);
if (!sc)
return;
phsd = para_malloc(sizeof(*phsd));
phsd->status = HTTP_CONNECTED;
}
-static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds)
+static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
{
struct sender_client *sc, *tmp;
struct private_http_sender_data *phsd = sc->private_data;
if (phsd->status == HTTP_CONNECTED) /* need to recv get request */
para_fd_set(sc->fd, rfds, max_fileno);
+ if (phsd->status == HTTP_GOT_GET_REQUEST ||
+ phsd->status == HTTP_INVALID_GET_REQUEST)
+ para_fd_set(sc->fd, wfds, max_fileno);
}
}
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;
projects / paraslash.git / blobdiff