/*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file http_send.c paraslash's http sender */
#include "server.cmdline.h"
#include "server.h"
#include "http.h"
-#include "afs.h"
+#include "vss.h"
#include "send.h"
#include "list.h"
#include "close_on_fork.h"
#include "error.h"
#include "net.h"
#include "string.h"
+#include "fd.h"
/** \cond convert sock_addr_in to ascii */
#define CLIENT_ADDR(hc) inet_ntoa((hc)->addr.sin_addr)
#define HTTP_ERR_MSG "HTTP/1.0 400 Bad Request\n"
/** \endcond */
-extern struct gengetopt_args_info conf;
-
-/** the possible states of a client from the server's POV */
+/** The possible states of a client from the server's POV. */
enum http_status {
+ /** We accepted the connection on the tcp socket. */
HTTP_CONNECTED,
+ /** Successfully received the get request. */
HTTP_GOT_GET_REQUEST,
+ /** We sent the OK message back to the client. */
HTTP_SENT_OK_MSG,
+ /** Connection established, we might need to send the audio file header. */
HTTP_READY_TO_STREAM,
+ /** Connection is ready for sending audio data. */
HTTP_STREAMING,
+ /** We didn't receive a valid get request. */
HTTP_INVALID_GET_REQUEST
};
-/** clients will be kicked if there are more than that many bytes pending */
-#define MAX_BACKLOG 40000
-/** the list of connected clients **/
+/** Clients will be kicked if there are more than that many bytes pending. */
+#define MAX_BACKLOG 400000
+/** The list of connected clients. */
static struct list_head clients;
-/** the whitelist/blacklist */
+/** The whitelist/blacklist. */
static struct list_head access_perm_list;
-/** describes one client that connected the tcp port of the http sender */
+struct chunk_queue{
+ /** The list of pending chunks for this client. */
+ struct list_head q;
+ /** The number of pending bytes for this client. */
+ unsigned long num_pending;
+ unsigned long max_pending;
+};
+
+/** Describes one client that connected the tcp port of the http sender. */
struct http_client {
-/** the file descriptor of the client */
+ /** The file descriptor of the client. */
int fd;
-/** address information about the client */
+ /** Address information about the client. */
struct sockaddr_in addr;
-/** the client's current status */
+ /** The client's current status. */
enum http_status status;
-/** non-zero if we included \a fd in the read set */
+ /** Non-zero if we included \a fd in the read set.*/
int check_r;
-/** non-zero if we included \a fd in the write set */
+ /** Non-zero if we included \a fd in the write set. */
int check_w;
-/** the position of this client in the client list */
+ /** The position of this client in the client list. */
struct list_head node;
-/** the list of pending packets for this client */
- struct list_head packet_queue;
-/** the number of pending bytes for this client */
- unsigned long pq_bytes;
+ /** The list of pending chunks for this client. */
+ struct chunk_queue cq;
};
/**
- * describes one queued data packet for a client
+ * Describes one queued chunk of the chunk queue.
*
* The send function of the http sender checks each client fd for writing. If a
- * client fd is not ready, it tries to queue that packet for this client until
+ * client fd is not ready, it tries to queue that chunk for this client until
* the number of queued bytes exceeds \p MAX_BACKLOG.
*/
-struct queued_packet {
-/** the length of the packet in bytes */
- unsigned int len;
-/** pointer to the packet data */
- char *packet;
-/** position of the packet in the packet list */
+struct queued_chunk {
+ /** The number of the queued chunk, -1U means header. */
+ unsigned chunk_num;
+ /** The number of bytes already sent. */
+ unsigned sent;
+ /** Position of the chunk in the chunk queue. */
struct list_head node;
};
/**
- * describes one entry in the blacklist/whitelist of the http sender
+ * Describes one entry in the blacklist/whitelist of the http sender.
*/
struct access_info {
- /** the address to be black/whitelisted */
+ /** The address to be black/whitelisted. */
struct in_addr addr;
- /** the netmask for this entry */
- int netmask;
- /** the position of this entry in the access_perm_list */
+ /** The netmask for this entry. */
+ unsigned netmask;
+ /** The position of this entry in the access_perm_list. */
struct list_head node;
};
static int server_fd = -1, numclients;
static struct sender *self;
-
static void http_shutdown_client(struct http_client *hc, const char *msg)
{
- struct queued_packet *qp, *tmp;
+ struct queued_chunk *qc, *tmp;
PARA_INFO_LOG("shutting down %s on fd %d (%s)\n", CLIENT_ADDR(hc),
hc->fd, msg);
numclients--;
close(hc->fd);
-
- list_for_each_entry_safe(qp, tmp, &hc->packet_queue, node) {
- free(qp->packet);
- list_del(&qp->node);
- free(qp);
+ del_close_on_fork_list(hc->fd);
+ list_for_each_entry_safe(qc, tmp, &hc->cq.q, node) {
+ list_del(&qc->node);
+ free(qc);
}
list_del(&hc->node);
free(hc);
- return;
}
-static void http_shutdown_clients_real(void)
-{
- struct http_client *hc, *tmp;
- list_for_each_entry_safe(hc, tmp, &clients, node)
- http_shutdown_client(hc, "afs request");
-}
static void http_shutdown_clients(void)
{
struct http_client *hc, *tmp;
list_for_each_entry_safe(hc, tmp, &clients, node)
- if (hc->status == HTTP_STREAMING)
- http_shutdown_client(hc, "afs request");
+ http_shutdown_client(hc, "vss request");
}
static int http_send_msg(struct http_client *hc, const char *msg)
return http_send_msg(hc, HTTP_ERR_MSG);
}
-static int queue_packet(struct http_client *hc, const char *buf, size_t len)
+static int enqueue_chunk(struct http_client *hc, long unsigned chunk_num,
+ size_t sent)
{
- struct queued_packet *qp;
- if (hc->pq_bytes + len > MAX_BACKLOG) {
- http_shutdown_client(hc, "packet queue overrun");
+ struct queued_chunk *qc;
+ char *buf;
+ size_t len;
+ int ret;
+
+ if (chunk_num != -1U) {
+ ret = vss_get_chunk(chunk_num, &buf, &len);
+ if (ret < 0)
+ return ret;
+ } else
+ buf = vss_get_header(&len);
+ if (hc->cq.num_pending + len > MAX_BACKLOG)
return -E_QUEUE;
- }
- qp = para_malloc(sizeof(struct queued_packet));
- hc->pq_bytes += len;
- qp->packet = para_malloc(len);
- memcpy(qp->packet, buf, len);
- qp->len = len;
- list_add_tail(&qp->node, &hc->packet_queue);
- PARA_INFO_LOG("%lu bytes queued for fd %d\n", hc->pq_bytes, hc->fd);
+ qc = para_malloc(sizeof(struct queued_chunk));
+ hc->cq.num_pending += len;
+ qc->chunk_num = chunk_num;
+ qc->sent = sent;
+ list_add_tail(&qc->node, &hc->cq.q);
+ PARA_INFO_LOG("%lu bytes queued for fd %d\n", hc->cq.num_pending, hc->fd);
return 1;
}
-static int write_ok(int fd)
+static int send_queued_chunks(struct http_client *hc)
{
- struct timeval tv = {0, 0};
- fd_set wfds;
int ret;
-again:
- FD_ZERO(&wfds);
- FD_SET(fd, &wfds);
- ret = select(fd + 1, NULL, &wfds, NULL, &tv);
- if (ret < 0 && errno == EINTR)
- goto again;
- if (ret < 0)
- ret = -E_WRITE_OK;
- return ret;
-}
-
+ struct queued_chunk *qc, *tmp;
-static int send_queued_packets(struct http_client *hc)
-{
- int ret;
- struct queued_packet *qp, *tmp;
-
- if (list_empty(&hc->packet_queue))
+ if (list_empty(&hc->cq.q))
return 1;
- list_for_each_entry_safe(qp, tmp, &hc->packet_queue, node) {
+ list_for_each_entry_safe(qc, tmp, &hc->cq.q, node) {
+ char *buf;
+ size_t len;
ret = write_ok(hc->fd);
if (ret <= 0)
- return ret;
- ret = write(hc->fd, qp->packet, qp->len);
+ return ret? -E_WRITE_OK : 0;
+ if (qc->chunk_num != -1U) {
+ ret = vss_get_chunk(qc->chunk_num, &buf, &len);
+ if (ret < 0)
+ return ret;
+ } else
+ buf = vss_get_header(&len);
+ assert(len && len > qc->sent);
+ ret = write(hc->fd, buf + qc->sent, len - qc->sent);
if (ret < 0)
- return ret;
- if (ret != qp->len) {
- qp->len -= ret;
- memmove(qp->packet, qp->packet + ret, qp->len);
+ return -1; /* FIXME */
+ hc->cq.num_pending -= ret;
+ if (ret != len - qc->sent) {
+ qc->sent += ret;
return 0;
}
- hc->pq_bytes -= qp->len;
- free(qp->packet);
- list_del(&qp->node);
- free(qp);
+ list_del(&qc->node);
+ free(qc);
}
return 1;
}
-static void http_send(__unused struct audio_format *af,
- long unsigned current_chunk,
- __unused long unsigned chunks_sent, const char *buf, size_t len)
+static int queue_chunk_or_shutdown(struct http_client *hc, long unsigned chunk_num,
+ size_t sent)
+{
+ int ret = enqueue_chunk(hc, chunk_num, sent);
+ if (ret < 0)
+ http_shutdown_client(hc, "queue error");
+ return ret;
+}
+
+static void http_send( long unsigned current_chunk,
+ __a_unused long unsigned chunks_sent, const char *buf, size_t len)
{
struct http_client *hc, *tmp;
int ret;
hc->status != HTTP_READY_TO_STREAM)
continue;
if (hc->status == HTTP_READY_TO_STREAM) {
- if (af->get_header_info && current_chunk) {
+ unsigned hlen;
+ char *hbuf = vss_get_header(&hlen);
+ if (hbuf && hlen > 0 && current_chunk) {
/* need to send header */
- int hlen;
- char *buf = af->get_header_info(&hlen);
- if (!buf || hlen <= 0)
- continue; /* header not yet available */
PARA_INFO_LOG("queueing header: %d\n", hlen);
- if (queue_packet(hc, buf, hlen) < 0)
+ if (queue_chunk_or_shutdown(hc, -1U, 0) < 0)
continue;
} else
- PARA_INFO_LOG("%s", "no need to queue header\n");
+ PARA_INFO_LOG("no need to queue header\n");
hc->status = HTTP_STREAMING;
}
- ret = send_queued_packets(hc);
+ ret = send_queued_chunks(hc);
if (ret < 0) {
- http_shutdown_client(hc, "send error");
+ http_shutdown_client(hc, "queue send error");
continue;
}
if (!len)
continue;
if (!ret || write_ok(hc->fd) <= 0) {
PARA_INFO_LOG("fd %d not ready (%lu bytes queued),"
- " trying to queue packet\n", hc->fd,
- hc->pq_bytes);
- queue_packet(hc, buf, len);
+ " trying to queue chunk\n", hc->fd,
+ hc->cq.num_pending);
+ queue_chunk_or_shutdown(hc, current_chunk, 0);
continue;
}
// PARA_DEBUG_LOG("sending %d -> %s\n", len, CLIENT_ADDR(hc));
ret = write(hc->fd, buf, len);
+// PARA_DEBUG_LOG("ret: %d\n", ret);
if (ret < 0) {
http_shutdown_client(hc, "send error");
continue;
}
if (ret != len)
- queue_packet(hc, buf + ret, len - ret);
+ queue_chunk_or_shutdown(hc, current_chunk, ret);
}
}
{
struct access_info *ai, *tmp;
list_for_each_entry_safe(ai, tmp, &access_perm_list, node) {
- unsigned mask = ((~0) >> ai->netmask);
+ unsigned mask = ((~0U) >> ai->netmask);
if ((hc->addr.sin_addr.s_addr & mask) == (ai->addr.s_addr & mask))
return 1;
}
return 0;
}
-static void http_post_select(__unused struct audio_format *af, fd_set *rfds,
- fd_set *wfds)
+static void http_post_select(fd_set *rfds, fd_set *wfds)
{
int i = -1, match;
struct http_client *hc, *tmp;
- char *err_msg;
+ const char *err_msg;
list_for_each_entry_safe(hc, tmp, &clients, node) {
i++;
goto err_out;
}
hc->status = HTTP_CONNECTED;
- INIT_LIST_HEAD(&hc->packet_queue);
+ INIT_LIST_HEAD(&hc->cq.q);
PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", numclients,
CLIENT_ADDR(hc), hc->fd);
numclients++;
- list_add(&hc->node, &clients);
+ para_list_add(&hc->node, &clients);
+ add_close_on_fork_list(hc->fd);
+ mark_fd_nonblock(hc->fd);
return;
err_out:
PARA_WARNING_LOG("ignoring connect request from %s (%s)\n",
free(hc);
}
-static void http_pre_select(struct audio_format *af, int *max_fileno, fd_set *rfds,
- fd_set *wfds)
+static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
{
struct http_client *hc, *tmp;
if (server_fd < 0)
return;
- FD_SET(server_fd, rfds);
- *max_fileno = MAX(*max_fileno, server_fd);
+ para_fd_set(server_fd, rfds, max_fileno);
list_for_each_entry_safe(hc, tmp, &clients, node) {
//PARA_DEBUG_LOG("hc %p on fd %d: status %d\n", hc, hc->fd, hc->status);
hc->check_r = 0;
case HTTP_READY_TO_STREAM:
break;
case HTTP_CONNECTED: /* need to recv get request */
- FD_SET(hc->fd, rfds);
- *max_fileno = MAX(*max_fileno, hc->fd);
+ para_fd_set(hc->fd, rfds, max_fileno);
hc->check_r = 1;
break;
case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
- FD_SET(hc->fd, wfds);
- *max_fileno = MAX(*max_fileno, hc->fd);
+ para_fd_set(hc->fd, wfds, max_fileno);
hc->check_w = 1;
break;
case HTTP_SENT_OK_MSG:
- if (!af || !afs_playing())
+ if (!vss_playing())
break; /* wait until server starts playing */
- FD_SET(hc->fd, wfds);
- *max_fileno = MAX(*max_fileno, hc->fd);
+ para_fd_set(hc->fd, wfds, max_fileno);
hc->check_w = 1;
break;
}
static int open_tcp_port(int port)
{
+ int ret;
+
server_fd = init_tcp_socket(port);
if (server_fd < 0) {
- http_shutdown_clients_real();
+ http_shutdown_clients();
self->status = SENDER_OFF;
return server_fd;
}
+ ret = mark_fd_nonblock(server_fd);
+ if (ret < 0) {
+ PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+ exit(EXIT_FAILURE);
+ }
self->status = SENDER_ON;
add_close_on_fork_list(server_fd);
return 1;
}
-static int http_com_on(__unused struct sender_command_data *scd)
+static int http_com_on(__a_unused struct sender_command_data *scd)
{
if (self->status == SENDER_ON)
return 1;
return open_tcp_port(conf.http_port_arg);
}
-static int http_com_off(__unused struct sender_command_data *scd)
+static int http_com_off(__a_unused struct sender_command_data *scd)
{
self->status = SENDER_OFF;
if (server_fd > 0) {
del_close_on_fork_list(server_fd);
server_fd = -1;
}
- http_shutdown_clients_real();
+ http_shutdown_clients();
return 1;
}
ai->netmask = scd->netmask;
PARA_INFO_LOG("adding %s/%i to access list\n", inet_ntoa(ai->addr),
ai->netmask);
- list_add(&ai->node, &access_perm_list);
+ para_list_add(&ai->node, &access_perm_list);
}
static int http_com_deny(struct sender_command_data *scd)
}
/**
- * the init function of the http sender
+ * The init function of the http sender.
*
- * \param s pointer to the http sender struct
+ * \param s Pointer to the http sender struct.
*
- * It initializes all function pointers of \a s, init the client list and the
- * acess control list as well. If autostart is wanted, open the tcp port.
+ * It initializes all function pointers of \a s, the client list and the access
+ * control list. If the autostart option was given, the tcp port is opened.
*/
void http_send_init(struct sender *s)
{
self = s;
init_access_control_list();
if (!conf.http_no_autostart_given)
- open_tcp_port(conf.http_port_arg);
+ open_tcp_port(conf.http_port_arg); /* ignore errors */
PARA_DEBUG_LOG("%s", "http sender init complete\n");
}
projects / paraslash.git / blobdiff