/*
- * 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 */
enum http_status {
HTTP_CONNECTED,
/** the address to be black/whitelisted */
struct in_addr addr;
/** the netmask for this entry */
- int netmask;
+ unsigned netmask;
/** the position of this entry in the access_perm_list */
struct list_head node;
};
hc->fd, msg);
numclients--;
close(hc->fd);
-
+ del_close_on_fork_list(hc->fd);
list_for_each_entry_safe(qp, tmp, &hc->packet_queue, node) {
free(qp->packet);
list_del(&qp->node);
}
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 1;
}
-static int write_ok(int fd)
-{
- 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;
-}
-
-
static int send_queued_packets(struct http_client *hc)
{
int ret;
list_for_each_entry_safe(qp, tmp, &hc->packet_queue, node) {
ret = write_ok(hc->fd);
if (ret <= 0)
- return ret;
+ return ret? -E_WRITE_OK : 0;
ret = write(hc->fd, qp->packet, qp->len);
if (ret < 0)
return ret;
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 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_packet(hc, hbuf, hlen) < 0)
continue;
} else
PARA_INFO_LOG("%s", "no need to queue header\n");
{
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++;
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)
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