/*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 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 "para.h"
#include "error.h"
#include "fd.h"
#include "buffer_tree.h"
-/** the output buffer size of the http receiver */
-#define BUFSIZE (32 * 1024)
-
/**
* the possible states of a http receiver node
*
* 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
+ * the set of file descriptors which are checked for reading/writing (depending
* on the current status) by the select loop of the application (para_audiod or
* para_recv).
*
struct btr_pool *btrp;
};
-static void http_shutdown(void)
-{
- return;
-}
-
static char *make_request_msg(void)
{
char *ret, *hn = para_hostname();
{
struct receiver_node *rn = container_of(t, struct receiver_node, task);
struct private_http_recv_data *phd = rn->private_data;
- int ret;
- if (rn->btrn) {
- ret = generic_recv_pre_select(s, t);
- if (ret <= 0)
- return;
- }
t->error = 0;
+ if (generic_recv_pre_select(s, t) <= 0)
+ return;
if (phd->status == HTTP_CONNECTED)
para_fd_set(phd->fd, &s->wfds, &s->max_fileno);
else
struct private_http_recv_data *phd = rn->private_data;
struct btr_node *btrn = rn->btrn;
int ret;
+ char *buf;
+ size_t sz, n;
t->error = 0;
- if (btrn) {
- ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
- if (ret < 0)
- goto err;
- if (ret == 0)
- return;
- } else {
- if (rn->output_error && *rn->output_error < 0) {
- ret = *rn->output_error;
- goto err;
- }
- }
+ ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
+ if (ret < 0)
+ goto err;
+ if (ret == 0)
+ return;
if (phd->status == HTTP_CONNECTED) {
char *rq;
if (!FD_ISSET(phd->fd, &s->wfds))
phd->status = HTTP_SENT_GET_REQUEST;
return;
}
- if (!FD_ISSET(phd->fd, &s->rfds))
- return;
if (phd->status == HTTP_SENT_GET_REQUEST) {
- ret = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
+ ret = read_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds);
if (ret < 0)
goto err;
+ if (ret == 0)
+ return;
PARA_INFO_LOG("received ok msg, streaming\n");
phd->status = HTTP_STREAMING;
return;
}
- if (btrn) {
- char *buf;
- size_t sz;
-
- sz = btr_pool_get_buffer(phd->btrp, &buf);
- //PARA_CRIT_LOG("max buffer %p: %zu\n", buf, sz);
- ret = -E_HTTP_RECV_OVERRUN;
- if (sz == 0)
- goto err;
- //buf = para_malloc(HTTP_RECV_READ_BUF_SIZE);
- //sz = HTTP_RECV_READ_BUF_SIZE;
- ret = recv_bin_buffer(phd->fd, buf, sz);
- if (ret == 0)
- ret = -E_RECV_EOF;
- if (ret < 0)
- goto err;
- btr_add_output_pool(phd->btrp, ret, btrn);
- return;
- }
ret = -E_HTTP_RECV_OVERRUN;
- if (rn->loaded >= BUFSIZE)
+ sz = btr_pool_get_buffer(phd->btrp, &buf);
+ if (sz == 0)
goto err;
- ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
- BUFSIZE - rn->loaded);
- if (ret == 0)
- ret = -E_RECV_EOF;
- if (ret < 0)
- goto err;
- rn->loaded += ret;
- return;
+ ret = read_nonblock(phd->fd, buf, sz, &s->rfds, &n);
+ if (n > 0)
+ btr_add_output_pool(phd->btrp, n, btrn);
+ if (ret >= 0)
+ return;
err:
- if (btrn)
- btr_remove_node(rn->btrn);
+ btr_remove_node(rn->btrn);
t->error = ret;
}
close(phd->fd);
btr_pool_free(phd->btrp);
- free(rn->buf);
free(rn->private_data);
}
{
struct private_http_recv_data *phd;
struct http_recv_args_info *conf = rn->conf;
- int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg,
- conf->port_arg);
+ int fd, ret = para_connect_simple(IPPROTO_TCP, conf->host_arg,
+ conf->port_arg);
if (ret < 0)
return ret;
close(fd);
return ret;
}
- rn->buf = para_calloc(BUFSIZE);
rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
phd->fd = fd;
phd->status = HTTP_CONNECTED;
static void http_recv_free_config(void *conf)
{
http_recv_cmdline_parser_free(conf);
+ free(conf);
}
/**
r->close = http_recv_close;
r->pre_select = http_recv_pre_select;
r->post_select = http_recv_post_select;
- r->shutdown = http_shutdown;
r->parse_config = http_recv_parse_config;
r->free_config = http_recv_free_config;
r->help = (struct ggo_help) {