/*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 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_recv.c paraslash's http receiver */
-#include "para.h"
+#include <regex.h>
+#include <sys/types.h>
+#include "para.h"
+#include "error.h"
#include "http.h"
+#include "list.h"
+#include "sched.h"
+#include "ggo.h"
+#include "buffer_tree.h"
#include "recv.h"
#include "http_recv.cmdline.h"
-#include "error.h"
#include "net.h"
#include "string.h"
-
-/** the output buffer size of the http receiver */
-#define BUFSIZE (32 * 1024)
+#include "fd.h"
/**
* the possible states of a http receiver node
enum http_recv_status {HTTP_CONNECTED, HTTP_SENT_GET_REQUEST, HTTP_STREAMING};
/**
- * data specific to the http receiver
+ * Data specific to the http receiver.
*
* Each running instance of the http receiver reserves space for one such struct.
*/
struct private_http_recv_data {
-/**
- *
- *
- * the current status of the http receiver node
- *
- * It gets initialized to #HTTP_CONNECTED by the open function of the
- * http receiver.
- *
- * \sa receiver::open, receiver_node.
- */
+ /**
+ * The current status of the http receiver node.
+ *
+ * It gets initialized to \p HTTP_CONNECTED by the open function of the
+ * http receiver.
+ *
+ * \sa receiver::open, receiver_node.
+ */
enum http_recv_status status;
-/**
- *
- *
- * the file descriptor used for receiving the http stream
- *
- * The pre_select function of the http receiver adds this file descriptor to
- * the set of file decriptors which are checked for reading/writing (depending
- * on the current status) by the select loop of the application (para_audiod or
- * para_recv).
- *
- * The post_select function of the http receiver uses \a fd, if ready, to
- * establish the http connection, and updates \a status according to the new
- * state of the connection. As soon as \a status is #HTTP_STREAMING, \a fd is
- * going to be only checked for reading. If data is available, it is read into
- * the output buffer of the receiver node by post_select.
- *
- * \sa receiver::pre_select receiver::post_select receiver_node
- */
- int fd;
};
-static void http_shutdown(void)
-{
- return;
-}
-
static char *make_request_msg(void)
{
char *ret, *hn = para_hostname();
ret = make_message("%s1.0\nHost: %s\nUser-Agent: para_recv/%s\n\n\n",
- HTTP_GET_MSG, hn, VERSION);
+ HTTP_GET_MSG, hn, PACKAGE_VERSION);
free(hn);
return ret;
}
-static int http_pre_select(struct receiver_node *rn, fd_set *rfds, fd_set *wfds,
- __a_unused struct timeval *timeout)
+static void http_recv_pre_select(struct sched *s, struct task *t)
{
+ struct receiver_node *rn = container_of(t, struct receiver_node, task);
struct private_http_recv_data *phd = rn->private_data;
+ if (generic_recv_pre_select(s, t) <= 0)
+ return;
if (phd->status == HTTP_CONNECTED)
- FD_SET(phd->fd, wfds);
+ para_fd_set(rn->fd, &s->wfds, &s->max_fileno);
else
- FD_SET(phd->fd, rfds);
- return phd->fd;
+ para_fd_set(rn->fd, &s->rfds, &s->max_fileno);
}
-static int http_post_select(struct receiver_node *rn, int select_ret,
- fd_set *rfds, fd_set *wfds)
+/*
+ * Establish the http connection. If already established, fill the buffer pool
+ * area with data read from the socket. In any case, update the state of the
+ * connection if necessary.
+ */
+static int http_recv_post_select(struct sched *s, struct task *t)
{
- int ret;
+ struct receiver_node *rn = container_of(t, struct receiver_node, task);
struct private_http_recv_data *phd = rn->private_data;
+ struct btr_node *btrn = rn->btrn;
+ int ret, iovcnt;
+ struct iovec iov[2];
+ size_t num_bytes;
- if (!select_ret) /* we're not interested in timeouts */
- return 1;
- if (phd->status == HTTP_CONNECTED) {
+ ret = task_get_notification(t);
+ if (ret < 0)
+ goto out;
+ ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
+ if (ret < 0)
+ goto out;
+ if (ret == 0)
+ return 0;
+ if (phd->status == HTTP_CONNECTED) {
char *rq;
- if (!FD_ISSET(phd->fd, wfds))
- return 1; /* nothing to do */
+ if (!FD_ISSET(rn->fd, &s->wfds))
+ return 0;
rq = make_request_msg();
- PARA_NOTICE_LOG("%s", "sending http request\n");
- ret = send_va_buffer(phd->fd, "%s", rq);
+ PARA_INFO_LOG("sending http request\n");
+ ret = write_va_buffer(rn->fd, "%s", rq);
free(rq);
if (ret < 0)
- return E_SEND_HTTP_REQUEST;
+ goto out;
phd->status = HTTP_SENT_GET_REQUEST;
- return 1;
+ return 0;
}
- if (!FD_ISSET(phd->fd, rfds))
- return 1; /* nothing to do */
if (phd->status == HTTP_SENT_GET_REQUEST) {
- ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
+ ret = read_pattern(rn->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds);
if (ret < 0)
- return -E_MISSING_OK;
- PARA_NOTICE_LOG("%s", "received ok msg, streaming\n");
+ goto out;
+ if (ret == 0)
+ return 0;
+ PARA_INFO_LOG("received ok msg, streaming\n");
phd->status = HTTP_STREAMING;
- return 1;
- }
- /* already streaming */
- if (rn->loaded >= BUFSIZE) {
- PARA_ERROR_LOG("%s", "buffer overrun\n");
- return -E_OVERRUN;
+ return 0;
}
- ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded, BUFSIZE - rn->loaded);
- if (ret <= 0) {
- PARA_NOTICE_LOG("recv returned %d/%zd\n", ret, BUFSIZE - rn->loaded);
- return ret < 0? -E_HTTP_RECV_BUF : 0;
+ ret = -E_HTTP_RECV_OVERRUN;
+ iovcnt = btr_pool_get_buffers(rn->btrp, iov);
+ if (iovcnt == 0)
+ goto out;
+ ret = readv_nonblock(rn->fd, iov, iovcnt, &s->rfds, &num_bytes);
+ if (num_bytes == 0)
+ goto out;
+ if (num_bytes <= iov[0].iov_len) /* only the first buffer was filled */
+ btr_add_output_pool(rn->btrp, num_bytes, btrn);
+ else { /* both buffers contain data */
+ btr_add_output_pool(rn->btrp, iov[0].iov_len, btrn);
+ btr_add_output_pool(rn->btrp, num_bytes - iov[0].iov_len, btrn);
}
- rn->loaded += ret;
- return 1;
+out:
+ if (ret < 0)
+ btr_remove_node(&rn->btrn);
+ return ret;
}
static void http_recv_close(struct receiver_node *rn)
{
- struct private_http_recv_data *phd = rn->private_data;
- close(phd->fd);
- free(rn->buf);
+ close(rn->fd);
+ btr_pool_free(rn->btrp);
free(rn->private_data);
}
static void *http_recv_parse_config(int argc, char **argv)
{
- struct http_recv_args_info *tmp = para_calloc(sizeof(struct http_recv_args_info));
+ struct http_recv_args_info *tmp = para_calloc(sizeof(*tmp));
if (!http_recv_cmdline_parser(argc, argv, tmp))
return tmp;
static int http_recv_open(struct receiver_node *rn)
{
struct private_http_recv_data *phd;
- struct hostent *he;
struct http_recv_args_info *conf = rn->conf;
- struct sockaddr_in their_addr;
- int ret;
-
- rn->buf = para_calloc(BUFSIZE);
- rn->private_data = para_calloc(sizeof(struct private_http_recv_data));
- phd = rn->private_data;
- ret = -E_HOST_INFO;
- if (!(he = get_host_info(conf->host_arg)))
- goto err_out;
- /* get new socket */
- ret = -E_SOCKET;
- if ((phd->fd = get_socket()) < 0)
- goto err_out;
- /* init their_addr */
- init_sockaddr(&their_addr, conf->port_arg, he);
- /* connect */
- PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg,
- conf->port_arg);
- ret = para_connect(phd->fd, &their_addr);
+ int fd, ret = para_connect_simple(IPPROTO_TCP, conf->host_arg,
+ conf->port_arg);
+
if (ret < 0)
- goto err_out;
+ return ret;
+ fd = ret;
+ ret = mark_fd_nonblocking(fd);
+ if (ret < 0) {
+ close(fd);
+ return ret;
+ }
+ rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
+ rn->fd = fd;
phd->status = HTTP_CONNECTED;
+ rn->btrp = btr_pool_new("http_recv", 320 * 1024);
return 1;
-err_out:
- free(rn->private_data);
- free(rn->buf);
- return ret;
+}
+
+static void http_recv_free_config(void *conf)
+{
+ http_recv_cmdline_parser_free(conf);
+ free(conf);
}
/**
- * the init function of the http receiver
+ * The init function of the http receiver.
*
- * \param r pointer to the receiver struct to initialize
+ * \param r Pointer to the receiver struct to initialize.
*
- * Just initialize all function pointers of \a r.
+ * This initializes all function pointers of \a r.
*/
void http_recv_init(struct receiver *r)
{
+ struct http_recv_args_info dummy;
+
+ http_recv_cmdline_parser_init(&dummy);
r->open = http_recv_open;
r->close = http_recv_close;
- r->pre_select = http_pre_select;
- r->post_select = http_post_select;
- r->shutdown = http_shutdown;
+ r->pre_select = http_recv_pre_select;
+ r->post_select = NULL;
+ r->new_post_select = http_recv_post_select;
r->parse_config = http_recv_parse_config;
+ r->free_config = http_recv_free_config;
+ r->help = (struct ggo_help) {
+ .short_help = http_recv_args_info_help,
+ .detailed_help = http_recv_args_info_detailed_help
+ };
+ http_recv_cmdline_parser_free(&dummy);
}