/*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file http_recv.c paraslash's http receiver */
+#include <regex.h>
#include <sys/types.h>
#include <dirent.h>
#include "http.h"
#include "list.h"
#include "sched.h"
+#include "ggo.h"
#include "recv.h"
#include "http_recv.cmdline.h"
#include "net.h"
#include "string.h"
#include "fd.h"
+#include "buffer_tree.h"
/** the output buffer size of the http receiver */
#define BUFSIZE (32 * 1024)
static void http_recv_pre_select(struct sched *s, struct task *t)
{
- struct receiver_node *rn = t->private_data;
+ struct receiver_node *rn = container_of(t, struct receiver_node, task);
struct private_http_recv_data *phd = rn->private_data;
+ int ret;
- t->ret = 1;
+ if (rn->btrn) {
+ ret = generic_recv_pre_select(s, t);
+ if (ret <= 0)
+ return;
+ }
+ t->error = 0;
if (phd->status == HTTP_CONNECTED)
para_fd_set(phd->fd, &s->wfds, &s->max_fileno);
else
para_fd_set(phd->fd, &s->rfds, &s->max_fileno);
}
+#define HTTP_RECV_READ_BUF_SIZE 16384
static void http_recv_post_select(struct sched *s, struct task *t)
{
- struct receiver_node *rn = t->private_data;
+ struct receiver_node *rn = container_of(t, struct receiver_node, task);
struct private_http_recv_data *phd = rn->private_data;
-
- if (rn->output_error && *rn->output_error) {
- t->ret = *rn->output_error;
- goto out;
+ struct btr_node *btrn = rn->btrn;
+ int ret;
+
+ 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;
+ }
}
- t->ret = 1;
- if (!s->select_ret)
- goto out;
- if (phd->status == HTTP_CONNECTED) {
+ if (phd->status == HTTP_CONNECTED) {
char *rq;
if (!FD_ISSET(phd->fd, &s->wfds))
- goto out;
+ return;
rq = make_request_msg();
- PARA_INFO_LOG("%s", "sending http request\n");
- t->ret = send_va_buffer(phd->fd, "%s", rq);
+ PARA_INFO_LOG("sending http request\n");
+ ret = send_va_buffer(phd->fd, "%s", rq);
free(rq);
- if (t->ret > 0)
- phd->status = HTTP_SENT_GET_REQUEST;
- goto out;
+ if (ret < 0)
+ goto err;
+ phd->status = HTTP_SENT_GET_REQUEST;
+ return;
}
if (!FD_ISSET(phd->fd, &s->rfds))
- goto out;
+ return;
if (phd->status == HTTP_SENT_GET_REQUEST) {
- t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
- if (t->ret < 0)
- goto out;
- PARA_INFO_LOG("%s", "received ok msg, streaming\n");
- t->ret = 1;
+ ret = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
+ if (ret < 0)
+ goto err;
+ PARA_INFO_LOG("received ok msg, streaming\n");
phd->status = HTTP_STREAMING;
- goto out;
+ return;
}
- t->ret = -E_HTTP_RECV_OVERRUN;
+ if (btrn) {
+ char *buf;
+
+ buf = para_malloc(HTTP_RECV_READ_BUF_SIZE);
+ ret = recv_bin_buffer(phd->fd, buf, HTTP_RECV_READ_BUF_SIZE);
+ if (ret == 0)
+ ret = -E_RECV_EOF;
+ if (ret < 0) {
+ free(buf);
+ goto err;
+ }
+ btr_add_output(buf, ret, btrn);
+ return;
+ }
+ ret = -E_HTTP_RECV_OVERRUN;
if (rn->loaded >= BUFSIZE)
- goto out;
- t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
+ goto err;
+ ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
BUFSIZE - rn->loaded);
- if (t->ret <= 0) {
- if (!t->ret)
- t->ret = -E_RECV_EOF;
- goto out;
- }
- rn->loaded += t->ret;
-out:
- if (t->ret < 0)
- rn->error = t->ret;
+ if (ret == 0)
+ ret = -E_RECV_EOF;
+ if (ret < 0)
+ goto err;
+ rn->loaded += ret;
+ return;
+err:
+ if (btrn)
+ btr_remove_node(rn->btrn);
+ t->error = 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);
free(rn->private_data);
{
struct private_http_recv_data *phd;
struct http_recv_args_info *conf = rn->conf;
- int ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg, conf->port_arg);
+ int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg,
+ conf->port_arg);
if (ret < 0)
return ret;
-
+ fd = ret;
+ ret = mark_fd_nonblocking(fd);
+ if (ret < 0) {
+ close(fd);
+ return ret;
+ }
rn->buf = para_calloc(BUFSIZE);
rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
-
- phd->fd = ret;
- mark_fd_nonblocking(phd->fd);
+ phd->fd = fd;
phd->status = HTTP_CONNECTED;
return 1;
}
+static void http_recv_free_config(void *conf)
+{
+ http_recv_cmdline_parser_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_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) {
+ .short_help = http_recv_args_info_help,
+ .detailed_help = http_recv_args_info_detailed_help
+ };
+ http_recv_cmdline_parser_free(&dummy);
}
projects / paraslash.git / blobdiff